diff options
| -rw-r--r-- | build.sh | 15 |
1 files changed, 7 insertions, 8 deletions
@@ -14,26 +14,25 @@ docker/parser \ docker/restapi"} arm64_dirs=${arm64_dirs-$(echo "${amd64_dirs}" | sed -e "s|docker/vnf||" \ -e "s|docker/restapi||")} +build_opts=(--pull=true --no-cache --force-rm=true) 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" .) + (cd "${dir}" && docker build "${build_opts[@]}" -t "${repo}/functest-${dir##**/}:amd64-latest" .) docker push "${repo}/functest-${dir##**/}:amd64-latest" + [ "${dir}" != "docker/core" ] && docker rmi "${repo}/functest-${dir##**/}:amd64-latest" || true done +docker rmi "${repo}/functest-core:amd64-latest" alpine:3.6 || true 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" .) + (cd "${dir}" && docker build "${build_opts[@]}" -t "${repo}/functest-${dir##**/}:arm64-latest" .) docker push "${repo}/functest-${dir##**/}:arm64-latest" + [ "${dir}" != "docker/core" ] && docker rmi "${repo}/functest-${dir##**/}:arm64-latest" || true done +docker rmi "${repo}/functest-core:arm64-latest" multiarch/alpine:arm64-v3.6 || true find . -name Dockerfile -exec git checkout {} + exit $? |