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

   1 From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
   2 Date: Tue, 23 Aug 2016 15:48:56 +0200
   3 Subject: [PATCH] fpb: Support multiple versions of packages
   4
   5 This is a temporary change until the fpm installed by pip gets
   6 the change from [1] included.
   7
   8 [1] https://review.openstack.org/#/c/311031/
   9
  10 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  11 ---
  12  build/docker/Dockerfile | 9 ++++++++-
  13  build/docker/Makefile   | 4 ++++
  14  2 files changed, 12 insertions(+), 1 deletion(-)
  15
  16 diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile
  17 index 624f233..ab0d0d3 100644
  18 --- a/build/docker/Dockerfile
  19 +++ b/build/docker/Dockerfile
  20 @@ -23,7 +23,14 @@ RUN apt-get install -y software-properties-common python-software-properties \
  21      build-essential ruby-dev rubygems-integration python-pip git rpm createrepo dpkg-dev
  22
  23  RUN gem install fpm
  24 -RUN pip install fuel-plugin-builder
  25 +
  26 +# Temporary: fpb needs to be built from sources
  27 +# RUN pip install fuel-plugin-builder
  28 +RUN git clone -b INSERT_FPB_BRANCH INSERT_FPB_REPO && cd fuel-plugins && \
  29 +    (test -z INSERT_FPB_CHANGE || \
  30 +        (git fetch origin INSERT_FPB_CHANGE && git checkout FETCH_HEAD)) && \
  31 +    python setup.py sdist && pip install ./dist/fuel-plugin-builder-*.tar.gz && \
  32 +    cd .. && rm -rf fuel-plugins
  33
  34  RUN echo "ALL ALL=NOPASSWD: ALL" > /etc/sudoers.d/open-sudo
  35  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
  36 diff --git a/build/docker/Makefile b/build/docker/Makefile
  37 index d4423b0..226bbd0 100644
  38 --- a/build/docker/Makefile
  39 +++ b/build/docker/Makefile
  40 @@ -25,6 +25,10 @@ all: .docker
  41
  42  .docker: $(FILES)
  43         cp Dockerfile ubuntu-builder/Dockerfile
  44 +       # Only add FPB ENVs when set - needed to fetch, patch and install FPB
  45 +       test -n "${FPB_REPO}" && sed -i "s;INSERT_FPB_REPO;${FPB_REPO};" ubuntu-builder/Dockerfile || exit 0
  46 +       test -n "${FPB_BRANCH}" && sed -i "s;INSERT_FPB_BRANCH;${FPB_BRANCH};" ubuntu-builder/Dockerfile || exit 0
  47 +       test -n "${FPB_CHANGE}" && sed -i "s;INSERT_FPB_CHANGE;${FPB_CHANGE};" ubuntu-builder/Dockerfile || exit 0
  48         # Only add proxy ENVs where set in host - needed to pull the base Ubuntu image
  49         test -n "${http_proxy}" && sed -i "s;INSERT_HTTP_PROXY;${http_proxy};" ubuntu-builder/Dockerfile || exit 0
  50         test -n "${https_proxy}" && sed -i "s;INSERT_HTTPS_PROXY;${https_proxy};" ubuntu-builder/Dockerfile || exit 0