Skip to content
This repository was archived by the owner on Nov 30, 2023. It is now read-only.

Commit e3aff76

Browse files
ChuxelChuxel
authored
Python 3.10 and .NET 6 (#1108)
1 parent 522f07b commit e3aff76

File tree

16 files changed

+71
-43
lines changed

16 files changed

+71
-43
lines changed

‎containers/dotnet-mssql/.devcontainer/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# [Choice] .NET Core version: 5.0, 3.1, 2.1
2-
ARG VARIANT=3.1
1+
# [Choice] .NET version: 6.0, 5.0, 3.1, 6.0-bullseye, 5.0-bullseye, 3.1-bullseye, 6.0-focal, 5.0-focal, 3.1-focal
2+
ARG VARIANT=5.0-bullseye
33
FROM mcr.microsoft.com/vscode/devcontainers/dotnet:${VARIANT}
44

55
# [Choice] Node.js version: none, lts/*, 16, 14, 12, 10

‎containers/dotnet-mssql/.devcontainer/docker-compose.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ services:
66
context: .
77
dockerfile: Dockerfile
88
args:
9-
# [Choice] Update 'VARIANT' to pick a .NET Core version: 2.1, 3.1, 5.0
10-
VARIANT: 5.0
9+
# [Choice] Update 'VARIANT' to pick a .NET Core version: 3.1, 5.0, 6.0, 6.0-bullseye, 6.0-buster
10+
VARIANT: 5.0-bullseye
1111
# [Choice] Node.js version: none, lts/*, 16, 14, 12, 10
1212
NODE_VERSION: "lts/*"
1313
# [Option] Install Azure CLI

‎containers/dotnet-mssql/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
| *Categories* | Core, Languages |
1111
| *Definition type* | Docker Compose |
1212
| *Published image architecture(s)* | x86-64 |
13-
| *Available image variants* | 2.1, 3.1, 5.0 |
13+
| *Available image variants* | [See .NET definition](../dotnet). |
1414
| *Works in Codespaces* | Yes |
1515
| *Container host OS support* | Linux, macOS, Windows |
16-
| *Container OS* | Ubuntu |
16+
| *Container OS* | Ubuntu (.NET 3.1-6.0), Debian (.NET 6.0 default) |
1717
| *Languages, platforms* | .NET, .NET Core, C#, Microsoft SQL |
1818

1919
## Description

‎containers/dotnet/.devcontainer/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# [Choice] .NET version: 5.0, 3.1, 2.1
2-
ARG VARIANT=3.1
1+
# [Choice] .NET version: 6.0, 5.0, 3.1, 6.0-bullseye, 5.0-bullseye, 3.1-bullseye, 6.0-focal, 5.0-focal, 3.1-focal
2+
ARG VARIANT=5.0-bullseye
33
FROM mcr.microsoft.com/vscode/devcontainers/dotnet:0-${VARIANT}
44

55
# [Choice] Node.js version: none, lts/*, 16, 14, 12, 10

‎containers/dotnet/.devcontainer/base.Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# [Choice] .NET version: 5.0, 3.1, 2.1
2-
ARG VARIANT="3.1"
3-
FROM mcr.microsoft.com/dotnet/sdk:${VARIANT}-focal
1+
# [Choice] .NET version: 6.0, 5.0, 3.1, 6.0-bullseye,
2+
ARG VARIANT="5.0-bullseye"
3+
FROM mcr.microsoft.com/dotnet/sdk:${VARIANT}
44

55
# Copy library scripts to execute
66
COPY library-scripts/*.sh library-scripts/*.env /tmp/library-scripts/

‎containers/dotnet/.devcontainer/devcontainer.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44
"build": {
55
"dockerfile": "Dockerfile",
66
"args": {
7-
// Update 'VARIANT' to pick a .NET Core version: 2.1, 3.1, 5.0
8-
"VARIANT": "5.0",
7+
// Update 'VARIANT' to pick a .NET Core version: 3.1, 5.0, 6.0
8+
// Append -bullseye or -buster to pin to an OS version.
9+
"VARIANT": "5.0-bullseye",
910
// Options
1011
"NODE_VERSION": "lts/*",
1112
"INSTALL_AZURE_CLI": "false"

‎containers/dotnet/README.md‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
| *Contributors* | The VS Code Team |
1010
| *Categories* | Core, Languages |
1111
| *Definition type* | Dockerfile |
12-
| *Published images* | mcr.microsoft.com/vscode/devcontainers/dotnet <br/> mcr.microsoft.com/vscode/devcontainers/dotnetcore |
13-
| *Available image variants* | 2.1, 3.1, 5.0 ([full list](https://mcr.microsoft.com/v2/vscode/devcontainers/dotnet/tags/list)) |
12+
| *Published images* | mcr.microsoft.com/vscode/devcontainers/dotnet |
13+
| *Available image variants* | 3.1 / 3.1-focal, 5.0 / 5.0-focal, 6.0 /6.0-bullseye, 6.0-focal, 5.0-bullseye, 3.1-bullseye ([full list](https://mcr.microsoft.com/v2/vscode/devcontainers/dotnet/tags/list)) |
1414
| *Published image architecture(s)* | x86-64 |
1515
| *Works in Codespaces* | Yes |
1616
| *Container host OS support* | Linux, macOS, Windows |
17-
| *Container OS* | Ubuntu |
17+
| *Container OS* | Ubuntu (`-focal`), Debian (`-bullseye`) |
1818
| *Languages, platforms* | .NET, .NET Core, C# |
1919

2020
See **[history](history)** for information on the contents of published images.
@@ -24,21 +24,24 @@ See **[history](history)** for information on the contents of published images.
2424
While this definition should work unmodified, you can select the version of .NET / .NET Core the container uses by updating the `VARIANT` arg in the included `devcontainer.json` (and rebuilding if you've already created the container).
2525

2626
```json
27+
// Or you can use 3.1-bullseye or 3.1-focal if you want to pin to an OS version
2728
"args": { "VARIANT": "3.1" }
2829
```
2930

31+
Note that .NET 6.0 has switched its default OS to Debian 12 / bullseye. We also offer a `6.0-focal` image if you would prefer to use Ubuntu 20.04 / Focal.
32+
3033
You can also directly reference pre-built versions of `.devcontainer/base.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.
3134

3235
- `mcr.microsoft.com/vscode/devcontainers/dotnet` (latest)
33-
- `mcr.microsoft.com/vscode/devcontainers/dotnet:2.1` (or `dotnetcore:2.1`)
34-
- `mcr.microsoft.com/vscode/devcontainers/dotnet:3.1` (or `dotnetcore:3.1`)
35-
- `mcr.microsoft.com/vscode/devcontainers/dotnet:5.0`
36+
- `mcr.microsoft.com/vscode/devcontainers/dotnet:3.1` (or `3.1-bullseye`, `3.1-focal` to pin to an OS version)
37+
- `mcr.microsoft.com/vscode/devcontainers/dotnet:5.0` (or `5.0-bullseye`, `5.0-focal` to pin to an OS version)
38+
- `mcr.microsoft.com/vscode/devcontainers/dotnet:6.0` (or `6.0-bullseye`, `6.0-focal` to pin to an OS version)
3639

3740
You can decide how often you want updates by referencing a [semantic version](https://semver.org/) of each image. For example:
3841

3942
- `mcr.microsoft.com/vscode/devcontainers/dotnet:0-3.1`
40-
- `mcr.microsoft.com/vscode/devcontainers/dotnet:0.201-3.1`
41-
- `mcr.microsoft.com/vscode/devcontainers/dotnet:0.201.6-3.1`
43+
- `mcr.microsoft.com/vscode/devcontainers/dotnet:0.203-3.1`
44+
- `mcr.microsoft.com/vscode/devcontainers/dotnet:0.203.0-3.1`
4245

4346
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/vscode/devcontainers/dotnet/tags/list).
4447

‎containers/dotnet/definition-manifest.json‎

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,36 @@
11
{
2-
"variants": ["5.0", "3.1", "2.1"],
3-
"definitionVersion": "0.201.10",
2+
"variants": ["6.0-bullseye-slim", "6.0-focal", "5.0-bullseye-slim", "5.0-focal", "3.1-bullseye", "3.1-focal"],
3+
"definitionVersion": "0.201.11",
44
"build": {
5-
"latest": true,
5+
"latest": "5.0-focal",
66
"rootDistro": "debian",
77
"tags": [
8-
"dotnet:${VERSION}-${VARIANT}",
9-
"dotnetcore:${VERSION}-${VARIANT}"
10-
]
8+
"dotnet:${VERSION}-${VARIANT}"
9+
],
10+
"variantTags": {
11+
"6.0-bullseye-slim": [
12+
"dotnet:${VERSION}-6.0",
13+
"dotnet:${VERSION}-6.0-bullseye"
14+
],
15+
"5.0-focal": [
16+
"dotnet:${VERSION}-5.0",
17+
"dotnetcore:${VERSION}-5.0"
18+
],
19+
"5.0-bullseye-slim": [
20+
"dotnet:${VERSION}-5.0-bullseye",
21+
"dotnetcore:${VERSION}-5.0-bullseye"
22+
],
23+
"3.1-focal": [
24+
"dotnet:${VERSION}-3.1",
25+
"dotnetcore:${VERSION}-3.1"
26+
],
27+
"3.1-bullseye": [
28+
"dotnetcore:${VERSION}-3.1-bullseye"
29+
]
30+
}
1131
},
1232
"dependencies": {
13-
"image": "mcr.microsoft.com/dotnet/sdk:${VARIANT}-focal",
33+
"image": "mcr.microsoft.com/dotnet/sdk:${VARIANT}",
1434
"imageLink": "https://hub.docker.com/_/microsoft-dotnet-sdk",
1535
"apt": [{
1636
"cgIgnore": false,

‎containers/python-3-postgres/.devcontainer/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# [Choice] Python version (use -bullseye variants on local arm64/Apple Silicon): 3, 3.9, 3.8, 3.7, 3.6, 3-bullseye, 3.9-bullseye, 3.8-bullseye, 3.7-bullseye, 3.6-bullseye, 3-buster, 3.9-buster, 3.8-buster, 3.7-buster, 3.6-buster
1+
# [Choice] Python version (use -bullseye variants on local arm64/Apple Silicon): 3, 3.10, 3.9, 3.8, 3.7, 3.6, 3-bullseye, 3.10-bullseye, 3.9-bullseye, 3.8-bullseye, 3.7-bullseye, 3.6-bullseye, 3-buster, 3.10-buster, 3.9-buster, 3.8-buster, 3.7-buster, 3.6-buster
22
ARG VARIANT=3-bullseye
33
FROM mcr.microsoft.com/vscode/devcontainers/python:${VARIANT}
44

‎containers/python-3-postgres/.devcontainer/docker-compose.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services:
66
context: ..
77
dockerfile: .devcontainer/Dockerfile
88
args:
9-
# Update 'VARIANT' to pick a version of Python: 3, 3.9, 3.8, 3.7, 3.6
9+
# Update 'VARIANT' to pick a version of Python: 3, 3.10, 3.9, 3.8, 3.7, 3.6
1010
# Append -bullseye or -buster to pin to an OS version.
1111
# Use -bullseye variants on local arm64/Apple Silicon.
1212
VARIANT: 3-bullseye

0 commit comments

Comments
 (0)