summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2017-12-07 22:57:49 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2017-12-07 23:03:32 +0100
commite3281b2175ca9983d79ce17de7e7497f749e650e (patch)
treea2de823895ee6848d0bf626f9544458141836517
parent04886b12a4f5c3f18c71f0ca78fdbcf8a545f5f6 (diff)
Pull functest-core when only building childs
Otherwise it fails if parent and childs containers are not built on the same host [1]. It would have worked if the docker images were correctly cleant. Then the last image would have been pulled. [1] https://build.opnfv.org/ci/job/functest-apex-baremetal-daily-euphrates/362/console Change-Id: I293829c839c1cf68c9f7668aa643e16889359fcc Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-rw-r--r--build.sh6
1 files changed, 6 insertions, 0 deletions
diff --git a/build.sh b/build.sh
index 51752a8..e384ce3 100644
--- a/build.sh
+++ b/build.sh
@@ -16,6 +16,9 @@ arm64_dirs=${arm64_dirs-$(echo "${amd64_dirs}" | sed -e "s|docker/vnf||" \
-e "s|docker/restapi||")}
find . -name Dockerfile -exec sed -i -e "s|opnfv/functest-core|${repo}/functest-core:amd64-latest|g" {} +
+if [[ ${amd64_dirs} != *"docker/core"* ]]; then
+ docker pull "${repo}/functest-core:amd64-latest"
+fi
for dir in ${amd64_dirs}; do
(cd "${dir}" && docker build --no-cache -t "${repo}/functest-${dir##**/}:amd64-latest" .)
docker push "${repo}/functest-${dir##**/}:amd64-latest"
@@ -24,6 +27,9 @@ find . -name Dockerfile -exec git checkout {} +
find . -name Dockerfile -exec sed -i -e "s|alpine:3.6|multiarch/alpine:arm64-v3.6|g" {} +
find . -name Dockerfile -exec sed -i -e "s|opnfv/functest-core|${repo}/functest-core:arm64-latest|g" {} +
+if [[ ${arm64_dirs} != *"docker/core"* ]]; then
+ docker pull "${repo}/functest-core:arm64-latest"
+fi
for dir in ${arm64_dirs}; do
(cd "${dir}" && docker build --no-cache -t "${repo}/functest-${dir##**/}:arm64-latest" .)
docker push "${repo}/functest-${dir##**/}:arm64-latest"