From b83a9d1ba15e1f9cb22887f691b965b297cbdf3e Mon Sep 17 00:00:00 2001 From: Josh Kasten Date: Tue, 17 Oct 2023 20:53:35 +0000 Subject: [PATCH] use root docker-compose.yml for vscode Motivation is recent versions of docker no longer consider .devcontainer/docker-compose.yml valid, so vscode can't start the container. Solution here is just removing the specific vscode docker-compose.yml so only the root one is used. There is nothing specific needed in the vscode specific one anyway. --- .devcontainer/devcontainer.json | 5 +---- .devcontainer/docker-compose.yml | 30 ------------------------------ 2 files changed, 1 insertion(+), 34 deletions(-) delete mode 100644 .devcontainer/docker-compose.yml diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 67b8bb07a..419f2f952 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -7,12 +7,9 @@ // Update the 'dockerComposeFile' list if you have more compose files or use different names. // The .devcontainer/docker-compose.yml file contains any overrides you need/want to make. "dockerComposeFile": [ - "../docker-compose.yml", - "docker-compose.yml" + "../docker-compose.yml" ], - // The 'service' property is the name of the service for the container that VS Code should - // use. Update this value and .devcontainer/docker-compose.yml to the real service name. "service": "onesignal-web-sdk-dev", // The optional 'workspaceFolder' property is the path VS Code should open by default when diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml deleted file mode 100644 index a162fdb49..000000000 --- a/.devcontainer/docker-compose.yml +++ /dev/null @@ -1,30 +0,0 @@ -version: '3.4' -services: - # Update this to the name of the service you want to work with in your docker-compose.yml file - onesignal-web-sdk-dev: - # If you want add a non-root user to your Dockerfile, you can use the "remoteUser" - # property in devcontainer.json to cause VS Code its sub-processes (terminals, tasks, - # debugging) to execute as the user. Uncomment the next line if you want the entire - # container to run as this user instead. Note that, on Linux, you may need to - # ensure the UID and GID of the container user you create matches your local user. - # See https://aka.ms/vscode-remote/containers/non-root for details. - # - # user: vscode - - # Uncomment if you want to override the service's Dockerfile to one in the .devcontainer - # folder. Note that the path of the Dockerfile and context is relative to the *primary* - # docker-compose.yml file (the first in the devcontainer.json "dockerComposeFile" - # array). The sample below assumes your primary file is in the root of your project. - # - # build: - # context: . - # dockerfile: .devcontainer/Dockerfile - - # Uncomment the next line to use Docker from inside the container. See https://aka.ms/vscode-remote/samples/docker-from-docker-compose for details. - # - /var/run/docker.sock:/var/run/docker.sock - - # Uncomment the next four lines if you will use a ptrace-based debugger like C++, Go, and Rust. - # cap_add: - # - SYS_PTRACE - # security_opt: - # - seccomp:unconfined