Skip to content

Commit 77c3a80

Browse files
authored
Merge branch 'main' into update_action_#296_VG
2 parents 0b82205 + f6bf706 commit 77c3a80

15 files changed

Lines changed: 34 additions & 46 deletions

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.20 |
10+
| imageVariant | Alpine version: | string | 3.21 |
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 & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"id": "alpine",
3-
"version": "3.2.2",
3+
"version": "3.4.0",
44
"name": "Alpine",
55
"description": "Simple Alpine container with Git installed.",
66
"documentationURL": "https://github.com/devcontainers/templates/tree/main/src/alpine",
@@ -11,10 +11,10 @@
1111
"type": "string",
1212
"description": "Alpine version:",
1313
"proposals": [
14+
"3.21",
1415
"3.20",
1516
"3.19",
16-
"3.18",
17-
"3.17"
17+
"3.18"
1818
],
1919
"default": "3.20"
2020
}

src/dotnet-mssql/devcontainer-template.json

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"id": "dotnet-mssql",
3-
"version": "3.4.0",
3+
"version": "3.5.0",
44
"name": "C# (.NET) and MS SQL",
55
"description": "Develop C# and .NET Core based applications. Includes all needed SDKs, extensions, dependencies and an MS SQL container for parallel database development. Adds an additional MS SQL container to the C# (.NET Core) container definition and deploys any .dacpac files from the mssql .devcontainer folder.",
66
"documentationURL": "https://github.com/devcontainers/templates/tree/main/src/dotnet-mssql",
@@ -13,16 +13,11 @@
1313
"proposals": [
1414
"9.0",
1515
"8.0",
16-
"6.0",
1716
"9.0-bookworm",
1817
"8.0-bookworm",
19-
"6.0-bookworm",
20-
"6.0-bullseye",
2118
"9.0-noble",
2219
"8.0-noble",
23-
"8.0-jammy",
24-
"6.0-jammy",
25-
"6.0-focal"
20+
"8.0-jammy"
2621
],
2722
"default": "9.0-bookworm"
2823
}

src/dotnet-postgres/devcontainer-template.json

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"id": "dotnet-postgres",
3-
"version": "3.3.0",
3+
"version": "3.4.0",
44
"name": "C# (.NET) and PostgreSQL",
55
"description": "Develop C# and .NET Core based applications. Includes all needed SDKs, extensions, dependencies and a PostgreSQL container for parallel database development. Adds an additional PostgreSQL container to the C# (.NET Core) container definition.",
66
"documentationURL": "https://github.com/devcontainers/templates/tree/main/src/dotnet-postgres",
@@ -13,16 +13,11 @@
1313
"proposals": [
1414
"9.0",
1515
"8.0",
16-
"6.0",
1716
"9.0-bookworm",
1817
"8.0-bookworm",
19-
"6.0-bookworm",
20-
"6.0-bullseye",
2118
"9.0-noble",
2219
"8.0-noble",
23-
"8.0-jammy",
24-
"6.0-jammy",
25-
"6.0-focal"
20+
"8.0-jammy"
2621
],
2722
"default": "9.0-bookworm"
2823
}

src/dotnet/devcontainer-template.json

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"id": "dotnet",
3-
"version": "3.3.0",
3+
"version": "3.4.0",
44
"name": "C# (.NET)",
55
"description": "Develop C# and .NET based applications. Includes all needed SDKs, extensions, and dependencies.",
66
"documentationURL": "https://github.com/devcontainers/templates/tree/main/src/dotnet",
@@ -13,16 +13,11 @@
1313
"proposals": [
1414
"9.0",
1515
"8.0",
16-
"6.0",
1716
"9.0-bookworm",
1817
"8.0-bookworm",
19-
"6.0-bookworm",
20-
"6.0-bullseye",
2118
"9.0-noble",
2219
"8.0-noble",
23-
"8.0-jammy",
24-
"6.0-jammy",
25-
"6.0-focal"
20+
"8.0-jammy"
2621
],
2722
"default": "9.0-bookworm"
2823
}

src/php-mariadb/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Develop PHP applications with MariaDB (MySQL Compatible).
77

88
| Options Id | Description | Type | Default Value |
99
|-----|-----|-----|-----|
10-
| imageVariant | PHP version (use -bookworm, -bullseye variants on local arm64/Apple Silicon): | string | 8.2-bookworm |
10+
| imageVariant | PHP version (use -bookworm, -bullseye variants on local arm64/Apple Silicon): | string | 8.4-bookworm |
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/php-mariadb/devcontainer-template.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"id": "php-mariadb",
3-
"version": "4.0.2",
3+
"version": "4.2.0",
44
"name": "PHP & MariaDB",
55
"description": "Develop PHP applications with MariaDB (MySQL Compatible).",
66
"documentationURL": "https://github.com/devcontainers/templates/tree/main/src/php-mariadb",
@@ -13,10 +13,12 @@
1313
"proposals": [
1414
"8-bookworm",
1515
"8.2-bookworm",
16-
"8.1-bookworm",
16+
"8.3-bookworm",
17+
"8.4-bookworm",
1718
"8-bullseye",
1819
"8.2-bullseye",
19-
"8.1-bullseye"
20+
"8.3-bullseye",
21+
"8.4-bullseye"
2022
],
2123
"default": "8.2-bookworm"
2224
}

src/php/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Develop PHP based applications. Includes needed tools, extensions, and dependenc
77

88
| Options Id | Description | Type | Default Value |
99
|-----|-----|-----|-----|
10-
| imageVariant | PHP version (use -bookworm, -bullseye variants on local arm64/Apple Silicon): | string | 8.2-bullseye |
10+
| imageVariant | PHP version (use -bookworm, -bullseye variants on local arm64/Apple Silicon): | string | 8.4-bookworm |
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/php/devcontainer-template.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"id": "php",
3-
"version": "4.0.2",
3+
"version": "4.2.0",
44
"name": "PHP",
55
"description": "Develop PHP based applications. Includes needed tools, extensions, and dependencies.",
66
"documentationURL": "https://github.com/devcontainers/templates/tree/main/src/php",
@@ -13,10 +13,12 @@
1313
"proposals": [
1414
"8-bookworm",
1515
"8.2-bookworm",
16-
"8.1-bookworm",
16+
"8.3-bookworm",
17+
"8.4-bookworm",
1718
"8-bullseye",
1819
"8.2-bullseye",
19-
"8.1-bullseye"
20+
"8.3-bullseye",
21+
"8.4-bullseye"
2022
],
2123
"default": "8.2-bullseye"
2224
}

src/postgres/devcontainer-template.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"id": "postgres",
3-
"version": "2.1.2",
3+
"version": "2.2.0",
44
"name": "Python 3 & PostgreSQL",
55
"description": "Develop applications with Python 3 and PostgreSQL. Includes a Python application container and PostgreSQL server.",
66
"documentationURL": "https://github.com/devcontainers/templates/tree/main/src/postgres",
@@ -15,17 +15,14 @@
1515
"3.11-bookworm",
1616
"3.10-bookworm",
1717
"3.9-bookworm",
18-
"3.8-bookworm",
1918
"3-bullseye",
2019
"3.11-bullseye",
2120
"3.10-bullseye",
2221
"3.9-bullseye",
23-
"3.8-bullseye",
2422
"3-buster",
2523
"3.11-buster",
2624
"3.10-buster",
27-
"3.9-buster",
28-
"3.8-buster"
25+
"3.9-buster"
2926
],
3027
"default": "3.11-bullseye"
3128
}

0 commit comments

Comments
 (0)