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

Commit 2e92345

Browse files
committed
Add setting to workaround VSCR #1203, add runServices comment to Docker Compose defs
1 parent 3dfc88f commit 2e92345

File tree

57 files changed

+495
-245
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+495
-245
lines changed

container-templates/docker-compose/.devcontainer/devcontainer.json

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,21 @@
1212
// connected. This is typically a volume mount in .devcontainer/docker-compose.yml
1313
"workspaceFolder": "/workspace",
1414

15+
// Use 'settings' to set *default* container specific settings.json values on container create.
16+
// You can edit these settings after create using File > Preferences > Settings > Remote.
17+
"settings": {
18+
"terminal.integrated.shell.linux": "/bin/bash"
19+
},
20+
21+
// Uncomment the next line if you want start specific services in your Docker Compose config.
22+
// "runServices": [],
23+
1524
// Uncomment this like if you want to keep your containers running after VS Code shuts down.
1625
// "shutdownAction": "none",
1726

18-
// Uncomment the next line if you want to add in default container specific settings.json values
19-
// "settings": { "workbench.colorTheme": "Quiet Light" },
20-
2127
// Uncomment the next line to run commands after the container is created.
2228
// "postCreateCommand": "uname -a"
2329

24-
// Add the IDs of any extensions you want installed in the array below.
30+
// Add the IDs of extensions you want installed when the container is created in the array below.
2531
"extensions": []
26-
2732
}

container-templates/dockerfile/.devcontainer/devcontainer.json

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,18 @@
1818
// "-u", "vscode"
1919
],
2020

21+
// Use 'settings' to set *default* container specific settings.json values on container create.
22+
// You can edit these settings after create using File > Preferences > Settings > Remote.
23+
"settings": {
24+
"terminal.integrated.shell.linux": "/bin/bash"
25+
},
26+
2127
// Uncomment the next line if you want to publish any ports.
2228
// "appPort": [],
2329

24-
// Uncomment the next line if you want to add in default container specific settings.json values
25-
// "settings": { "workbench.colorTheme": "Quiet Light" },
26-
2730
// Uncomment the next line to run commands after the container is created.
2831
// "postCreateCommand": "uname -a",
2932

30-
// Add the IDs of any extensions you want installed in the array below.
33+
// Add the IDs of extensions you want installed when the container is created in the array below.
3134
"extensions": []
32-
33-
}
35+
}

container-templates/image/.devcontainer/devcontainer.json

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,18 @@
1515
// "-u", "vscode"
1616
],
1717

18+
// Use 'settings' to set *default* container specific settings.json values on container create.
19+
// You can edit these settings after create using File > Preferences > Settings > Remote.
20+
"settings": {
21+
"terminal.integrated.shell.linux": "/bin/bash"
22+
},
23+
1824
// Uncomment the next line if you want to publish any ports.
1925
// "appPort": [],
2026

21-
// Uncomment the next line if you want to add in default container specific settings.json values
22-
// "settings": { "workbench.colorTheme": "Quiet Light" },
23-
2427
// Uncomment the next line to run commands after the container is created - like installing git
2528
// "postCreateCommand": "apt-get update && apt-get install -y git",
2629

27-
// Add the IDs of any extensions you want installed in the array below.
30+
// Add the IDs of extensions you want installed when the container is created in the array below.
2831
"extensions": []
2932
}

containers/azure-ansible/.devcontainer/devcontainer.json

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,24 +13,26 @@
1313
"-v", "/var/run/docker.sock:/var/run/docker.sock"
1414
],
1515

16+
// Use 'settings' to set *default* container specific settings.json values on container create.
17+
// You can edit these settings after create using File > Preferences > Settings > Remote.
18+
"settings": {
19+
"terminal.integrated.shell.linux": "/bin/bash",
20+
"remote.extensionKind": {
21+
"ms-azuretools.vscode-docker": "workspace"
22+
}
23+
},
24+
1625
// Uncomment the next line if you want to publish any ports.
1726
// "appPort": [],
1827

19-
// Uncomment the next line if you want to add in default container specific settings.json values
20-
// "settings": { "workbench.colorTheme": "Quiet Light" },
21-
2228
// Uncomment the next line to run commands after the container is created.
2329
// "postCreateCommand": "ansible --version",
2430

31+
// Add the IDs of extensions you want installed when the container is created in the array below.
2532
"extensions": [
2633
"vscoss.vscode-ansible",
2734
"redhat.vscode-yaml",
2835
"ms-vscode.azurecli",
2936
"ms-azuretools.vscode-docker"
30-
],
31-
"settings": {
32-
"remote.extensionKind": {
33-
"ms-azuretools.vscode-docker": "workspace"
34-
}
35-
}
37+
]
3638
}

containers/azure-blockchain/.devcontainer/devcontainer.json

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,15 @@
22
"name": "Azure Blockchain",
33
"dockerFile": "Dockerfile",
44

5+
// Use 'settings' to set *default* container specific settings.json values on container create.
6+
// You can edit these settings after create using File > Preferences > Settings > Remote.
7+
"settings": {
8+
"terminal.integrated.shell.linux": "/bin/bash"
9+
},
10+
511
// Uncomment the next line if you want to publish any ports.
612
// "appPort": [],
7-
8-
// Uncomment the next line if you want to add in default container specific settings.json values
9-
// "settings": { "workbench.colorTheme": "Quiet Light" },
10-
13+
1114
// Uncomment the next line to run commands after the container is created.
1215
// "postCreateCommand": "az --version",
1316

@@ -16,6 +19,7 @@
1619
// and USER_GID in .devcontainer/Dockerfile to match your user if not 1000.
1720
// "runArgs": [ "-u", "vscode" ],
1821

22+
// Add the IDs of extensions you want installed when the container is created in the array below.
1923
"extensions": [
2024
"ms-vscode.azurecli",
2125
"azblockchain.azure-blockchain"

containers/azure-cli/.devcontainer/devcontainer.json

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,19 @@
1313
// "-u", "vscode"
1414
],
1515

16+
// Use 'settings' to set *default* container specific settings.json values on container create.
17+
// You can edit these settings after create using File > Preferences > Settings > Remote.
18+
"settings": {
19+
"terminal.integrated.shell.linux": "/bin/bash"
20+
},
21+
1622
// Uncomment the next line if you want to publish any ports.
1723
// "appPort": [],
1824

19-
// Uncomment the next line if you want to add in default container specific settings.json values
20-
// "settings": { "workbench.colorTheme": "Quiet Light" },
21-
2225
// Uncomment the next line to run commands after the container is created.
2326
// "postCreateCommand": "az --version",
2427

28+
// Add the IDs of extensions you want installed when the container is created in the array below.
2529
"extensions": [
2630
"ms-vscode.azurecli"
2731
]

containers/azure-functions-dotnetcore-2.1/.devcontainer/devcontainer.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,11 @@
33
"dockerFile": "Dockerfile",
44
"appPort": 7071,
55

6-
// Uncomment the next line if you want to add in default container specific settings.json values
7-
// "settings": { "workbench.colorTheme": "Quiet Light" },
6+
// Use 'settings' to set *default* container specific settings.json values on container create.
7+
// You can edit these settings after create using File > Preferences > Settings > Remote.
8+
"settings": {
9+
"terminal.integrated.shell.linux": "/bin/bash"
10+
},
811

912
// Uncomment the next line to run commands after the container is created.
1013
// "postCreateCommand": "dotnet restore",
@@ -14,6 +17,7 @@
1417
// and USER_GID in .devcontainer/Dockerfile to match your user if not 1000.
1518
// "runArgs": [ "-u", "vscode" ],
1619

20+
// Add the IDs of extensions you want installed when the container is created in the array below.
1721
"extensions": [
1822
"ms-azuretools.vscode-azurefunctions",
1923
"ms-vscode.csharp"

containers/azure-functions-dotnetcore-latest/.devcontainer/devcontainer.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,11 @@
33
"dockerFile": "Dockerfile",
44
"appPort": 7071,
55

6-
// Uncomment the next line if you want to add in default container specific settings.json values
7-
// "settings": { "workbench.colorTheme": "Quiet Light" },
6+
// Use 'settings' to set *default* container specific settings.json values on container create.
7+
// You can edit these settings after create using File > Preferences > Settings > Remote.
8+
"settings": {
9+
"terminal.integrated.shell.linux": "/bin/bash"
10+
},
811

912
// Uncomment the next line to run commands after the container is created.
1013
// "postCreateCommand": "dotnet restore",
@@ -14,6 +17,7 @@
1417
// and USER_GID in .devcontainer/Dockerfile to match your user if not 1000.
1518
// "runArgs": [ "-u", "vscode" ],
1619

20+
// Add the IDs of extensions you want installed when the container is created in the array below.
1721
"extensions": [
1822
"ms-azuretools.vscode-azurefunctions",
1923
"ms-vscode.csharp"

containers/azure-functions-java-8/.devcontainer/devcontainer.json

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,12 @@
33
"dockerFile": "Dockerfile",
44
"appPort": 7071,
55

6-
// Uncomment the next line if you want to add in default container specific settings.json values
7-
// "settings": { "workbench.colorTheme": "Quiet Light" },
6+
// Use 'settings' to set *default* container specific settings.json values on container create.
7+
// You can edit these settings after create using File > Preferences > Settings > Remote.
8+
"settings": {
9+
"terminal.integrated.shell.linux": "/bin/bash",
10+
"java.home": "/docker-java-home"
11+
},
812

913
// Uncomment the next line to run commands after the container is created.
1014
// "postCreateCommand": "java -version",
@@ -14,11 +18,9 @@
1418
// and USER_GID in .devcontainer/Dockerfile to match your user if not 1000.
1519
// "runArgs": [ "-u", "vscode" ],
1620

21+
// Add the IDs of extensions you want installed when the container is created in the array below.
1722
"extensions": [
1823
"ms-azuretools.vscode-azurefunctions",
1924
"vscjava.vscode-java-pack"
20-
],
21-
"settings": {
22-
"java.home": "/docker-java-home"
23-
}
25+
]
2426
}

containers/azure-functions-node-8/.devcontainer/devcontainer.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,11 @@
33
"dockerFile": "Dockerfile",
44
"appPort": 7071,
55

6-
// Uncomment the next line if you want to add in default container specific settings.json values
7-
// "settings": { "workbench.colorTheme": "Quiet Light" },
6+
// Use 'settings' to set *default* container specific settings.json values on container create.
7+
// You can edit these settings after create using File > Preferences > Settings > Remote.
8+
"settings": {
9+
"terminal.integrated.shell.linux": "/bin/bash"
10+
},
811

912
// Uncomment the next line to run commands after the container is created.
1013
// "postCreateCommand": "npm install",
@@ -14,6 +17,7 @@
1417
// and USER_GID in .devcontainer/Dockerfile to match your user if not 1000.
1518
// "runArgs": [ "-u", "node" ],
1619

20+
// Add the IDs of extensions you want installed when the container is created in the array below.
1721
"extensions": [
1822
"ms-azuretools.vscode-azurefunctions",
1923
"dbaeumer.vscode-eslint"

0 commit comments

Comments
 (0)