From 1518ca2267b54531786557f82484c850c1fb3e53 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Wed, 29 May 2024 14:44:17 -0700
Subject: [PATCH] Support alpine 3.20 (#1081)

---
 src/base-alpine/.devcontainer/Dockerfile | 14 ++------------
 src/base-alpine/README.md                |  7 ++++---
 src/base-alpine/manifest.json            |  3 ++-
 3 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/src/base-alpine/.devcontainer/Dockerfile b/src/base-alpine/.devcontainer/Dockerfile
index 0c0285ede..a168f4078 100644
--- a/src/base-alpine/.devcontainer/Dockerfile
+++ b/src/base-alpine/.devcontainer/Dockerfile
@@ -1,12 +1,2 @@
-# [Choice] Alpine version: 3.19 3.18, 3.17, 3.16
-ARG VARIANT=3.19
-FROM alpine:${VARIANT}
-
-ARG VARIANT
-
-# Temporary: Upgrade packages due to mentioned CVEs
-RUN if [[ "$VARIANT" == "3.15" ]]; then \
-        apk update \
-        # https://security.alpinelinux.org/vuln/CVE-2023-27320
-        && apk add sudo>=1.9.12-r1 --repository https://dl-cdn.alpinelinux.org/alpine/latest-stable/community ; \
-    fi
+ARG VARIANT=3.20
+FROM alpine:${VARIANT}
\ No newline at end of file
diff --git a/src/base-alpine/README.md b/src/base-alpine/README.md
index bd2e79af0..46eb14654 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.19, 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.20, 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.20`
 - `mcr.microsoft.com/devcontainers/base:alpine-3.19`
 - `mcr.microsoft.com/devcontainers/base:alpine-3.18`
 - `mcr.microsoft.com/devcontainers/base:alpine-3.17`
@@ -32,8 +33,8 @@ Refer to [this guide](https://containers.dev/guide/dockerfile) for more details.
 You can decide how often you want updates by referencing a [semantic version](https://semver.org/) of each image. For example:
 
 - `mcr.microsoft.com/devcontainers/base:0-alpine`
-- `mcr.microsoft.com/devcontainers/base:0.204-alpine`
-- `mcr.microsoft.com/devcontainers/base:0.204.3-alpine`
+- `mcr.microsoft.com/devcontainers/base:0.209-alpine`
+- `mcr.microsoft.com/devcontainers/base:0.209.0-alpine`
 
 See [history](history) for information on the contents of each version and [here for a complete list of available tags](https://mcr.microsoft.com/v2/devcontainers/base/tags/list).
 
diff --git a/src/base-alpine/manifest.json b/src/base-alpine/manifest.json
index 4eb1947b0..89b83a8e3 100644
--- a/src/base-alpine/manifest.json
+++ b/src/base-alpine/manifest.json
@@ -1,6 +1,7 @@
 {
 	"version": "0.208.4",
 	"variants": [
+		"3.20",
 		"3.19",
 		"3.18",
 		"3.17",
@@ -18,7 +19,7 @@
 			"base:${VERSION}-alpine${VARIANT}"
 		],
 		"variantTags": {
-			"3.19": [
+			"3.20": [
 				"base:${VERSION}-alpine"
 			]
 		}