Skip to content

Commit 1472bcf

Browse files
committed
Revert "Merge remote-tracking branch 'origin/main' into feature/CCM-11188"
This reverts commit 2b862fd, reversing changes made to 51675ac.
1 parent 2b862fd commit 1472bcf

File tree

6 files changed

+166
-3195
lines changed

6 files changed

+166
-3195
lines changed

.devcontainer/devcontainer.json

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
{
2-
"build": {
3-
"dockerfile": "../scripts/devcontainer/Dockerfile"
4-
},
52
"customizations": {
63
"codespaces": {
74
"openFiles": [
@@ -12,7 +9,11 @@
129
},
1310
"vscode": {
1411
"extensions": [
12+
"ms-dotnettools.csdevkit",
1513
"42crunch.vscode-openapi",
14+
"alefragnani.bookmarks",
15+
"AmazonWebServices.aws-toolkit-vscode",
16+
"chdsbd.github-code-owners",
1617
"davidanson.vscode-markdownlint",
1718
"dbaeumer.vscode-eslint",
1819
"donjayamanne.githistory",
@@ -25,6 +26,7 @@
2526
"github.vscode-github-actions",
2627
"github.vscode-pull-request-github",
2728
"hediet.vscode-drawio",
29+
"johnpapa.vscode-peacock",
2830
"joshx.workspace-terminals",
2931
"maattdd.gitless",
3032
"mhutchie.git-graph",
@@ -38,10 +40,15 @@
3840
"streetsidesoftware.code-spell-checker-british-english",
3941
"takumii.markdowntable",
4042
"tamasfe.even-better-toml",
43+
"tomoki1207.pdf",
44+
"vscjava.vscode-java-pack",
45+
"vscode-icons-team.vscode-icons",
46+
"vstirbu.vscode-mermaid-preview",
4147
"wayou.vscode-todo-highlight",
4248
"yzane.markdown-pdf",
4349
"yzhang.dictionary-completion",
44-
"yzhang.markdown-all-in-one"
50+
"yzhang.markdown-all-in-one",
51+
"zoma.vscode-auto-open-workspace"
4552
],
4653
"settings": {
4754
"[makefile]": {
@@ -70,17 +77,30 @@
7077
"installZsh": true
7178
},
7279
"ghcr.io/devcontainers/features/docker-in-docker:2": {
80+
"azureDnsAutoDetection": true,
7381
"dockerDashComposeVersion": "v2",
7482
"installDockerBuildx": true,
7583
"installDockerComposeSwitch": true,
7684
"moby": true,
7785
"version": "latest"
7886
},
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": {},
7998
"ghcr.io/devcontainers/features/ruby:1": {}
8099
},
100+
"image": "mcr.microsoft.com/devcontainers/base:noble",
81101
"mounts": [
82-
"source=${localEnv:HOME}/.ssh,target=/home/vscode/.ssh,type=bind,consistency=cached"
102+
"source=${localEnv:HOME}/.gnupg,target=/home/vscode/.gnupg,type=bind,consistency=cached"
83103
],
84-
"name": "Devcontainer",
104+
"name": "Ubuntu",
85105
"postCreateCommand": "scripts/devcontainer/postcreatecommand.sh"
86106
}

0 commit comments

Comments
 (0)