From: Cédric Ollivier Date: Thu, 20 Oct 2022 11:15:24 +0000 (+0200) Subject: Update to Alpine 3.16 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F65%2F73565%2F1;p=functest-kubernetes.git Update to Alpine 3.16 Change-Id: Ib630178c93d4a991f43611796e0c07975ce421ec Signed-off-by: Cédric Ollivier (cherry picked from commit 6489ea7d97469df62fdfe208b1117cbd019f285d) --- diff --git a/ansible/site.gate.yml b/ansible/site.gate.yml index f54f586e..1cc5683d 100644 --- a/ansible/site.gate.yml +++ b/ansible/site.gate.yml @@ -10,7 +10,7 @@ - repo: _ dport: container: alpine - tag: 3.15 + tag: 3.16 steps: - name: build opnfv/functest-kubernetes-core containers: diff --git a/build.sh b/build.sh index 9cef1b3c..0e27505d 100644 --- a/build.sh +++ b/build.sh @@ -32,11 +32,11 @@ done [ ! -z "${amd64_dirs}" ] && (docker rmi \ "${repo}/functest-kubernetes-core:amd64-v1.25" \ - alpine:3.15 || true) + alpine:3.16 || true) find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ - -e "s|alpine:3.15|arm64v8/alpine:3.15|g" {} + + -e "s|alpine:3.16|arm64v8/alpine:3.16|g" {} + find . -name Dockerfile -exec sed -i \ -e "s|opnfv/functest-kubernetes-core:v1.25|\ ${repo}/functest-kubernetes-core:arm64-v1.25|g" {} + @@ -56,11 +56,11 @@ for dir in ${arm64_dirs}; do done [ ! -z "${arm64_dirs}" ] && (docker rmi "${repo}/functest-kubernetes-core:arm64-v1.25" \ - arm64v8/alpine:3.15 || true) + arm64v8/alpine:3.16 || true) find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ - -e "s|alpine:3.15|arm32v7/alpine:3.15|g" {} + + -e "s|alpine:3.16|arm32v7/alpine:3.16|g" {} + find . -name Dockerfile -exec sed -i \ -e "s|opnfv/functest-kubernetes-core:v1.25|\ ${repo}/functest-kubernetes-core:arm-v1.25|g" {} + @@ -80,7 +80,7 @@ for dir in ${arm_dirs}; do done [ ! -z "${arm_dirs}" ] && (docker rmi "${repo}/functest-kubernetes-core:arm-v1.25" \ - arm32v7/alpine:3.15 || true) + arm32v7/alpine:3.16 || true) find . -name Dockerfile -exec git checkout {} + exit $? diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index e0459ff0..4cf6614e 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.15 +FROM alpine:3.16 ARG BRANCH=stable/v1.25 ARG OPENSTACK_TAG=stable/yoga