From 4696142b2ab2a22cf6535a3761ad1ca2e28a8630 Mon Sep 17 00:00:00 2001 From: Min Idzelis Date: Fri, 2 May 2025 00:38:46 +0000 Subject: [PATCH] git doesn't like bind mount within git repo --- .devcontainer/server/docker-compose.yml | 1 - .devcontainer/server/vscode/launch.json | 23 ------- .devcontainer/server/vscode/settings.json | 63 ------------------- .../server/vscode => .vscode}/tasks.json | 10 +-- 4 files changed, 6 insertions(+), 91 deletions(-) delete mode 100644 .devcontainer/server/vscode/launch.json delete mode 100644 .devcontainer/server/vscode/settings.json rename {.devcontainer/server/vscode => .vscode}/tasks.json (72%) diff --git a/.devcontainer/server/docker-compose.yml b/.devcontainer/server/docker-compose.yml index 9b8f474474..0135591841 100644 --- a/.devcontainer/server/docker-compose.yml +++ b/.devcontainer/server/docker-compose.yml @@ -17,7 +17,6 @@ services: volumes: # bind mount host to /workspaces/immich - ../..:/workspaces/immich - - ./vscode:/workspaces/immich/.vscode - cli_node_modules:/workspaces/immich/cli/node_modules - e2e_node_modules:/workspaces/immich/e2e/node_modules - open_api_node_modules:/workspaces/immich/open-api/typescript-sdk/node_modules diff --git a/.devcontainer/server/vscode/launch.json b/.devcontainer/server/vscode/launch.json deleted file mode 100644 index ed3da9f667..0000000000 --- a/.devcontainer/server/vscode/launch.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "version": "0.2.0", - "configurations": [ - { - "type": "node", - "request": "attach", - "restart": true, - "port": 9231, - "name": "Immich API Server", - "remoteRoot": "/usr/src/app", - "localRoot": "${workspaceFolder}/server" - }, - { - "type": "node", - "request": "attach", - "restart": true, - "port": 9230, - "name": "Immich Workers", - "remoteRoot": "/usr/src/app", - "localRoot": "${workspaceFolder}/server" - } - ] -} diff --git a/.devcontainer/server/vscode/settings.json b/.devcontainer/server/vscode/settings.json deleted file mode 100644 index 396755a634..0000000000 --- a/.devcontainer/server/vscode/settings.json +++ /dev/null @@ -1,63 +0,0 @@ -{ - "[css]": { - "editor.defaultFormatter": "esbenp.prettier-vscode", - "editor.formatOnSave": true, - "editor.tabSize": 2 - }, - "[dart]": { - "editor.defaultFormatter": "Dart-Code.dart-code", - "editor.formatOnSave": true, - "editor.selectionHighlight": false, - "editor.suggest.snippetsPreventQuickSuggestions": false, - "editor.suggestSelection": "first", - "editor.tabCompletion": "onlySnippets", - "editor.wordBasedSuggestions": "off" - }, - "[javascript]": { - "editor.codeActionsOnSave": { - "source.organizeImports": "explicit", - "source.removeUnusedImports": "explicit" - }, - "editor.defaultFormatter": "esbenp.prettier-vscode", - "editor.formatOnSave": true, - "editor.tabSize": 2 - }, - "[json]": { - "editor.defaultFormatter": "esbenp.prettier-vscode", - "editor.formatOnSave": true, - "editor.tabSize": 2 - }, - "[jsonc]": { - "editor.defaultFormatter": "esbenp.prettier-vscode", - "editor.formatOnSave": true, - "editor.tabSize": 2 - }, - "[svelte]": { - "editor.codeActionsOnSave": { - "source.organizeImports": "explicit", - "source.removeUnusedImports": "explicit" - }, - "editor.defaultFormatter": "svelte.svelte-vscode", - "editor.formatOnSave": true, - "editor.tabSize": 2 - }, - "[typescript]": { - "editor.codeActionsOnSave": { - "source.organizeImports": "explicit", - "source.removeUnusedImports": "explicit" - }, - "editor.defaultFormatter": "esbenp.prettier-vscode", - "editor.formatOnSave": true, - "editor.tabSize": 2 - }, - "cSpell.words": ["immich"], - "editor.formatOnSave": true, - "eslint.validate": ["javascript", "svelte"], - "explorer.fileNesting.enabled": true, - "explorer.fileNesting.patterns": { - "*.dart": "${capture}.g.dart,${capture}.gr.dart,${capture}.drift.dart", - "*.ts": "${capture}.spec.ts,${capture}.mock.ts" - }, - "svelte.enable-ts-plugin": true, - "typescript.preferences.importModuleSpecifier": "non-relative" -} diff --git a/.devcontainer/server/vscode/tasks.json b/.vscode/tasks.json similarity index 72% rename from .devcontainer/server/vscode/tasks.json rename to .vscode/tasks.json index f07f373ce2..82edbcf138 100644 --- a/.devcontainer/server/vscode/tasks.json +++ b/.vscode/tasks.json @@ -4,14 +4,15 @@ { "label": "Immich API Server (Nest)", "type": "shell", - "command": "/immich-devcontainer/startNestApiServer.sh", + "command": "[ -f /immich-devcontainer/startNestApiServer.sh ] && /immich-devcontainer/startNestApiServer.sh || exit 0", "presentation": { "echo": true, "reveal": "always", "focus": false, "panel": "dedicated", "showReuseMessage": true, - "clear": true + "clear": false, + "close": true }, "runOptions": { "runOn": "default" @@ -21,14 +22,15 @@ { "label": "Immich Web Server (Vite)", "type": "shell", - "command": "/immich-devcontainer/startViteWebServer.sh", + "command": "[ -f /immich-devcontainer/startViteWebServer.sh ] && /immich-devcontainer/startViteWebServer.sh || exit 0", "presentation": { "echo": true, "reveal": "always", "focus": false, "panel": "dedicated", "showReuseMessage": true, - "clear": true + "clear": false, + "close": true }, "runOptions": { "runOn": "default"