Switch back to original container

This commit is contained in:
Felipe Santos
2024-09-12 16:29:17 +00:00
parent 49924fc801
commit e45b281b53
5 changed files with 31 additions and 15 deletions
+10 -5
View File
@@ -1,6 +1,11 @@
FROM ghcr.io/felipecrs/devcontainer:2
FROM mcr.microsoft.com/devcontainers/base:ubuntu-22.04
RUN --mount=type=bind,source=package.json,target=/tmp/package.json \
retry --tries 3 --sleep 15s -- volta install \
"node@$(jq -er .volta.node /tmp/package.json)" \
"yarn@$(jq -er .volta.yarn /tmp/package.json)"
USER vscode
# Install Volta
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
CMD ["sleep", "infinity"]
+12 -3
View File
@@ -1,8 +1,16 @@
// See https://aka.ms/vscode-remote/devcontainer.json for format details.
{
"dockerComposeFile": "../docker-compose.yml",
"service": "dev",
"service": "devcontainer",
"features": {
"ghcr.io/devcontainers/features/docker-outside-of-docker:1": {
"moby": false
}
},
"updateRemoteUserUID": true,
"workspaceFolder": "${localWorkspaceFolder}",
"initializeCommand": [".devcontainer/initialize.sh"],
"postCreateCommand": ["yarn", "install"],
"forwardPorts": [10001, "hass:8123", "frigate:5000"],
"portsAttributes": {
"10001": {
@@ -18,8 +26,6 @@
"onAutoForward": "silent"
}
},
"initializeCommand": [".devcontainer/initialize.sh"],
"postCreateCommand": ["yarn", "install"],
"customizations": {
"vscode": {
"extensions": [
@@ -32,9 +38,12 @@
"davidanson.vscode-markdownlint",
"redhat.vscode-yaml",
"lokalise.i18n-ally",
"vitest.explorer",
"inlang.vs-code-extension",
"ms-azuretools.vscode-docker"
],
"settings": {
"task.allowAutomaticTasks": "on",
"files.eol": "\n",
"editor.tabSize": 2,
"editor.formatOnPaste": false,
+4 -1
View File
@@ -20,7 +20,10 @@
"endsPattern": "^created"
}
},
"isBackground": true
"isBackground": true,
"runOptions": {
"runOn": "folderOpen"
}
}
]
}
+4 -5
View File
@@ -1,12 +1,11 @@
services:
dev:
build:
context: .
dockerfile: .devcontainer/Dockerfile
devcontainer:
build: .devcontainer
init: true
env_file:
- .env
volumes:
- /var/run/docker.sock:/var/run/docker.sock
- /var/run/docker.sock:/var/run/docker-host.sock
- .:${LOCAL_WORKSPACE_FOLDER}:cached
hass:
extends: