Skip to content

Commit c12c44d

Browse files
authored
remove workarounds and cleanup (#71)
* remove workarounds and cleanup * fix licenses * fix tasks * add flake8 extension
1 parent af867b1 commit c12c44d

File tree

3 files changed

+39
-41
lines changed

3 files changed

+39
-41
lines changed

.devcontainer/Dockerfile

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,3 @@ COPY scripts/*.sh /tmp/scripts/
2525
RUN find /tmp/scripts/ -type f -iname "*.sh" -exec chmod +x {} \;
2626
RUN /bin/bash /tmp/scripts/container-set.sh
2727
RUN /bin/bash /tmp/scripts/configure-proxies.sh
28-
29-
# Setting the ENTRYPOINT to docker-init.sh will start up the Docker Engine
30-
# inside the container "overrideCommand": false is set in devcontainer.json.
31-
# The script will also execute CMD if you need to alter startup behaviors.
32-
ENTRYPOINT [ "/usr/local/share/docker-init.sh" ]
33-
CMD [ "sleep", "infinity" ]

.devcontainer/devcontainer.json

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -9,40 +9,40 @@
99
"--init",
1010
"--privileged"
1111
],
12-
// Set *default* container specific settings.json values on container create.
13-
"settings": {
14-
"python.pythonPath": "/usr/bin/python3",
15-
"python.defaultInterpreterPath": "/usr/bin/python3",
16-
"python.disableInstallationCheck": true,
17-
"python.linting.enabled": true,
18-
"python.formatting.provider": "black",
19-
"python.linting.banditEnabled": true,
20-
"python.linting.flake8Enabled": true,
21-
"terminal.integrated.defaultProfile.linux": "zsh",
22-
"terminal.integrated.profiles.linux": {
23-
"zsh": {
24-
"path": "/usr/bin/zsh"
25-
}
12+
"customizations": {
13+
"vscode": {
14+
// Set *default* container specific settings.json values on container create.
15+
"settings": {
16+
"python.pythonPath": "/usr/bin/python3",
17+
"python.defaultInterpreterPath": "/usr/bin/python3",
18+
"python.disableInstallationCheck": true,
19+
"python.linting.enabled": true,
20+
"python.formatting.provider": "black",
21+
"python.linting.banditEnabled": true,
22+
"python.linting.flake8Enabled": true,
23+
"terminal.integrated.defaultProfile.linux": "zsh",
24+
"terminal.integrated.profiles.linux": {
25+
"zsh": {
26+
"path": "/usr/bin/zsh"
27+
}
28+
}
29+
},
30+
// Add the IDs of extensions you want installed when the container is created.
31+
"extensions": [
32+
"ms-python.python",
33+
"dbaeumer.vscode-eslint",
34+
"ms-azuretools.vscode-dapr",
35+
"ms-azuretools.vscode-docker",
36+
"rpdswtk.vsmqtt",
37+
"dotjoshjohnson.xml",
38+
"ms-kubernetes-tools.vscode-kubernetes-tools",
39+
"matangover.mypy",
40+
"anweber.vscode-httpyac",
41+
"ms-python.isort",
42+
"ms-python.flake8"
43+
]
2644
}
2745
},
28-
// workaround for the devcontainer features
29-
"overrideCommand": false,
30-
"mounts": [
31-
"source=dind-var-lib-docker,target=/var/lib/docker,type=volume"
32-
],
33-
// Add the IDs of extensions you want installed when the container is created.
34-
"extensions": [
35-
"ms-python.python",
36-
"dbaeumer.vscode-eslint",
37-
"ms-azuretools.vscode-dapr",
38-
"ms-azuretools.vscode-docker",
39-
"rpdswtk.vsmqtt",
40-
"dotjoshjohnson.xml",
41-
"ms-kubernetes-tools.vscode-kubernetes-tools",
42-
"matangover.mypy",
43-
"anweber.vscode-httpyac",
44-
"ms-python.isort"
45-
],
4646
// Use 'forwardPorts' to make a list of ports inside the container available locally.
4747
// "forwardPorts": [],
4848
"onCreateCommand": "bash .devcontainer/scripts/postCreateCommand.sh",

.vscode/tasks.json

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
"presentation": {
1515
"close": true,
1616
"reveal": "never"
17-
}
17+
},
18+
"hide": true
1819
},
1920
{
2021
"label": "dapr-SeatAdjuster-stop",
@@ -25,7 +26,8 @@
2526
"presentation": {
2627
"close": true,
2728
"reveal": "never"
28-
}
29+
},
30+
"hide": true
2931
},
3032
{
3133
"label": "ensure-dapr",
@@ -34,7 +36,8 @@
3436
"group": "none",
3537
"presentation": {
3638
"close": true
37-
}
39+
},
40+
"problemMatcher": []
3841
},
3942
{
4043
"label": "run-mosquitto",
@@ -286,6 +289,7 @@
286289
"command": "pre-commit run --show-diff-on-failure --color=always --all-files",
287290
"group": "none",
288291
"isBackground": false,
292+
"problemMatcher": []
289293
}
290294
],
291295
"inputs": [

0 commit comments

Comments
 (0)