Merge branch 'main' into Ruby_3.4_Upgrade

devcontainers · Jan 9, 2025 · 3cea717 · 3cea717
2 parents 3403968 + 4e1ab07
commit 3cea717
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git 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.20, alpine-3.19, alpine-3.18, alpine-3.17 ([full list](https://mcr.microsoft.com/v2/devcontainers/base/tags/list)) |
+| *Available image variants* | alpine-3.20, alpine-3.19, alpine-3.18 ([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 |
@@ -25,7 +25,6 @@ You can also directly reference pre-built versions of `.devcontainer/Dockerfile`
 - `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`
 
 Refer to [this guide](https://containers.dev/guide/dockerfile) for more details.
 

diff --git a/src/base-alpine/manifest.json b/src/base-alpine/manifest.json
@@ -3,8 +3,7 @@
 	"variants": [
 		"3.20",
 		"3.19",
-		"3.18",
-		"3.17"
+		"3.18"
 	],
 	"build": {
 		"latest": false,
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,8 +3,7 @@ @@
     	"variants": [
     		"3.20",
     		"3.19",
-    		"3.18",
-    		"3.17"
+    		"3.18"
     	],
     	"build": {
     		"latest": false,
@@ Expand Down @@