devcontainer: fix workspace directory

colopl · Aug 22, 2024 · a76aa82 · a76aa82
1 parent 873401c
commit a76aa82
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -13,6 +13,8 @@
   },
   "dockerComposeFile": "./../compose.yaml",
   "service": "shell",
-  "workspaceMount": "source=${localWorkspaceFolder},target=/workspaces/pskel,type=bind,consistency=cached",
-  "workspaceFolder": "/workspaces/pskel"
+  "mounts": [
+    "source=${localWorkspaceFolder},target=/pskel,type=bind,consistency=cached"
+  ],
+  "workspaceFolder": "/pskel"
 }
diff --git a/pskel.sh b/pskel.sh
@@ -21,9 +21,9 @@ EOF
 
   PSKEL_EXT_DIR="/ext"
 
-  if test -d "/workspaces/pskel/ext"; then
-    echo "[Pskel] Development containers workspace detected, use \"/workspaces/pskel/ext\"." >&2
-    PSKEL_EXT_DIR="/workspaces/pskel/ext"
+  if test -d "/pskel/ext"; then
+    echo "[Pskel] Development containers workspace detected, use \"/pskel/ext\"." >&2
+    PSKEL_EXT_DIR="/pskel/ext"
   fi
 
   /usr/local/bin/php "/usr/src/php/ext/ext_skel.php" --ext "${1}" --dir "/tmp" ${@}
@@ -90,9 +90,9 @@ EOF
 
   PSKEL_EXT_DIR="/ext"
 
-  if test -d "/workspaces/pskel/ext"; then
-    echo "[Pskel] Development containers workspace detected, use \"/workspaces/pskel/ext\"." >&2
-    PSKEL_EXT_DIR="/workspaces/pskel/ext"
+  if test -d "/pskel/ext"; then
+    echo "[Pskel] Development containers workspace detected, use \"/pskel/ext\"." >&2
+    PSKEL_EXT_DIR="/pskel/ext"
   else
     if test -f "/ext/.gitkeep" && test $(cat "/ext/.gitkeep") = "pskel_uninitialized"; then
        echo "[Pskel] Uninitialized project detected, initialize default skeleton." >&2