Rebase: docker tag reuse context adj 85/22785/1
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Fri, 7 Oct 2016 11:04:53 +0000 (13:04 +0200)
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Fri, 7 Oct 2016 11:09:17 +0000 (13:09 +0200)
Change-Id: If6a3472a2f8fe64db2469536fe4d12d88e7a61f0
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
patches/opnfv-fuel/0048-fpb-Support-multiple-versions-of-packages.patch

index c13af1e..25187b4 100644 (file)
@@ -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