From 842d594e76e74379d1a11fb9d029f35ff5e56374 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn-Michael=20Miehe?= <40151420+ldericher@users.noreply.github.com> Date: Thu, 26 Oct 2023 21:58:18 +0000 Subject: [PATCH] UI base container v0 -> v1 --- ui/.devcontainer/Dockerfile | 13 +++++++++++-- ui/.devcontainer/devcontainer.json | 18 +++++++++++------- ui/.vscode/settings.json | 15 ++++++++++++++- 3 files changed, 36 insertions(+), 10 deletions(-) diff --git a/ui/.devcontainer/Dockerfile b/ui/.devcontainer/Dockerfile index b355ae2..9dcfd1e 100644 --- a/ui/.devcontainer/Dockerfile +++ b/ui/.devcontainer/Dockerfile @@ -1,11 +1,20 @@ # [Choice] Node.js version (use -bullseye variants on local arm64/Apple Silicon): 18, 16, 14, 18-bullseye, 16-bullseye, 14-bullseye, 18-buster, 16-buster, 14-buster -ARG VARIANT=16-bullseye -FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-${VARIANT} +ARG VARIANT=16-bookworm +FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:1-${VARIANT} # [Optional] Uncomment this section to install additional OS packages. # RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ # && apt-get -y install --no-install-recommends +RUN set -ex; \ + \ + export DEBIAN_FRONTEND=noninteractive; \ + apt-get update; apt-get install --yes --no-install-recommends \ + git-flow \ + git-lfs \ + ; rm -rf /var/lib/apt/lists/*; \ + su node -c "git lfs install" + # [Optional] Uncomment if you want to install an additional version of node using nvm # ARG EXTRA_NODE_VERSION=10 # RUN su node -c "source /usr/local/share/nvm/nvm.sh && nvm install ${EXTRA_NODE_VERSION}" diff --git a/ui/.devcontainer/devcontainer.json b/ui/.devcontainer/devcontainer.json index 25b2127..e570ebf 100644 --- a/ui/.devcontainer/devcontainer.json +++ b/ui/.devcontainer/devcontainer.json @@ -1,9 +1,10 @@ // For format details, see https://aka.ms/devcontainer.json. For config options, see the README at: // https://github.com/microsoft/vscode-dev-containers/tree/v0.245.2/containers/javascript-node { - "name": "Node.js", + "name": "OVD UI", "build": { "dockerfile": "Dockerfile", + "context": "..", // Update 'VARIANT' to pick a Node version: 18, 16, 14. // Append -bullseye or -buster to pin to an OS version. // Use -bullseye variants on local arm64/Apple Silicon. @@ -11,18 +12,21 @@ "VARIANT": "18-bullseye" } }, - // Set *default* container specific settings.json values on container create. - "settings": { - "terminal.integrated.defaultProfile.linux": "zsh" - }, // Configure tool-specific properties. "customizations": { // Configure properties specific to VS Code. "vscode": { + // Set *default* container specific settings.json values on container create. + "settings": { + "terminal.integrated.defaultProfile.linux": "zsh" + }, // Add the IDs of extensions you want installed when the container is created. "extensions": [ "dbaeumer.vscode-eslint", - "octref.vetur" + "esbenp.prettier-vscode", + "mhutchie.git-graph", + "Syler.sass-indented", + "Vue.volar" ] } }, @@ -30,7 +34,7 @@ // "forwardPorts": [], // Use 'postCreateCommand' to run commands after the container is created. // "postCreateCommand": "yarn install", - "postStartCommand": "yarn install", + "postStartCommand": "yarn install --production false", // Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root. "remoteUser": "node" } \ No newline at end of file diff --git a/ui/.vscode/settings.json b/ui/.vscode/settings.json index 8a9bbe6..c6c940c 100644 --- a/ui/.vscode/settings.json +++ b/ui/.vscode/settings.json @@ -1,8 +1,21 @@ { "editor.formatOnSave": true, + "[vue]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[typescript]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[javascript]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, "editor.codeActionsOnSave": { "source.organizeImports": true }, "git.closeDiffOnOperation": true, - "editor.tabSize": 2 + "editor.tabSize": 2, + "sass.disableAutoIndent": true, + "sass.format.convert": false, + "sass.format.deleteWhitespace": true, + "prettier.trailingComma": "all", } \ No newline at end of file