Skip to content

Commit 2b862fd

Browse files
Merge remote-tracking branch 'origin/main' into feature/CCM-11188
2 parents 51675ac + 7d9230d commit 2b862fd

File tree

6 files changed

+3195
-166
lines changed

6 files changed

+3195
-166
lines changed

.devcontainer/devcontainer.json

Lines changed: 6 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
{
2+
"build": {
3+
"dockerfile": "../scripts/devcontainer/Dockerfile"
4+
},
25
"customizations": {
36
"codespaces": {
47
"openFiles": [
@@ -9,11 +12,7 @@
912
},
1013
"vscode": {
1114
"extensions": [
12-
"ms-dotnettools.csdevkit",
1315
"42crunch.vscode-openapi",
14-
"alefragnani.bookmarks",
15-
"AmazonWebServices.aws-toolkit-vscode",
16-
"chdsbd.github-code-owners",
1716
"davidanson.vscode-markdownlint",
1817
"dbaeumer.vscode-eslint",
1918
"donjayamanne.githistory",
@@ -26,7 +25,6 @@
2625
"github.vscode-github-actions",
2726
"github.vscode-pull-request-github",
2827
"hediet.vscode-drawio",
29-
"johnpapa.vscode-peacock",
3028
"joshx.workspace-terminals",
3129
"maattdd.gitless",
3230
"mhutchie.git-graph",
@@ -40,15 +38,10 @@
4038
"streetsidesoftware.code-spell-checker-british-english",
4139
"takumii.markdowntable",
4240
"tamasfe.even-better-toml",
43-
"tomoki1207.pdf",
44-
"vscjava.vscode-java-pack",
45-
"vscode-icons-team.vscode-icons",
46-
"vstirbu.vscode-mermaid-preview",
4741
"wayou.vscode-todo-highlight",
4842
"yzane.markdown-pdf",
4943
"yzhang.dictionary-completion",
50-
"yzhang.markdown-all-in-one",
51-
"zoma.vscode-auto-open-workspace"
44+
"yzhang.markdown-all-in-one"
5245
],
5346
"settings": {
5447
"[makefile]": {
@@ -77,30 +70,17 @@
7770
"installZsh": true
7871
},
7972
"ghcr.io/devcontainers/features/docker-in-docker:2": {
80-
"azureDnsAutoDetection": true,
8173
"dockerDashComposeVersion": "v2",
8274
"installDockerBuildx": true,
8375
"installDockerComposeSwitch": true,
8476
"moby": true,
8577
"version": "latest"
8678
},
87-
"ghcr.io/devcontainers/features/dotnet:2": {
88-
"aspNetCoreRuntimeVersions": "8.0",
89-
"dotnetRuntimeVersions": "8.0",
90-
"version": "8.0"
91-
},
92-
"ghcr.io/devcontainers/features/go:1": {},
93-
"ghcr.io/devcontainers/features/java:1": {
94-
"version": "17"
95-
},
96-
"ghcr.io/devcontainers/features/node:1": {},
97-
"ghcr.io/devcontainers/features/python:1": {},
9879
"ghcr.io/devcontainers/features/ruby:1": {}
9980
},
100-
"image": "mcr.microsoft.com/devcontainers/base:noble",
10181
"mounts": [
102-
"source=${localEnv:HOME}/.gnupg,target=/home/vscode/.gnupg,type=bind,consistency=cached"
82+
"source=${localEnv:HOME}/.ssh,target=/home/vscode/.ssh,type=bind,consistency=cached"
10383
],
104-
"name": "Ubuntu",
84+
"name": "Devcontainer",
10585
"postCreateCommand": "scripts/devcontainer/postcreatecommand.sh"
10686
}

0 commit comments

Comments
 (0)