aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-10-07 13:04:53 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-10-07 11:09:08 +0000
commit60f4168741b0efddcd384e9c74b728fa172bc4ec (patch)
tree1de80fd259264c4a27ca2f806e486a8404265978
parentd30237ac24f052e60f7e8d77506f556502ac24e5 (diff)
Rebase: docker tag reuse context adj
Change-Id: If6a3472a2f8fe64db2469536fe4d12d88e7a61f0 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 15aac10c6b474790aedfd88d80c5e9d86a7f36b2)
-rw-r--r--patches/opnfv-fuel/0048-fpb-Support-multiple-versions-of-packages.patch4
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 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