From e84511b845f727d05c16340d3eb3fb512b1345c0 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Thu, 21 Jan 2021 16:52:50 +0100 Subject: Update to alpine:3.13 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I4acdb1f619883bd1e25bb5aef6a9d1722e7bfde5 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 ba113ca9e..0d902dc2e 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-core containers: diff --git a/build.sh b/build.sh index 5331a52a4..effd07500 100644 --- a/build.sh +++ b/build.sh @@ -31,11 +31,11 @@ for dir in ${amd64_dirs}; do (docker rmi "${repo}/functest-${dir##**/}:amd64-latest" || true) done [ -n "${amd64_dirs}" ] && - (docker rmi "${repo}/functest-core:amd64-latest" alpine:3.12 || true) + (docker rmi "${repo}/functest-core:amd64-latest" 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-core|${repo}/functest-core:arm64-latest|g" {} + find . -name Dockerfile -exec sed -i \ @@ -52,11 +52,11 @@ for dir in ${arm64_dirs}; do done [ -n "${arm64_dirs}" ] && (docker rmi "${repo}/functest-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|arm32v6/alpine:3.12|g" {} + + -e "s|alpine:3.13|arm32v6/alpine:3.13|g" {} + find . -name Dockerfile -exec sed -i \ -e "s|opnfv/functest-core|${repo}/functest-core:arm-latest|g" {} + find . -name Dockerfile -exec sed -i \ @@ -73,7 +73,7 @@ for dir in ${arm_dirs}; do done [ -n "${arm_dirs}" ] && (docker rmi "${repo}/functest-core:arm-latest" \ - arm32v6/alpine:3.12 || true) + arm32v6/alpine:3.13 || true) find . -name Dockerfile -exec git checkout {} + exit $? -- cgit 1.2.3-korg