Skip to content

Commit 06f5ba3

Browse files
authored
Devcontainer update (npgsql#5922)
* Update devcontainer * Install the .NET 8 runtime * Update to postgres 17
1 parent 7ef908d commit 06f5ba3

File tree

5 files changed

+31
-23
lines changed

5 files changed

+31
-23
lines changed

.devcontainer/db/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
FROM postgres
1+
FROM postgres:17
22
RUN apt-get update && \
3-
apt-get install -y --no-install-recommends openssl postgresql-16-postgis-3
3+
apt-get install -y --no-install-recommends openssl postgresql-17-postgis-3

.devcontainer/devcontainer.json

+21-17
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,29 @@
55

66
"workspaceFolder": "/workspace",
77

8-
"settings": {
9-
"terminal.integrated.profiles.linux": {
10-
"bash": {
11-
"path": "/bin/bash"
12-
}
13-
},
14-
"terminal.integrated.defaultProfile.linux": "bash",
15-
"remote.extensionKind": {
16-
"ms-azuretools.vscode-docker": "workspace"
8+
"customizations": {
9+
"vscode": {
10+
"settings": {
11+
"terminal.integrated.profiles.linux": {
12+
"bash": {
13+
"path": "/bin/bash"
14+
}
15+
},
16+
"terminal.integrated.defaultProfile.linux": "bash",
17+
"remote.extensionKind": {
18+
"ms-azuretools.vscode-docker": "workspace"
19+
}
20+
},
21+
22+
"extensions": [
23+
"ms-dotnettools.csharp",
24+
"formulahendry.dotnet-test-explorer",
25+
"ms-azuretools.vscode-docker",
26+
"mutantdino.resourcemonitor"
27+
]
1728
}
1829
},
19-
20-
"extensions": [
21-
"ms-dotnettools.csharp",
22-
"formulahendry.dotnet-test-explorer",
23-
"ms-azuretools.vscode-docker",
24-
"mutantdino.resourcemonitor"
25-
],
26-
30+
2731
"forwardPorts": [5432, 5050],
2832

2933
"remoteEnv": {

.devcontainer/docker-compose.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ version: '3'
22

33
services:
44
npgsql-dev:
5-
# Source for tags: https://mcr.microsoft.com/v2/dotnet/sdk/tags/list
6-
image: mcr.microsoft.com/dotnet/sdk:8.0.100
5+
build: ./dotnet
76
volumes:
87
- ..:/workspace:cached
98
tty: true

.devcontainer/dotnet/Dockerfile

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Source for tags: https://mcr.microsoft.com/v2/dotnet/sdk/tags/list
2+
FROM mcr.microsoft.com/dotnet/sdk:9.0
3+
4+
# "install" the .NET 8 runtime
5+
COPY --from=mcr.microsoft.com/dotnet/sdk:8.0 /usr/share/dotnet/shared /usr/share/dotnet/shared

.vscode/settings.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"omnisharp.defaultLaunchSolution": "Npgsql.sln",
3-
"dotnet-test-explorer.testProjectPath": "**/*.Tests.csproj"
2+
"dotnet-test-explorer.testProjectPath": "**/*.Tests.csproj",
3+
"dotnet.defaultSolution": "Npgsql.sln"
44
}

0 commit comments

Comments
 (0)