aboutsummaryrefslogtreecommitdiffstats
path: root/build.sh
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2020-01-04 22:31:40 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2020-01-24 23:17:43 +0100
commitef837051e835774b09f5d396cc20d570710f660b (patch)
tree4c6139d4b70f0a22e878759830e63563bfab857a /build.sh
parent9318d1ec58552603fc9f624ec07f2752bcfbc428 (diff)
Update Alpine to 3.11
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 <cedric.ollivier@orange.com>
Diffstat (limited to 'build.sh')
-rw-r--r--build.sh10
1 files changed, 5 insertions, 5 deletions
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 $?