diff options
| -rw-r--r-- | build.sh | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -19,7 +19,7 @@ docker/smoke \ docker/benchmarking \ docker/features"} arm64_dirs=${arm64_dirs-${amd64_dirs}} -build_opts=(--pull=true --no-cache --force-rm=true) +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" {} + @@ -33,7 +33,7 @@ for dir in ${amd64_dirs}; do [ "${dir}" != "docker/core" ] && (docker rmi "${repo}/functest-${dir##**/}:amd64-latest" || true) done -[ ! -z "${amd64_dirs}" ] && +[ -n "${amd64_dirs}" ] && (docker rmi "${repo}/functest-core:amd64-latest" alpine:3.9 || true) find . -name Dockerfile -exec git checkout {} + @@ -50,7 +50,7 @@ for dir in ${arm64_dirs}; do [ "${dir}" != "docker/core" ] && (docker rmi "${repo}/functest-${dir##**/}:arm64-latest" || true) done -[ ! -z "${arm64_dirs}" ] && +[ -n "${arm64_dirs}" ] && (docker rmi "${repo}/functest-core:arm64-latest" \ multiarch/alpine:arm64-v3.9 || true) find . -name Dockerfile -exec git checkout {} + @@ -68,7 +68,7 @@ for dir in ${arm_dirs}; do [ "${dir}" != "docker/core" ] && (docker rmi "${repo}/functest-${dir##**/}:arm-latest" || true) done -[ ! -z "${arm_dirs}" ] && +[ -n "${arm_dirs}" ] && (docker rmi "${repo}/functest-core:arm-latest" \ multiarch/alpine:armhf-v3.9 || true) find . -name Dockerfile -exec git checkout {} + |