From 22de42b5a8320b0acf46971ba533151ef7ef68ac Mon Sep 17 00:00:00 2001 From: Felipe Santos Date: Thu, 12 Sep 2024 10:00:46 -0300 Subject: [PATCH] Fix devcontainer But this is still failing with permission denied in some cases. --- .devcontainer/Dockerfile | 5 ++++- .devcontainer/devcontainer.json | 8 +++----- docker-compose.yml | 7 ++++--- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 5c196009..bc136453 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/devcontainers/base:ubuntu-22.04 +FROM mcr.microsoft.com/devcontainers/base:ubuntu-24.04 USER vscode @@ -7,3 +7,6 @@ ARG HOME="/home/vscode" ENV VOLTA_HOME="${HOME}/.volta" ENV PATH="${VOLTA_HOME}/bin:${PATH}" RUN bash -c "$(curl -fsSL https://get.volta.sh)" -- --skip-setup + +ENTRYPOINT ["/usr/local/share/docker-init.sh"] +CMD ["sleep", "infinity"] diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 9f34149b..883dbe3f 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -4,12 +4,10 @@ "service": "dev", "features": { "ghcr.io/devcontainers/features/docker-outside-of-docker:1": { - "moby": false, - "dockerDashComposeVersion": "v2" + "moby": false } }, "workspaceFolder": "${localWorkspaceFolder}", - "shutdownAction": "stopCompose", "forwardPorts": [10001, "hass:8123", "frigate:5000"], "portsAttributes": { "10001": { @@ -25,8 +23,8 @@ "onAutoForward": "silent" } }, - "initializeCommand": ".devcontainer/initialize.sh", - "postCreateCommand": "yarn install", + "initializeCommand": [".devcontainer/initialize.sh"], + "postCreateCommand": ["yarn", "install"], "customizations": { "vscode": { "extensions": [ diff --git a/docker-compose.yml b/docker-compose.yml index bc9e5cc1..7d56cfb4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,9 +2,10 @@ services: dev: init: true - build: .devcontainer - entrypoint: /usr/local/share/docker-init.sh - command: sleep infinity + build: + context: . + dockerfile: .devcontainer/Dockerfile + network_mode: host env_file: - .env volumes: