From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Fri, 22 Apr 2022 20:47:50 +0000 (+0200)
Subject: Update to Alpine 3.15
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F22%2F73322%2F1;p=functest-xtesting.git

Update to Alpine 3.15

Change-Id: I283f95fa9c0a51b31c2612f44c1e722a688f6a02
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 4c91aa8d974d95fec6b39741102327716a7cf20d)
---

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