Merge pull request #1523 from felipecrs/fix-devcontainer

Fix devcontainer for latest Frigate and Home Assistant
This commit is contained in:
Dermot Duffy
2024-09-13 07:45:07 -07:00
committed by GitHub
5 changed files with 17 additions and 12 deletions
+2
View File
@@ -7,3 +7,5 @@ ARG HOME="/home/vscode"
ENV VOLTA_HOME="${HOME}/.volta" ENV VOLTA_HOME="${HOME}/.volta"
ENV PATH="${VOLTA_HOME}/bin:${PATH}" ENV PATH="${VOLTA_HOME}/bin:${PATH}"
RUN bash -c "$(curl -fsSL https://get.volta.sh)" -- --skip-setup RUN bash -c "$(curl -fsSL https://get.volta.sh)" -- --skip-setup
CMD ["sleep", "infinity"]
+8 -6
View File
@@ -1,15 +1,16 @@
// See https://aka.ms/vscode-remote/devcontainer.json for format details. // See https://aka.ms/vscode-remote/devcontainer.json for format details.
{ {
"dockerComposeFile": "../docker-compose.yml", "dockerComposeFile": "../docker-compose.yml",
"service": "dev", "service": "devcontainer",
"features": { "features": {
"ghcr.io/devcontainers/features/docker-outside-of-docker:1": { "ghcr.io/devcontainers/features/docker-outside-of-docker:1": {
"moby": false, "moby": false
"dockerDashComposeVersion": "v2"
} }
}, },
"updateRemoteUserUID": true,
"workspaceFolder": "${localWorkspaceFolder}", "workspaceFolder": "${localWorkspaceFolder}",
"shutdownAction": "stopCompose", "initializeCommand": [".devcontainer/initialize.sh"],
"postCreateCommand": ["yarn", "install"],
"forwardPorts": [10001, "hass:8123", "frigate:5000"], "forwardPorts": [10001, "hass:8123", "frigate:5000"],
"portsAttributes": { "portsAttributes": {
"10001": { "10001": {
@@ -25,8 +26,6 @@
"onAutoForward": "silent" "onAutoForward": "silent"
} }
}, },
"initializeCommand": ".devcontainer/initialize.sh",
"postCreateCommand": "yarn install",
"customizations": { "customizations": {
"vscode": { "vscode": {
"extensions": [ "extensions": [
@@ -39,9 +38,12 @@
"davidanson.vscode-markdownlint", "davidanson.vscode-markdownlint",
"redhat.vscode-yaml", "redhat.vscode-yaml",
"lokalise.i18n-ally", "lokalise.i18n-ally",
"vitest.explorer",
"inlang.vs-code-extension",
"ms-azuretools.vscode-docker" "ms-azuretools.vscode-docker"
], ],
"settings": { "settings": {
"task.allowAutomaticTasks": "on",
"files.eol": "\n", "files.eol": "\n",
"editor.tabSize": 2, "editor.tabSize": 2,
"editor.formatOnPaste": false, "editor.formatOnPaste": false,
+4 -1
View File
@@ -20,7 +20,10 @@
"endsPattern": "^created" "endsPattern": "^created"
} }
}, },
"isBackground": true "isBackground": true,
"runOptions": {
"runOn": "folderOpen"
}
} }
] ]
} }
+2 -4
View File
@@ -1,10 +1,8 @@
--- ---
services: services:
dev: devcontainer:
init: true
build: .devcontainer build: .devcontainer
entrypoint: /usr/local/share/docker-init.sh init: true
command: sleep infinity
env_file: env_file:
- .env - .env
volumes: volumes: