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

Commit 9541467

Browse files
authored
Always use focal image per #1137
1 parent e2a28a6 commit 9541467

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

containers/dotnet-mssql/.devcontainer/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
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
3-
FROM mcr.microsoft.com/vscode/devcontainers/dotnet:${VARIANT}
1+
# [Choice] .NET version: 6.0, 5.0, 3.1
2+
ARG VARIANT=6.0
3+
FROM mcr.microsoft.com/vscode/devcontainers/dotnet:${VARIANT}-focal
44

55
# [Choice] Node.js version: none, lts/*, 16, 14, 12, 10
66
ARG NODE_VERSION="none"

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ services:
77
dockerfile: Dockerfile
88
args:
99
# Update 'VARIANT' to pick a version of .NET: 3.1, 5.0, 6.0
10-
# Append -bullseye or -focal to pin to an OS version.
11-
VARIANT: 5.0-focal
10+
VARIANT: 6.0
1211
# Optional version of Node.js
1312
NODE_VERSION: "lts/*"
1413

containers/dotnet-mssql/README.md

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

1919
## Description
20-
This definition creates two containers, one for C# (.NET) and one for Microsoft SQL. VS Code will attach to the .NET Core container, and from within that container the Microsoft SQL container will be available on **`localhost`** port 1433. By default, the `sa` user password is `P@ssw0rd`. For more on the configuration of MS SQL, see the section [MS SQL Configuration](#MS-SQL-Configuration)
20+
This definition creates two containers, one for C# (.NET) and one for Microsoft SQL. VS Code will attach to the .NET Core container, and from within that container the Microsoft SQL container will be available on **`localhost`** port 1433. By default, the `sa` user password is `P@ssw0rd`. For more on the configuration of MS SQL, see the section [MS SQL Configuration](#MS-SQL-Configuration)
2121

2222
## Using this definition
2323

@@ -28,6 +28,8 @@ args:
2828
VARIANT: "3.1"
2929
```
3030
31+
This will currently always use an Ubuntu 20.04/focal based .NET image since there is not yet a Debian 11/Bullseye ODBC driver.
32+
3133
### Debug Configuration
3234
3335
Only the integrated terminal is supported by the Remote - Containers extension. You may need to modify your `.vscode/launch.json` configurations to include the following:

0 commit comments

Comments
 (0)