Skip to content

Commit 71ba7d5

Browse files
Revert "EOL changes to alpine(3.18)"
This reverts commit cc4b22b.
1 parent e609ab1 commit 71ba7d5

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

src/base-alpine/README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@
99
| *Categories* | Core, Other |
1010
| *Image type* | Dockerfile |
1111
| *Published images* | mcr.microsoft.com/devcontainers/base:alpine |
12+
<<<<<<< HEAD
1213
| *Available image variants* | alpine-3.22, alpine-3.21, alpine-3.20, alpine-3.19 ([full list](https://mcr.microsoft.com/v2/devcontainers/base/tags/list)) |
14+
=======
15+
| *Available image variants* | alpine-3.21, alpine-3.20, alpine-3.19, alpine-3.18 ([full list](https://mcr.microsoft.com/v2/devcontainers/base/tags/list)) |
16+
>>>>>>> parent of cc4b22bb (EOL changes to alpine(3.18))
1317
| *Published image architecture(s)* | x86-64, aarch64/arm64 |
1418
| *Container host OS support* | Linux, macOS, Windows |
1519
| *Container OS* | Alpine Linux |
@@ -26,6 +30,7 @@ You can also directly reference pre-built versions of `.devcontainer/Dockerfile`
2630
- `mcr.microsoft.com/devcontainers/base:alpine-3.21`
2731
- `mcr.microsoft.com/devcontainers/base:alpine-3.20`
2832
- `mcr.microsoft.com/devcontainers/base:alpine-3.19`
33+
- `mcr.microsoft.com/devcontainers/base:alpine-3.18`
2934

3035
Refer to [this guide](https://containers.dev/guide/dockerfile) for more details.
3136

src/base-alpine/manifest.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
"3.22",
55
"3.21",
66
"3.20",
7-
"3.19"
7+
"3.19",
8+
"3.18"
89
],
910
"build": {
1011
"latest": false,

0 commit comments

Comments
 (0)