Skip to content

Commit 0013b6c

Browse files
authored
Dev container - Image Naming convention changes (#376)
* Dev container - Image Naming convention changes * Applying review comments.
1 parent fa84c85 commit 0013b6c

8 files changed

Lines changed: 20 additions & 21 deletions

File tree

src/alpine/.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{
44
"name": "Alpine",
55
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
6-
"image": "mcr.microsoft.com/devcontainers/base:alpine-${templateOption:imageVariant}"
6+
"image": "mcr.microsoft.com/devcontainers/base:alpine${templateOption:imageVariant}"
77

88
// Features to add to the dev container. More info: https://containers.dev/features.
99
// "features": {},

src/alpine/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Simple Alpine container with Git installed.
77

88
| Options Id | Description | Type | Default Value |
99
|-----|-----|-----|-----|
10-
| imageVariant | Alpine version: | string | 3.21 |
10+
| imageVariant | Alpine version: | string | 3.22 |
1111

1212
This template references an image that was [pre-built](https://containers.dev/implementors/reference/#prebuilding) to automatically include needed devcontainer.json metadata.
1313

src/alpine/devcontainer-template.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,11 @@
1111
"type": "string",
1212
"description": "Alpine version:",
1313
"proposals": [
14+
"3.22",
1415
"3.21",
15-
"3.20",
16-
"3.19",
17-
"3.18"
16+
"3.20"
1817
],
19-
"default": "3.20"
18+
"default": "3.22"
2019
}
2120
},
2221
"platforms": ["Any"],

src/cpp-mariadb/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Develop C++ applications on Linux. Includes Debian C++ build tools.
77

88
| Options Id | Description | Type | Default Value |
99
|-----|-----|-----|-----|
10-
| imageVariant | Debian / Ubuntu version (use Debian 12, Debian 11, Ubuntu 24.04, and Ubuntu 22.04 on local arm64/Apple Silicon): | string | debian-11 |
10+
| imageVariant | Debian / Ubuntu version (use Debian 12, Debian 11, Ubuntu 24.04, and Ubuntu 22.04 on local arm64/Apple Silicon): | string | debian12 |
1111
| reinstallCmakeVersionFromSource | Install CMake version different from what base image has already installed. | string | none |
1212

1313
This template references an image that was [pre-built](https://containers.dev/implementors/reference/#prebuilding) to automatically include needed devcontainer.json metadata.

src/cpp-mariadb/devcontainer-template.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"id": "cpp-mariadb",
3-
"version": "3.0.3",
3+
"version": "3.1.0",
44
"name": "C++ & MariaDB",
55
"description": "Develop C++ applications on Linux. Includes Debian C++ build tools.",
66
"documentationURL": "https://github.com/devcontainers/templates/tree/main/src/cpp-mariadb",
@@ -11,12 +11,12 @@
1111
"type": "string",
1212
"description": "Debian / Ubuntu version (use Debian 12, Debian 11, Ubuntu 24.04, and Ubuntu 22.04 on local arm64/Apple Silicon):",
1313
"proposals": [
14-
"debian-12",
15-
"debian-11",
16-
"ubuntu-24.04",
17-
"ubuntu-22.04"
14+
"debian12",
15+
"debian11",
16+
"ubuntu24.04",
17+
"ubuntu22.04"
1818
],
19-
"default": "debian-11"
19+
"default": "debian12"
2020
},
2121
"reinstallCmakeVersionFromSource": {
2222
"type": "string",

src/cpp/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Develop C++ applications on Linux. Includes Debian C++ build tools.
77

88
| Options Id | Description | Type | Default Value |
99
|-----|-----|-----|-----|
10-
| imageVariant | Debian / Ubuntu version (use Debian 12, Debian 11, Ubuntu 24.04, and Ubuntu 22.04 on local arm64/Apple Silicon): | string | debian-11 |
10+
| imageVariant | Debian / Ubuntu version (use debian12, debian11, ubuntu24.04, and ubuntu22.04 on local arm64/Apple Silicon): | string | debian12 |
1111
| reinstallCmakeVersionFromSource | Install CMake version different from what base image has already installed. | string | none |
1212

1313
This template references an image that was [pre-built](https://containers.dev/implementors/reference/#prebuilding) to automatically include needed devcontainer.json metadata.

src/cpp/devcontainer-template.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"id": "cpp",
3-
"version": "3.0.3",
3+
"version": "3.1.0",
44
"name": "C++",
55
"description": "Develop C++ applications on Linux. Includes Debian C++ build tools.",
66
"documentationURL": "https://github.com/devcontainers/templates/tree/main/src/cpp",
@@ -11,12 +11,12 @@
1111
"type": "string",
1212
"description": "Debian / Ubuntu version (use Debian 12, Debian 11, Ubuntu 24.04, and Ubuntu 22.04 on local arm64/Apple Silicon):",
1313
"proposals": [
14-
"debian-12",
15-
"debian-11",
16-
"ubuntu-24.04",
17-
"ubuntu-22.04"
14+
"debian12",
15+
"debian11",
16+
"ubuntu24.04",
17+
"ubuntu22.04"
1818
],
19-
"default": "debian-11"
19+
"default": "debian12"
2020
},
2121
"reinstallCmakeVersionFromSource": {
2222
"type": "string",

src/ubuntu/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ A simple Ubuntu container with Git and other common utilities installed.
77

88
| Options Id | Description | Type | Default Value |
99
|-----|-----|-----|-----|
10-
| imageVariant | Ubuntu version (use ubuntu-22.04 or ubuntu-24.04 on local arm64/Apple Silicon): | string | noble |
10+
| imageVariant | Ubuntu version (use ubuntu22.04 or ubuntu24.04 on local arm64/Apple Silicon): | string | noble |
1111

1212
This template references an image that was [pre-built](https://containers.dev/implementors/reference/#prebuilding) to automatically include needed devcontainer.json metadata.
1313

0 commit comments

Comments
 (0)