diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2017-12-23 12:41:10 +0100 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2017-12-23 13:16:47 +0100 |
| commit | 9545e4cd5f16805adf2caadf348432ca1e8d9cd7 (patch) | |
| tree | ce688f645cd00597047abec52b76d2d8794af767 | |
| parent | b94eea5dc2d97a5055d2a98b7b330cc52cac5649 (diff) | |
Add Docker build opts
Change-Id: I91fcb833b6b6216338b4fcb888f093a2086264a7
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
| -rw-r--r-- | build.sh | 11 |
1 files changed, 3 insertions, 8 deletions
@@ -14,24 +14,19 @@ 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" done 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" done find . -name Dockerfile -exec git checkout {} + |