diff options
Diffstat (limited to 'patches/opnfv-fuel/0048-fpb-Support-multiple-versions-of-packages.patch')
| -rw-r--r-- | patches/opnfv-fuel/0048-fpb-Support-multiple-versions-of-packages.patch | 4 |
1 files changed, 1 insertions, 3 deletions
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 25187b4e..03797948 100644 --- 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 |