From 7b2b99c9f015067c3ce527d6690d4ccaa2b936f0 Mon Sep 17 00:00:00 2001
From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Mon, 13 Mar 2023 14:39:06 +0100
Subject: Revert to Alpine 3.16
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

ruby-bundler 2.3.26-r0 as proposed in Alpine 3.17 seems buggy
https://github.com/googleapis/google-cloud-ruby/issues/19266

Change-Id: Ifcb6ba3e92d2ee5f21db859f6ee143a998dd6237
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---
 ansible/site.gate.yml  |  2 +-
 build.sh               | 10 +++++-----
 docker/core/Dockerfile |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ansible/site.gate.yml b/ansible/site.gate.yml
index d9a586127..cc6dce058 100644
--- a/ansible/site.gate.yml
+++ b/ansible/site.gate.yml
@@ -10,7 +10,7 @@
           - repo: _
             dport:
             container: alpine
-            tag: '3.17'
+            tag: '3.16'
         steps:
           - name: build opnfv/functest-core
             containers:
diff --git a/build.sh b/build.sh
index 80103c938..16332ad7f 100644
--- a/build.sh
+++ b/build.sh
@@ -31,11 +31,11 @@ for dir in ${amd64_dirs}; do
         (docker rmi "${repo}/functest-${dir##**/}:amd64-latest" || true)
 done
 [ -n "${amd64_dirs}" ] &&
-    (docker rmi "${repo}/functest-core:amd64-latest" alpine:3.17 || true)
+    (docker rmi "${repo}/functest-core:amd64-latest" alpine:3.16 || true)
 find . -name Dockerfile -exec git checkout {} +
 
 find . -name Dockerfile -exec sed -i \
-    -e "s|alpine:3.17|arm64v8/alpine:3.17|g" {} +
+    -e "s|alpine:3.16|arm64v8/alpine:3.16|g" {} +
 find . -name Dockerfile -exec sed -i \
     -e "s|opnfv/functest-core|${repo}/functest-core:arm64-latest|g" {} +
 find . -name Dockerfile -exec sed -i \
@@ -52,11 +52,11 @@ for dir in ${arm64_dirs}; do
 done
 [ -n "${arm64_dirs}" ] &&
     (docker rmi "${repo}/functest-core:arm64-latest" \
-        arm64v8/alpine:3.17 || true)
+        arm64v8/alpine:3.16 || true)
 find . -name Dockerfile -exec git checkout {} +
 
 find . -name Dockerfile -exec sed -i \
-    -e "s|alpine:3.17|arm32v6/alpine:3.17|g" {} +
+    -e "s|alpine:3.16|arm32v6/alpine:3.16|g" {} +
 find . -name Dockerfile -exec sed -i \
     -e "s|opnfv/functest-core|${repo}/functest-core:arm-latest|g" {} +
 find . -name Dockerfile -exec sed -i \
@@ -73,7 +73,7 @@ for dir in ${arm_dirs}; do
 done
 [ -n "${arm_dirs}" ] &&
     (docker rmi "${repo}/functest-core:arm-latest" \
-        arm32v6/alpine:3.17 || true)
+        arm32v6/alpine:3.16 || true)
 find . -name Dockerfile -exec git checkout {} +
 
 exit $?
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index bae6ec9cc..c4d8de309 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.17
+FROM alpine:3.16
 
 ARG BRANCH=master
 ARG OPENSTACK_TAG=master
-- 
cgit 1.2.3-korg