From 1fff5aabc80a43546e0dddc6d23c042aaaf17b27 Mon Sep 17 00:00:00 2001
From: Eljo George <eljog@github.com>
Date: Thu, 11 Jan 2024 12:59:17 -0800
Subject: [PATCH] Support alpine 3.19 (#897)

* Support alpine 3.19

* devcontainer upgrade

* libssl1.1 is not installed on all flavors
---
 src/base-alpine/.devcontainer/Dockerfile          | 4 ++--
 src/base-alpine/README.md                         | 3 ++-
 src/base-alpine/manifest.json                     | 3 ++-
 src/base-alpine/test-project/test-utils-alpine.sh | 1 -
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/base-alpine/.devcontainer/Dockerfile b/src/base-alpine/.devcontainer/Dockerfile
index 1f2349f03..0c0285ede 100644
--- a/src/base-alpine/.devcontainer/Dockerfile
+++ b/src/base-alpine/.devcontainer/Dockerfile
@@ -1,5 +1,5 @@
-# [Choice] Alpine version: 3.18, 3.17, 3.16
-ARG VARIANT=3.18
+# [Choice] Alpine version: 3.19 3.18, 3.17, 3.16
+ARG VARIANT=3.19
 FROM alpine:${VARIANT}
 
 ARG VARIANT
diff --git a/src/base-alpine/README.md b/src/base-alpine/README.md
index 53853f37c..bd2e79af0 100644
--- a/src/base-alpine/README.md
+++ b/src/base-alpine/README.md
@@ -9,7 +9,7 @@
 | *Categories* | Core, Other |
 | *Image type* | Dockerfile |
 | *Published images* | mcr.microsoft.com/devcontainers/base:alpine |
-| *Available image variants* | alpine-3.18, alpine-3.17, alpine-3.16 ([full list](https://mcr.microsoft.com/v2/devcontainers/base/tags/list)) |
+| *Available image variants* | alpine-3.19, alpine-3.18, alpine-3.17, alpine-3.16 ([full list](https://mcr.microsoft.com/v2/devcontainers/base/tags/list)) |
 | *Published image architecture(s)* | x86-64, aarch64/arm64 |
 | *Container host OS support* | Linux, macOS, Windows |
 | *Container OS* | Alpine Linux |
@@ -22,6 +22,7 @@ See **[history](history)** for information on the contents of published images.
 You can also directly reference pre-built versions of `.devcontainer/Dockerfile` by using the `image` property in `.devcontainer/devcontainer.json` or updating the `FROM` statement in your own  `Dockerfile` to one of the following. An example `Dockerfile` is included in this repository.
 
 - `mcr.microsoft.com/devcontainers/base:alpine` (latest)
+- `mcr.microsoft.com/devcontainers/base:alpine-3.19`
 - `mcr.microsoft.com/devcontainers/base:alpine-3.18`
 - `mcr.microsoft.com/devcontainers/base:alpine-3.17`
 - `mcr.microsoft.com/devcontainers/base:alpine-3.16`
diff --git a/src/base-alpine/manifest.json b/src/base-alpine/manifest.json
index 9198c0edb..b722cd02e 100644
--- a/src/base-alpine/manifest.json
+++ b/src/base-alpine/manifest.json
@@ -1,6 +1,7 @@
 {
 	"version": "0.207.2",
 	"variants": [
+		"3.19",
 		"3.18",
 		"3.17",
 		"3.16"
@@ -17,7 +18,7 @@
 			"base:${VERSION}-alpine${VARIANT}"
 		],
 		"variantTags": {
-			"3.18": [
+			"3.19": [
 				"base:${VERSION}-alpine"
 			]
 		}
diff --git a/src/base-alpine/test-project/test-utils-alpine.sh b/src/base-alpine/test-project/test-utils-alpine.sh
index 0bf2176a6..e4cfd5a2f 100644
--- a/src/base-alpine/test-project/test-utils-alpine.sh
+++ b/src/base-alpine/test-project/test-utils-alpine.sh
@@ -128,7 +128,6 @@ checkCommon()
         libstdc++ \
         krb5-libs \
         libintl \
-        libssl1.1 \
         lttng-ust \
         tzdata \
         userspace-rcu \