From a312426be89ac0b46c0abd3fab58e889b53b5a36 Mon Sep 17 00:00:00 2001
From: =?utf8?q?C=C3=A9dric=20Ollivier?= <cedric.ollivier@orange.com>
Date: Thu, 20 Oct 2022 13:15:24 +0200
Subject: [PATCH] Update to Alpine 3.16
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Change-Id: Ib630178c93d4a991f43611796e0c07975ce421ec
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 6489ea7d97469df62fdfe208b1117cbd019f285d)
---
 ansible/site.gate.yml  |  2 +-
 build.sh               | 13 +++++++++----
 docker/core/Dockerfile |  2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

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 9738dc08..1fe81a99 100644
--- a/build.sh
+++ b/build.sh
@@ -31,12 +31,17 @@ for dir in ${amd64_dirs}; do
 done
 [ ! -z "${amd64_dirs}" ] &&
     (docker rmi \
+<<<<<<< HEAD
         "${repo}/functest-kubernetes-core:amd64-v1.24" \
         alpine:3.15 || true)
+=======
+        "${repo}/functest-kubernetes-core:amd64-v1.25" \
+        alpine:3.16 || true)
+>>>>>>> eeef354 (Update to Alpine 3.16)
 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.24|\
 ${repo}/functest-kubernetes-core:arm64-v1.24|g" {} +
@@ -56,11 +61,11 @@ for dir in ${arm64_dirs}; do
 done
 [ ! -z "${arm64_dirs}" ] &&
     (docker rmi "${repo}/functest-kubernetes-core:arm64-v1.24" \
-        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.24|\
 ${repo}/functest-kubernetes-core:arm-v1.24|g" {} +
@@ -80,7 +85,7 @@ for dir in ${arm_dirs}; do
 done
 [ ! -z "${arm_dirs}" ] &&
     (docker rmi "${repo}/functest-kubernetes-core:arm-v1.24" \
-        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 df14f359..2887f64e 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.24
 ARG OPENSTACK_TAG=stable/yoga
-- 
2.16.6