Skip to content

Commit 9d62d6a

Browse files
Update README.md
1 parent 71ba7d5 commit 9d62d6a

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

src/base-alpine/README.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,7 @@
99
| *Categories* | Core, Other |
1010
| *Image type* | Dockerfile |
1111
| *Published images* | mcr.microsoft.com/devcontainers/base:alpine |
12-
<<<<<<< HEAD
1312
| *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))
1713
| *Published image architecture(s)* | x86-64, aarch64/arm64 |
1814
| *Container host OS support* | Linux, macOS, Windows |
1915
| *Container OS* | Alpine Linux |
@@ -30,7 +26,7 @@ You can also directly reference pre-built versions of `.devcontainer/Dockerfile`
3026
- `mcr.microsoft.com/devcontainers/base:alpine-3.21`
3127
- `mcr.microsoft.com/devcontainers/base:alpine-3.20`
3228
- `mcr.microsoft.com/devcontainers/base:alpine-3.19`
33-
- `mcr.microsoft.com/devcontainers/base:alpine-3.18`
29+
3430

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

0 commit comments

Comments
 (0)