Merge pull request #1390 from CloudWithChris/consolidation

Consolidation to ease maintenance

.devcontainer/devcontainer.json

@@ -1,20 +1,26 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/go
 {
-	"name": "Hugo (Community)",
-	"build": {
-		"dockerfile": "Dockerfile",
-		"args": {
-			// Update VARIANT to pick hugo variant.
-			// Example variants: hugo, hugo_extended
-			// Rebuild the container if it already exists to update.
-			"VARIANT": "hugo_extended",
-			// Update VERSION to pick a specific hugo version.
-			// Example versions: latest, 0.73.0, 0,71.1
-			// Rebuild the container if it already exists to update.
-			"VERSION": "latest",
-			// Update NODE_VERSION to pick the Node.js version: 12, 14
-			"NODE_VERSION": "14"
-		}
+	"name": "Go",
+	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
+	"image": "mcr.microsoft.com/devcontainers/go:1-bullseye",
+
+	// Features to add to the dev container. More info: https://containers.dev/features.
+	"features": {
+		"ghcr.io/devcontainers/features/hugo:1": {
+			"extended": true
+		},
+		"ghcr.io/devcontainers/features/node:1": {}
 	},
+
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	"forwardPorts": [
+		1313
+	],
+
+	// Use 'postCreateCommand' to run commands after the container is created.
+	"postCreateCommand": "cd exampleSite && npm ci",
+
 
 	// Configure tool-specific properties.
 	"customizations": {
@@ -33,19 +39,6 @@
 		}
 	},
 
-	// Use 'forwardPorts' to make a list of ports inside the container available locally.
-	"forwardPorts": [
-		1313
-	],
-
-	// Use 'postCreateCommand' to run commands after the container is created.
-	"postCreateCommand": "npm ci && git submodule update --init --recursive",
-
-	// Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
-	"remoteUser": "node",
-	"features": {
-	    "ghcr.io/devcontainers/features/sshd:1": {
-		"version": "latest"
-	    }
-	}
-}
+	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+	// "remoteUser": "root"
+}

.github/workflows/site-deployment.yaml

@@ -1,4 +1,4 @@
-name: Azure Static Web Apps CI/CD
+name: "GitHub Pages Deployment"
 
 # This GitHub Action workflow triggers in two scenarios - 
 # 1. When a push is made to the main branch
@@ -43,7 +43,7 @@ on:
 
 # Environment variables used for consistency across the workflow.
 env:
-  HUGO_VERSION: '0.112.2'
+  HUGO_VERSION: '0.122.0'
 
 jobs:
   # A set of steps used to compress the images, making sure that images are compressed ahead of publishing to the site.