Skip to content

Commit 68971ba

Browse files
Merge branch 'devcontainers:main' into anaconda_compare_install_vuln_pkgs
2 parents b315f49 + 5c7ef7a commit 68971ba

File tree

24 files changed

+44
-52
lines changed

24 files changed

+44
-52
lines changed

src/anaconda/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "0.205.0",
2+
"version": "0.205.1",
33
"build": {
44
"latest": true,
55
"rootDistro": "debian",
Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,2 @@
1-
# [Choice] Alpine version: 3.19 3.18, 3.17, 3.16
2-
ARG VARIANT=3.19
3-
FROM alpine:${VARIANT}
4-
5-
ARG VARIANT
6-
7-
# Temporary: Upgrade packages due to mentioned CVEs
8-
RUN if [[ "$VARIANT" == "3.15" ]]; then \
9-
apk update \
10-
# https://security.alpinelinux.org/vuln/CVE-2023-27320
11-
&& apk add sudo>=1.9.12-r1 --repository https://dl-cdn.alpinelinux.org/alpine/latest-stable/community ; \
12-
fi
1+
ARG VARIANT=3.20
2+
FROM alpine:${VARIANT}

src/base-alpine/README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
| *Categories* | Core, Other |
1010
| *Image type* | Dockerfile |
1111
| *Published images* | mcr.microsoft.com/devcontainers/base:alpine |
12-
| *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)) |
12+
| *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)) |
1313
| *Published image architecture(s)* | x86-64, aarch64/arm64 |
1414
| *Container host OS support* | Linux, macOS, Windows |
1515
| *Container OS* | Alpine Linux |
@@ -22,6 +22,7 @@ See **[history](history)** for information on the contents of published images.
2222
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.
2323

2424
- `mcr.microsoft.com/devcontainers/base:alpine` (latest)
25+
- `mcr.microsoft.com/devcontainers/base:alpine-3.20`
2526
- `mcr.microsoft.com/devcontainers/base:alpine-3.19`
2627
- `mcr.microsoft.com/devcontainers/base:alpine-3.18`
2728
- `mcr.microsoft.com/devcontainers/base:alpine-3.17`
@@ -32,8 +33,8 @@ Refer to [this guide](https://containers.dev/guide/dockerfile) for more details.
3233
You can decide how often you want updates by referencing a [semantic version](https://semver.org/) of each image. For example:
3334

3435
- `mcr.microsoft.com/devcontainers/base:0-alpine`
35-
- `mcr.microsoft.com/devcontainers/base:0.204-alpine`
36-
- `mcr.microsoft.com/devcontainers/base:0.204.3-alpine`
36+
- `mcr.microsoft.com/devcontainers/base:0.209-alpine`
37+
- `mcr.microsoft.com/devcontainers/base:0.209.0-alpine`
3738

3839
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).
3940

src/base-alpine/manifest.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
2-
"version": "0.208.4",
2+
"version": "0.209.0",
33
"variants": [
4+
"3.20",
45
"3.19",
56
"3.18",
67
"3.17",
@@ -18,7 +19,7 @@
1819
"base:${VERSION}-alpine${VARIANT}"
1920
],
2021
"variantTags": {
21-
"3.19": [
22+
"3.20": [
2223
"base:${VERSION}-alpine"
2324
]
2425
}

src/base-debian/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "1.0.11",
2+
"version": "1.0.12",
33
"variants": [
44
"bookworm",
55
"buster",

src/base-ubuntu/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "1.1.0",
2+
"version": "1.1.1",
33
"variants": [
44
"noble",
55
"jammy",

src/cpp/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "1.2.0",
2+
"version": "1.2.1",
33
"variants": [
44
"bookworm",
55
"bullseye",

src/dotnet/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "1.1.7",
2+
"version": "1.1.8",
33
"variants": [
44
"8.0-bookworm-slim",
55
"8.0-jammy",

src/go/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "1.1.12",
2+
"version": "1.1.13",
33
"variants": [
44
"1.22-bookworm",
55
"1.21-bookworm",

src/java-8/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "2.0.11",
2+
"version": "2.0.12",
33
"variants": [
44
"bookworm",
55
"bullseye",

0 commit comments

Comments
 (0)