From 0712285f0d242eb9279e49a653f64f63842265c9 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Thu, 13 Sep 2018 09:30:32 +0200 Subject: Prepare Functest K8s hunter containers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ia53b029eb1137b7fffb51eeb6395d69f70d11f75 Signed-off-by: Cédric Ollivier --- build.sh | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index 46115f13..9f851218 100644 --- a/build.sh +++ b/build.sh @@ -12,43 +12,43 @@ arm64_dirs=${arm64_dirs-${amd64_dirs}} build_opts=(--pull=true --no-cache --force-rm=true) find . -name Dockerfile -exec sed -i \ - -e "s|opnfv/functest-kubernetes-core|\ -${repo}/functest-kubernetes-core:amd64-latest|g" {} + + -e "s|opnfv/functest-kubernetes-core:hunter|\ +${repo}/functest-kubernetes-core:amd64-hunter|g" {} + find . -name Dockerfile -exec sed -i \ - -e "s|opnfv/functest-kubernetes-healthcheck|\ -${repo}/functest-kubernetes-healthcheck:amd64-latest|g" {} + + -e "s|opnfv/functest-kubernetes-healthcheck:hunter|\ +${repo}/functest-kubernetes-healthcheck:amd64-hunter|g" {} + for dir in ${amd64_dirs}; do (cd "${dir}" && docker build "${build_opts[@]}" \ - -t "${repo}/functest-kubernetes-${dir##**/}:amd64-latest" .) - docker push "${repo}/functest-kubernetes-${dir##**/}:amd64-latest" + -t "${repo}/functest-kubernetes-${dir##**/}:amd64-hunter" .) + docker push "${repo}/functest-kubernetes-${dir##**/}:amd64-hunter" [ "${dir}" != "docker/core" ] && (docker rmi \ - "${repo}/functest-kubernetes-${dir##**/}:amd64-latest" || true) + "${repo}/functest-kubernetes-${dir##**/}:amd64-hunter" || true) done [ ! -z "${amd64_dirs}" ] && (docker rmi \ - "${repo}/functest-kubernetes-core:amd64-latest" alpine:3.8 || true) + "${repo}/functest-kubernetes-core:amd64-hunter" alpine:3.8 || true) find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ -e "s|alpine:3.8|multiarch/alpine:arm64-v3.8|g" {} + find . -name Dockerfile -exec sed -i \ - -e "s|opnfv/functest-kubernetes-core|\ -${repo}/functest-kubernetes-core:arm64-latest|g" {} + + -e "s|opnfv/functest-kubernetes-core:hunter|\ +${repo}/functest-kubernetes-core:arm64-hunter|g" {} + find . -name Dockerfile -exec sed -i \ - -e "s|opnfv/functest-kubernetes-healthcheck|\ -${repo}/functest-kubernetes-healthcheck:arm64-latest|g" {} + + -e "s|opnfv/functest-kubernetes-healthcheck:hunter|\ +${repo}/functest-kubernetes-healthcheck:arm64-hunter|g" {} + for dir in ${arm64_dirs}; do (cd "${dir}" && docker build "${build_opts[@]}" \ - -t "${repo}/functest-kubernetes-${dir##**/}:arm64-latest" .) - docker push "${repo}/functest-kubernetes-${dir##**/}:arm64-latest" + -t "${repo}/functest-kubernetes-${dir##**/}:arm64-hunter" .) + docker push "${repo}/functest-kubernetes-${dir##**/}:arm64-hunter" [ "${dir}" != "docker/core" ] && (docker rmi \ - "${repo}/functest-kubernetes-${dir##**/}:arm64-latest" || true) + "${repo}/functest-kubernetes-${dir##**/}:arm64-hunter" || true) done [ ! -z "${arm64_dirs}" ] && - (docker rmi "${repo}/functest-kubernetes-core:arm64-latest" \ + (docker rmi "${repo}/functest-kubernetes-core:arm64-hunter" \ multiarch/alpine:arm64-v3.8 || true) find . -name Dockerfile -exec git checkout {} + -- cgit 1.2.3-korg