From 5695081fd63d50b8e6286f80c7cd4921ed3a9ee9 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Fri, 22 Apr 2022 22:47:50 +0200 Subject: Update to Alpine 3.15 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I283f95fa9c0a51b31c2612f44c1e722a688f6a02 Signed-off-by: Cédric Ollivier (cherry picked from commit 4c91aa8d974d95fec6b39741102327716a7cf20d) --- ansible/site.gate.yml | 2 +- build.sh | 4 ++-- docker/core/Dockerfile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ansible/site.gate.yml b/ansible/site.gate.yml index f2936320..d4de0bdd 100644 --- a/ansible/site.gate.yml +++ b/ansible/site.gate.yml @@ -8,7 +8,7 @@ docker_tags: - latest: branch: master - dependency: '3.14' + dependency: '3.15' builds: dependency: repo: _ diff --git a/build.sh b/build.sh index 1f004be0..c3352c40 100644 --- a/build.sh +++ b/build.sh @@ -24,12 +24,12 @@ build_opts=(--pull=true --no-cache --force-rm=true) for arch in ${arch}; do if [[ ${arch} == arm64 ]]; then find . -name Dockerfile -exec sed -i \ - -e "s|alpine:3.14|arm64v8/alpine:3.14|g" {} + + -e "s|alpine:3.15|arm64v8/alpine:3.15|g" {} + find . -name Dockerfile -exec sed -i \ -e "s|opnfv/xtesting:yoga|${repo}/xtesting:arm64-${tag}|g" {} + elif [[ ${arch} == arm ]]; then find . -name Dockerfile -exec sed -i \ - -e "s|alpine:3.14|arm32v6/alpine:3.14|g" {} + + -e "s|alpine:3.15|arm32v6/alpine:3.15|g" {} + find . -name Dockerfile -exec sed -i \ -e "s|opnfv/xtesting:yoga|${repo}/xtesting:arm-${tag}|g" {} + else diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index e2c6b89c..649c1060 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.14 +FROM alpine:3.15 ARG BRANCH=stable/yoga ARG OPENSTACK_TAG=stable/yoga -- cgit 1.2.3-korg