summaryrefslogtreecommitdiffstats
path: root/patches/opnfv-fuel/multiarch-plugins/0001-fpb-Support-multiple-versions-of-packages.patch
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-10-28 16:09:55 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-11-15 19:35:10 +0100
commit7eb132e3d66f1f78dc0b4acc41240149967d8c85 (patch)
treee5a7ab84ff91f6269dd5d2d69e496443bf5a3912 /patches/opnfv-fuel/multiarch-plugins/0001-fpb-Support-multiple-versions-of-packages.patch
parent5f1825c57297b0b266eade88f8fe8e261c5e84be (diff)
build/docker: Import Enea Armband keys
JIRA: ARMBAND-96 Change-Id: I28ab3030d3f31c5734508838985412a33334570a Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/multiarch-plugins/0001-fpb-Support-multiple-versions-of-packages.patch')
-rw-r--r--patches/opnfv-fuel/multiarch-plugins/0001-fpb-Support-multiple-versions-of-packages.patch4
1 files changed, 1 insertions, 3 deletions
diff --git a/patches/opnfv-fuel/multiarch-plugins/0001-fpb-Support-multiple-versions-of-packages.patch b/patches/opnfv-fuel/multiarch-plugins/0001-fpb-Support-multiple-versions-of-packages.patch
index 6fc8bdbe..2be2e096 100644
--- a/patches/opnfv-fuel/multiarch-plugins/0001-fpb-Support-multiple-versions-of-packages.patch
+++ b/patches/opnfv-fuel/multiarch-plugins/0001-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
@@ -32,8 +32,6 @@ index 624f233..ab0d0d3 100644
+ cd .. && rm -rf fuel-plugins
# fuel-infra key
RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys BCE5CC461FA22B08
-
- RUN echo "ALL ALL=NOPASSWD: ALL" > /etc/sudoers.d/open-sudo
index 783881e..74f6346 100644
--- a/build/docker/Makefile
+++ b/build/docker/Makefile