From: Alexandru Avadanii Date: Fri, 7 Oct 2016 11:04:53 +0000 (+0200) Subject: Rebase: docker tag reuse context adj X-Git-Tag: danube.1.RC1~100 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F85%2F22785%2F1;p=armband.git Rebase: docker tag reuse context adj Change-Id: If6a3472a2f8fe64db2469536fe4d12d88e7a61f0 Signed-off-by: Alexandru Avadanii --- 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 c13af1e2..25187b4e 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 @@ -37,9 +37,7 @@ diff --git a/build/docker/Makefile b/build/docker/Makefile index d4423b0..226bbd0 100644 --- a/build/docker/Makefile +++ b/build/docker/Makefile -@@ -25,6 +25,10 @@ all: .docker - - .docker: $(FILES) +@@ -25,4 +25,8 @@ all: .docker cp Dockerfile ubuntu-builder/Dockerfile + # Only add FPB ENVs when set - needed to fetch, patch and install FPB + test -n "${FPB_REPO}" && sed -i "s;INSERT_FPB_REPO;${FPB_REPO};" ubuntu-builder/Dockerfile || exit 0