this gets the devcontainer working

Riverscapes · Jan 12, 2024 · 75cb5dc · 75cb5dc
1 parent be85250
commit 75cb5dc
Show file tree

Hide file tree

Showing 5 changed files with 69 additions and 51 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -3,11 +3,14 @@
   "name": "Gatsby Docs Dev Container",
   "waitFor": "onCreateCommand",
   // On container creation, install dependencies.
-  "postCreateCommand": "yarn install",
+  "postCreateCommand": "cd docs; yarn install",
   // Build and run the dev site on container start.
-  "postAttachCommand": "cd docs; yarn build; yarn serve",
+  "postAttachCommand": "cd docs; gatsby build; gatsby serve -H 0.0.0.0 -p 8000",
   "customizations": {
     "vscode": {
+      "settings": {
+        "terminal.integrated.defaultProfile.linux": "zsh"
+      },
       "extensions": [
         "GitHub.copilot",
         "GitHub.copilot-chat",

diff --git a/Workspaces/QRiS_DEV.code-workspace b/Workspaces/QRiS_DEV.code-workspace
@@ -1,49 +1,50 @@
 {
-	"folders": [
-		{
-			"path": "..",
-		} 
-	],
-	"settings": {
-		"[python]": {
-			"editor.tabSize": 4,
-			"editor.formatOnSave": true,
-		},
-		"files.exclude": {
-			"**/*.egg-info": true,
-			"**/__pycache__": true
-		},
-		"files.watcherExclude": {
-			"**/*.egg-info/**": true,
-			"**/__pycache__": true
-		},
-		"search.exclude": {
-			"**/*.egg-info": true,
-			"**/__pycache__": true
-		},
-		// FROM: https://gist.github.com/NicolaiMogensen/acfd8723720c4761aefef3cdfc2aa55a
-		// I like changing colors for my projects. QGIS projects are usually green. 
-		"workbench.colorCustomizations": {
-			"titleBar.activeForeground": "#ffffff",
-			"titleBar.activeBackground": "#b4b4b473",
-			// "editor.background": "#1c2c2a"
-		},
-		"terminal.integrated.env.osx": {
-			"PYTHONPATH": "${env:QGIS_PATH}/Contents/Resources/python:${env:QGIS_PATH}/Contents/Resources/python/site-packages:${env:QGIS_PATH}/Contents/Resources/python/site-packages/PyQt5:${workspaceFolder}/wheels",
-			"PATH": "${env:PATH}:${env:QGIS_PATH}/Contents/MacOS/bin"
-		},
-		// NOTE: For this to work you need an env file with "QGIS_PATH=/Applications/QGIS-LTR.app/Contents" or whatever your path is
+  "folders": [
+    {
+      "path": "..",
+    }
+  ],
+  "settings": {
+    "[python]": {
+      "editor.tabSize": 4,
+      "editor.formatOnSave": true,
+    },
+    "files.exclude": {
+      "**/*.egg-info": true,
+      "**/__pycache__": true
+    },
+    "files.watcherExclude": {
+      "**/*.egg-info/**": true,
+      "**/__pycache__": true
+    },
+    "search.exclude": {
+      "**/*.egg-info": true,
+      "**/__pycache__": true
+    },
+    // FROM: https://gist.github.com/NicolaiMogensen/acfd8723720c4761aefef3cdfc2aa55a
+    // I like changing colors for my projects. QGIS projects are usually green. 
+    "workbench.colorCustomizations": {
+      "titleBar.activeForeground": "#ffffff",
+      "titleBar.activeBackground": "#b4b4b473",
+      // "editor.background": "#1c2c2a"
+    },
+    "terminal.integrated.env.osx": {
+      "PYTHONPATH": "${env:QGIS_PATH}/Contents/Resources/python:${env:QGIS_PATH}/Contents/Resources/python/site-packages:${env:QGIS_PATH}/Contents/Resources/python/site-packages/PyQt5:${workspaceFolder}/wheels",
+      "PATH": "${env:PATH}:${env:QGIS_PATH}/Contents/MacOS/bin"
+    },
+    // NOTE: For this to work you need an env file with "QGIS_PATH=/Applications/QGIS-LTR.app/Contents" or whatever your path is
     "python.pythonPath": "${env:QGIS_PATH}/Contents/MacOS/bin/python3",
-		"qtForPython.uic.args": [
-			"-o \"${workspaceFolder}${pathSeparator}src${pathSeparator}view${pathSeparator}ui${pathSeparator}${fileBasenameNoExtension}.py\""
-		],
-		"qtForPython.rcc.args": [
-			"-o \"${workspaceFolder}${pathSeparator}src${pathSeparator}${fileBasenameNoExtension}.py\""
-			],
-			"qtForPython.rcc.liveExecution": false
-	},
-	"launch": {
-		"configurations": [],
-		"compounds": []
-	}
+    "qtForPython.uic.args": [
+      "-o \"${workspaceFolder}${pathSeparator}src${pathSeparator}view${pathSeparator}ui${pathSeparator}${fileBasenameNoExtension}.py\""
+    ],
+    "qtForPython.rcc.args": [
+      "-o \"${workspaceFolder}${pathSeparator}src${pathSeparator}${fileBasenameNoExtension}.py\""
+    ],
+    "qtForPython.rcc.liveExecution": false,
+    "terminal.integrated.defaultProfile.linux": "zsh"
+  },
+  "launch": {
+    "configurations": [],
+    "compounds": []
+  }
 }
diff --git a/docs/.vscode/launch.json b/docs/.vscode/launch.json
@@ -0,0 +1,14 @@
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "command": "yarn build",
+      "name": "Rebuild Gatsby",
+      "request": "launch",
+      "type": "node-terminal"
+    },
+  ]
+}
diff --git a/docs/package.json b/docs/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@riverscapes/template-clean",
+  "name": "@riverscapes/qris-docs",
   "description": "Riverscapes website powered by Gatsby and Markdown",
   "version": "1.0.0",
   "private": true,

diff --git a/docs/yarn.lock b/docs/yarn.lock
@@ -3278,9 +3278,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@riverscapes/template-clean@workspace:.":
+"@riverscapes/qris-docs@workspace:.":
   version: 0.0.0-use.local
-  resolution: "@riverscapes/template-clean@workspace:."
+  resolution: "@riverscapes/qris-docs@workspace:."
   dependencies:
     "@riverscapes/gatsby-theme": "npm:^0.1.23"
     gatsby: "npm:^5.10.0"