From b93179b41ffcf12240260ff7987efe5561134122 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Thu, 21 Jan 2021 16:49:53 +0100 Subject: Update to alpine:3.13 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I6087facf8ac62de3460861fe69e8f5270cf5d922 Signed-off-by: Cédric Ollivier --- ansible/site.gate.yml | 2 +- build.sh | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ansible/site.gate.yml b/ansible/site.gate.yml index 05a2b2d4..96719d60 100644 --- a/ansible/site.gate.yml +++ b/ansible/site.gate.yml @@ -10,7 +10,7 @@ - repo: _ dport: container: alpine - tag: 3.12 + tag: 3.13 steps: - name: build opnfv/functest-kubernetes-core containers: diff --git a/build.sh b/build.sh index fbd5001e..629d975e 100644 --- a/build.sh +++ b/build.sh @@ -32,11 +32,11 @@ done [ ! -z "${amd64_dirs}" ] && (docker rmi \ "${repo}/functest-kubernetes-core:amd64-latest" \ - alpine:3.12 || true) + alpine:3.13 || true) find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ - -e "s|alpine:3.12|arm64v8/alpine:3.12|g" {} + + -e "s|alpine:3.13|arm64v8/alpine:3.13|g" {} + find . -name Dockerfile -exec sed -i \ -e "s|opnfv/functest-kubernetes-core|\ ${repo}/functest-kubernetes-core:arm64-latest|g" {} + @@ -56,11 +56,11 @@ for dir in ${arm64_dirs}; do done [ ! -z "${arm64_dirs}" ] && (docker rmi "${repo}/functest-kubernetes-core:arm64-latest" \ - arm64v8/alpine:3.12 || true) + arm64v8/alpine:3.13 || true) find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ - -e "s|alpine:3.12|arm32v7/alpine:3.12|g" {} + + -e "s|alpine:3.13|arm32v7/alpine:3.13|g" {} + find . -name Dockerfile -exec sed -i \ -e "s|opnfv/functest-kubernetes-core|\ ${repo}/functest-kubernetes-core:arm-latest|g" {} + @@ -80,7 +80,7 @@ for dir in ${arm_dirs}; do done [ ! -z "${arm_dirs}" ] && (docker rmi "${repo}/functest-kubernetes-core:arm-latest" \ - arm32v7/alpine:3.12 || true) + arm32v7/alpine:3.13 || true) find . -name Dockerfile -exec git checkout {} + exit $? -- cgit 1.2.3-korg