From 32c9690feee06ce57278c1b3985d5368ef27229a Mon Sep 17 00:00:00 2001
From: danny2097 <danielcampbell2097@hotmail.com>
Date: Thu, 11 Jul 2024 15:00:36 +0100
Subject: [PATCH] updated for 24/25

---
 .devcontainer/Dockerfile        |  2 +-
 .devcontainer/devcontainer.json | 22 +++++++++++++++-------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index fbbee2f..88fec42 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -3,4 +3,4 @@ ARG VARIANT=jammy
 FROM mcr.microsoft.com/vscode/devcontainers/base:0-${VARIANT}
 Label Author: Dan Campbell
 Label Module: CIS3158
-Label Year: 2023
\ No newline at end of file
+Label Year: 2024/2025
\ No newline at end of file
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 893ebb4..39840fa 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,20 +1,28 @@
 {
 	"name": "CIS3158",
 	"build": {
-	  "dockerfile": "Dockerfile",
-	  "args": { "VARIANT": "jammy" }
+		"dockerfile": "Dockerfile",
+		"args": {
+			"VARIANT": "jammy"
+		}
 	},
-	//"image": "mcr.microsoft.com/devcontainers/javascript-node:1-20-bullseye",
 	"onCreateCommand": "sudo apt update && sudo apt-get install bash -y && sudo apt install software-properties-common -y && sudo apt install libarchive-tools -y && sudo apt-get install -y ca-certificates curl gnupg && sudo mkdir -p /etc/apt/keyrings && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | sudo gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && echo \"deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_16.x nodistro main\" | sudo tee /etc/apt/sources.list.d/nodesource.list && sudo apt-get update && sudo apt-get install nodejs -y && sudo apt-get install gcc g++ make && curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor | sudo tee /usr/share/keyrings/yarnkey.gpg >/dev/null echo \"deb [signed-by=/usr/share/keyrings/yarnkey.gpg] https://dl.yarnpkg.com/debian stable main\" | sudo tee /etc/apt/sources.list.d/yarn.list && sudo apt-get update && sudo apt-get install yarn -y && npm install phaser@3.55.2 && npm install --global --save-dev webpack && npm install --global webpack-cli",
 	"postCreateCommand": "sh prepare.sh",
-	"otherPortsAttributes": { "onAutoForward": "openBrowser"},
-	"runArgs": ["--name", "CIS3158-2023-Development-Environment"],
+	"otherPortsAttributes": {
+		"onAutoForward": "openBrowser"
+	},
+	"runArgs": [
+		"--name",
+		"CIS3158-2024-Development-Environment"
+	],
 	"remoteUser": "root",
 	"customizations": {
 		"vscode": {
 			"extensions": [
-				"ritwickdey.LiveServer"
+				"ritwickdey.LiveServer",
+				"mohd-akram.vscode-html-format",
+				"ecmel.vscode-html-css",
 			]
 		}
 	}
-}
+}
\ No newline at end of file