From 4f825f3d4fbb44c000caba259e1d1720426f649d Mon Sep 17 00:00:00 2001
From: Michal Nowak <mnowak@isc.org>
Date: Mon, 29 May 2023 15:48:56 +0200
Subject: [PATCH] Add Alpine Linux 3.18

(cherry picked from commit ddb846454dc9c8d1ef4f4d22bda23e82bbbfbe02)
---
 .gitlab-ci.yml        | 22 +++++++++++-----------
 doc/arm/platforms.rst |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 02155527e9..73205c3950 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -124,8 +124,8 @@ stages:
 
 # Alpine Linux
 
-.alpine-3.17-amd64: &alpine_3_17_amd64_image
-  image: "$CI_REGISTRY_IMAGE:alpine-3.17-amd64"
+.alpine-3.18-amd64: &alpine_3_18_amd64_image
+  image: "$CI_REGISTRY_IMAGE:alpine-3.18-amd64"
   <<: *linux_amd64
 
 # Oracle Linux
@@ -604,27 +604,27 @@ docs:
       - doc/misc/
     when: always
 
-# Jobs for regular GCC builds on Alpine Linux 3.17 (amd64)
+# Jobs for regular GCC builds on Alpine Linux 3.18 (amd64)
 
-gcc:alpine3.17:amd64:
+gcc:alpine3.18:amd64:
   variables:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON}"
-  <<: *alpine_3_17_amd64_image
+  <<: *alpine_3_18_amd64_image
   <<: *build_job
 
-system:gcc:alpine3.17:amd64:
-  <<: *alpine_3_17_amd64_image
+system:gcc:alpine3.18:amd64:
+  <<: *alpine_3_18_amd64_image
   <<: *system_test_job
   needs:
-    - job: gcc:alpine3.17:amd64
+    - job: gcc:alpine3.18:amd64
       artifacts: true
 
-unit:gcc:alpine3.17:amd64:
-  <<: *alpine_3_17_amd64_image
+unit:gcc:alpine3.18:amd64:
+  <<: *alpine_3_18_amd64_image
   <<: *unit_test_job
   needs:
-    - job: gcc:alpine3.17:amd64
+    - job: gcc:alpine3.18:amd64
       artifacts: true
 
 # Jobs for regular GCC builds on Oracle Linux 7 (amd64)
diff --git a/doc/arm/platforms.rst b/doc/arm/platforms.rst
index ce12eb9465..da9f68a0e7 100644
--- a/doc/arm/platforms.rst
+++ b/doc/arm/platforms.rst
@@ -51,7 +51,7 @@ following systems:
 -  Red Hat Enterprise Linux / CentOS / Oracle Linux 7, 8, 9
 -  FreeBSD 12.4, 13.2
 -  OpenBSD 7.3
--  Alpine Linux 3.17
+-  Alpine Linux 3.18
 
 The amd64, i386, armhf and arm64 CPU architectures are all fully
 supported.