build/docker: Import Enea Armband keys

JIRA: ARMBAND-96

Conflicts:
	patches/opnfv-fuel/0048-fpb-Support-multiple-versions-of-packages.patch

Change-Id: I28ab3030d3f31c5734508838985412a33334570a
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

diff --git a/patches/opnfv-fuel/0008-build-docker-Import-Enea-Armband-keys.patch b/patches/opnfv-fuel/0008-build-docker-Import-Enea-Armband-keys.patch
new file mode 100644 (file)
index 0000000..3d349da
--- /dev/null
+++ b/patches/opnfv-fuel/0008-build-docker-Import-Enea-Armband-keys.patch
@@ -0,0 +1,24 @@
+From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+Date: Fri, 28 Oct 2016 16:06:20 +0200
+Subject: [PATCH] build/docker: Import Enea Armband keys
+
+JIRA: ARMBAND-96
+
+Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+---
+ build/docker/Dockerfile | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile
+index 4beb560..04c4d2b 100644
+--- a/build/docker/Dockerfile
++++ b/build/docker/Dockerfile
+@@ -33,5 +33,8 @@ RUN git clone -b INSERT_FPB_BRANCH INSERT_FPB_REPO && cd fuel-plugins && \
+ RUN gem install fpm
+ RUN pip install fuel-plugin-builder
++
++# Enea Armband key
++RUN apt-key adv --keyserver keys.gnupg.net --recv-keys DEAB90BA798AB1D1
+
+ RUN echo "ALL ALL=NOPASSWD: ALL" > /etc/sudoers.d/open-sudo
+ RUN echo "Defaults env_keep += \"ftp_proxy http_proxy https_proxy no_proxy RSYNC_PROXY RSYNC_CONNECT_PROG npm_config_registry\"" > /etc/sudoers.d/keep-proxies

diff --git a/patches/opnfv-fuel/0048-fpb-Support-multiple-versions-of-packages.patch b/patches/opnfv-fuel/0048-fpb-Support-multiple-versions-of-packages.patch
index 25187b4..0379794 100644 (file)
--- a/patches/opnfv-fuel/0048-fpb-Support-multiple-versions-of-packages.patch
+++ b/patches/opnfv-fuel/0048-fpb-Support-multiple-versions-of-packages.patch
@@ -17,7 +17,7 @@ diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile
 index 624f233..ab0d0d3 100644
 --- a/build/docker/Dockerfile
 +++ b/build/docker/Dockerfile
-@@ -23,7 +23,14 @@ RUN apt-get install -y software-properties-common python-software-properties \
+@@ -23,5 +23,12 @@ RUN apt-get install -y software-properties-common python-software-properties \
      build-essential ruby-dev rubygems-integration python-pip git rpm createrepo dpkg-dev
  
  RUN gem install fpm
@@ -31,8 +31,6 @@ index 624f233..ab0d0d3 100644
 +    python setup.py sdist && pip install ./dist/fuel-plugin-builder-*.tar.gz && \
 +    cd .. && rm -rf fuel-plugins
  
- RUN echo "ALL ALL=NOPASSWD: ALL" > /etc/sudoers.d/open-sudo
- RUN echo "Defaults env_keep += \"ftp_proxy http_proxy https_proxy no_proxy RSYNC_PROXY RSYNC_CONNECT_PROG npm_config_registry\"" > /etc/sudoers.d/keep-proxies
 diff --git a/build/docker/Makefile b/build/docker/Makefile
 index d4423b0..226bbd0 100644
 --- a/build/docker/Makefile