diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2025-01-19 22:29:50 +0100 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2025-01-19 22:29:50 +0100 |
| commit | 0709c69136dc8e7a00dee800ea5eb086a6a49f9e (patch) | |
| tree | e0e8386842c80cf3811ece3f61fdeb313d880a74 | |
| parent | a7a6b73a68b80962487101c97980d46b7eee8d82 (diff) | |
Update Alpine to 3.21
http://172.30.13.89:8080/job/functest-kubernetes-opnfv-functest-kubernetes-benchmarking-latest-build/10/console
Change-Id: I0fd67ab83a6bf74b78f3e6ace4767536f5619072
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
| -rw-r--r-- | ansible/site.gate.yml | 2 | ||||
| -rw-r--r-- | build.sh | 10 | ||||
| -rw-r--r-- | docker/core/Dockerfile | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/ansible/site.gate.yml b/ansible/site.gate.yml index 1180905b..fdab6d02 100644 --- a/ansible/site.gate.yml +++ b/ansible/site.gate.yml @@ -10,7 +10,7 @@ docker_tags: - latest: branch: master - dependency: '3.20' + dependency: '3.21' builds: dependency: repo: _ @@ -35,11 +35,11 @@ done [ ! -z "${amd64_dirs}" ] && (docker rmi \ "${repo}/functest-kubernetes-core:amd64-latest" \ - alpine:3.20 || true) + alpine:3.21 || true) find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ - -e "s|alpine:3.20|arm64v8/alpine:3.20|g" {} + + -e "s|alpine:3.21|arm64v8/alpine:3.21|g" {} + find . -name Dockerfile -exec sed -i \ -e "s|opnfv/functest-kubernetes-core|\ ${repo}/functest-kubernetes-core:arm64-latest|g" {} + @@ -59,11 +59,11 @@ for dir in ${arm64_dirs}; do done [ ! -z "${arm64_dirs}" ] && (docker rmi "${repo}/functest-kubernetes-core:arm64-latest" \ - arm64v8/alpine:3.20 || true) + arm64v8/alpine:3.21 || true) find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ - -e "s|alpine:3.20|arm32v7/alpine:3.20|g" {} + + -e "s|alpine:3.21|arm32v7/alpine:3.21|g" {} + find . -name Dockerfile -exec sed -i \ -e "s|opnfv/functest-kubernetes-core|\ ${repo}/functest-kubernetes-core:arm-latest|g" {} + @@ -83,7 +83,7 @@ for dir in ${arm_dirs}; do done [ ! -z "${arm_dirs}" ] && (docker rmi "${repo}/functest-kubernetes-core:arm-latest" \ - arm32v7/alpine:3.20 || true) + arm32v7/alpine:3.21 || true) find . -name Dockerfile -exec git checkout {} + exit $? diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 8ebd2c51..bc5492bc 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.20 +FROM alpine:3.21 ARG BRANCH=master ARG OPENSTACK_TAG=master |