diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 2a96978..a7e9315 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,5 +1,5 @@ # Update the VARIANT arg in docker-compose.yml to pick a Node version: 10, 12, 14 -ARG VARIANT=16 +ARG VARIANT=20 FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-${VARIANT} # See https://github.com/microsoft/vscode-dev-containers/tree/master/containers/docker-from-docker for more documentation diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 2f737bf..7ef8259 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -3,42 +3,41 @@ "dockerComposeFile": "docker-compose.yml", "service": "application", "workspaceFolder": "/workspace", - "settings": { - "terminal.integrated.defaultProfile.linux": "bash" + "customizations": { + "vscode": { + "settings": { + "terminal.integrated.defaultProfile.linux": "bash" + }, + "remoteEnv": { + "PATH": "${containerEnv:PATH}:/workspace/bin" + }, + "extensions": [ + "dbaeumer.vscode-eslint", + "esbenp.prettier-vscode", + "mikestead.dotenv", + "ms-azuretools.vscode-docker", + "ms-vsliveshare.vsliveshare", + "wayou.vscode-todo-highlight", + "xshrim.txt-syntax" + ] + } }, - "remoteEnv": { - "PATH": "${containerEnv:PATH}:/workspace/bin" - }, - "extensions": [ - "dbaeumer.vscode-eslint", - "esbenp.prettier-vscode", - "mikestead.dotenv", - "ms-azuretools.vscode-docker", - "ms-vsliveshare.vsliveshare", - "wayou.vscode-todo-highlight", - "xshrim.txt-syntax" - ], - "forwardPorts": [ - 3000, - 4000, - 9000, - 9001 - ], + "forwardPorts": [3000, 4000, 9000, 9001], "postCreateCommand": "bash -i .devcontainer/init.sh", -"remoteUser": "node", -"portsAttributes": { - "3000":{ - "label": "Example Application", - "onAutoForward": "notify" - }, - "4000": { - "label": "Imgproxy Server" - }, - "9000": { - "label": "Minio Server" - }, - "9001": { - "label": "Minio Console" - } + "remoteUser": "node", + "portsAttributes": { + "3000": { + "label": "Example Application", + "onAutoForward": "notify" + }, + "4000": { + "label": "Imgproxy Server" + }, + "9000": { + "label": "Minio Server" + }, + "9001": { + "label": "Minio Console" + } + } } -} \ No newline at end of file diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index 5534c7a..afe74ba 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -16,7 +16,7 @@ services: context: . dockerfile: Dockerfile args: - VARIANT: 14 + VARIANT: 20 USER_UID: 1000 USER_GID: 1000 networks: diff --git a/.nvmrc b/.nvmrc index b1215e8..c946e1d 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -v18.16.0 \ No newline at end of file +v20.9.0 \ No newline at end of file