From 08195b85fe412360785f09fd7ffc9c8068b43757 Mon Sep 17 00:00:00 2001
From: dklimpel <5740567+dklimpel@users.noreply.github.com>
Date: Fri, 10 May 2024 20:21:09 +0200
Subject: [PATCH 1/2] bump alpine linux to 3.19

---
 integration-tests/Dockerfile_alpine3                 | 4 ++--
 integration-tests/goss/alpine3/goss-aa-expected.yaml | 2 +-
 integration-tests/goss/alpine3/goss-expected.yaml    | 2 +-
 integration-tests/goss/vars.yaml                     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/integration-tests/Dockerfile_alpine3 b/integration-tests/Dockerfile_alpine3
index 153bc0c68..d86bf9a38 100644
--- a/integration-tests/Dockerfile_alpine3
+++ b/integration-tests/Dockerfile_alpine3
@@ -1,9 +1,9 @@
-FROM alpine:3.12
+FROM alpine:3.19
 MAINTAINER Ahmed
 
 # install apache2 and remove un-needed services
 RUN apk update && \
-  apk add openrc apache2 bash ca-certificates tinyproxy && \
+  apk add openrc apache2=2.4.59-r0 bash ca-certificates tinyproxy && \
   rc-update add apache2 && \
   rc-update add tinyproxy && \
   rm -rf /etc/init.d/networking /etc/init.d/hwdrivers /var/cache/apk/* /tmp/*
diff --git a/integration-tests/goss/alpine3/goss-aa-expected.yaml b/integration-tests/goss/alpine3/goss-aa-expected.yaml
index 2d95f3e6b..ea7c1180b 100644
--- a/integration-tests/goss/alpine3/goss-aa-expected.yaml
+++ b/integration-tests/goss/alpine3/goss-aa-expected.yaml
@@ -2,7 +2,7 @@ package:
   apache2:
     installed: true
     versions:
-    - 2.4.46-r1
+    - 2.4.59-r0
 service:
   apache2:
     enabled: true
diff --git a/integration-tests/goss/alpine3/goss-expected.yaml b/integration-tests/goss/alpine3/goss-expected.yaml
index 0953e91d8..b3fc9f83e 100644
--- a/integration-tests/goss/alpine3/goss-expected.yaml
+++ b/integration-tests/goss/alpine3/goss-expected.yaml
@@ -13,7 +13,7 @@ package:
   apache2:
     installed: true
     versions:
-    - 2.4.46-r1
+    - 2.4.59-r0
   foobar:
     installed: false
   vim-tiny:
diff --git a/integration-tests/goss/vars.yaml b/integration-tests/goss/vars.yaml
index cbf6df778..dd505182b 100644
--- a/integration-tests/goss/vars.yaml
+++ b/integration-tests/goss/vars.yaml
@@ -2,7 +2,7 @@
 alpine3:
   proxy: http://127.0.0.1:8888
   packages:
-    apache2: "2.4.46-r1"
+    apache2: "2.4.59-r0"
   services:
     apache2: [sysinit]
 arch:

From 2100cd070e766bdc43ebd337282f2fa710ef7151 Mon Sep 17 00:00:00 2001
From: Dirk Klimpel <5740567+dklimpel@users.noreply.github.com>
Date: Sat, 11 May 2024 00:03:08 +0200
Subject: [PATCH 2/2] set apk --no-cache

---
 integration-tests/Dockerfile_alpine3 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/integration-tests/Dockerfile_alpine3 b/integration-tests/Dockerfile_alpine3
index d86bf9a38..48713ceeb 100644
--- a/integration-tests/Dockerfile_alpine3
+++ b/integration-tests/Dockerfile_alpine3
@@ -3,7 +3,7 @@ MAINTAINER Ahmed
 
 # install apache2 and remove un-needed services
 RUN apk update && \
-  apk add openrc apache2=2.4.59-r0 bash ca-certificates tinyproxy && \
+  apk add --no-cache openrc apache2=2.4.59-r0 bash ca-certificates tinyproxy && \
   rc-update add apache2 && \
   rc-update add tinyproxy && \
   rm -rf /etc/init.d/networking /etc/init.d/hwdrivers /var/cache/apk/* /tmp/*