From ef837051e835774b09f5d396cc20d570710f660b Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Sat, 4 Jan 2020 22:31:40 +0100 Subject: Update Alpine to 3.11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It also updates Python to 3.8 (default version). It selects arm32v6 et arm64v8 repos and switches multiarch binfmt. https://alpinelinux.org/posts/Alpine-3.11.0-released.html Change-Id: Ib41cf0ab805ce2137658f3ff656b0a88c7b4ebf5 Signed-off-by: Cédric Ollivier --- build.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index f13c623ee..d6726d320 100644 --- a/build.sh +++ b/build.sh @@ -34,11 +34,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.10 || true) + (docker rmi "${repo}/functest-core:amd64-latest" alpine:3.11 || true) find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ - -e "s|alpine:3.10|multiarch/alpine:arm64-v3.10|g" {} + + -e "s|alpine:3.11|arm64v8/alpine:3.11|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" \ - multiarch/alpine:arm64-v3.10 || true) + arm64v8/alpine:3.11 || true) find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ - -e "s|alpine:3.10|multiarch/alpine:armhf-v3.10|g" {} + + -e "s|alpine:3.11|arm32v6/alpine:3.11|g" {} + find . -name Dockerfile -exec sed -i \ -e "s|opnfv/functest-core|${repo}/functest-core:arm-latest|g" {} + find . -name Dockerfile -exec sed -i \ @@ -70,7 +70,7 @@ for dir in ${arm_dirs}; do done [ -n "${arm_dirs}" ] && (docker rmi "${repo}/functest-core:arm-latest" \ - multiarch/alpine:armhf-v3.10 || true) + arm32v6/alpine:3.11 || true) find . -name Dockerfile -exec git checkout {} + exit $? -- cgit 1.2.3-korg