The Whole Barnshow Commit

- Use yarn-berry instead of npm, with Zero Install feature and goodies
- Add `initializeToken` to post unique token to logs on startup
- Package upgrades
- Fix index.html.template tests

I will never do this again

3 files changed, 28 insertions, 13 deletions

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 438255d..6605c26 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,6 +1,5 @@
 // For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
 // https://github.com/microsoft/vscode-dev-containers/tree/v0.194.0/containers/javascript-node-mongo
-// Update the VARIANT arg in docker-compose.yml to pick a Node.js version: 10, 12, 14 
 {
 	"name": "Ubuntu, Node.js & Mongo DB",
 	"dockerComposeFile": "docker-compose.yml",
@@ -10,18 +9,12 @@
 	// Set *default* container specific settings.json values on container create.
 	"settings": {},
 
-	// Add the IDs of extensions you want installed when the container is created.
 	"extensions": [
 		"dbaeumer.vscode-eslint",
-		"mongodb.mongodb-vscode" 
+		"mongodb.mongodb-vscode",
+		"esbenp.prettier-vscode"
 	],
-
-	// Use 'forwardPorts' to make a list of ports inside the container available locally.
 	"forwardPorts": [3000, 27017],
-
-	// Use 'postCreateCommand' to run commands after the container is created.
-	// "postCreateCommand": "yarn install",
-
-	// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
+	"postCreateCommand": "sudo locale-gen 'en_US.UTF-8'; sudo chown node:node node_modules; yarn install",
 	"remoteUser": "node"
 }
\ No newline at end of file
diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
index 3b17947..0e637d0 100644
--- a/.devcontainer/docker-compose.yml
+++ b/.devcontainer/docker-compose.yml
@@ -6,14 +6,32 @@ services:
       context: .
       dockerfile: Dockerfile
       args:
-        # [Choice] Node.js version: 16, 14, 12
-        VARIANT: 14
         # On Linux, you may need to update USER_UID and USER_GID below if not your local UID is not 1000.
         USER_UID: 1000
         USER_GID: 1000
 
+    environment:
+      # port and bind info
+      PORT: 3000
+      BIND_ADDRESS: localhost
+      TARGET_URL: http://localhost:3000
+
+      # Volume directory for hosted files. This directory is already created and has proper permissions
+      HOST_DIR: /dist
+
+      # DB info
+      MONGO_URI: mongodb://db:27017
+      MONGO_DB: ao-coverage
+
+      # App configuration
+      LOG_LEVEL: info
+      UPLOAD_LIMIT: 4194304
+      STAGE_1: 95
+      STAGE_2: 80
+
     volumes:
       - ..:/workspace:cached
+      - node-nm:/workspace/node_modules:cached
 
     # Overrides default command so things don't shut down after the process ends.
     command: sleep infinity
@@ -43,4 +61,5 @@ services:
     # (Adding the "ports" property to this file will not forward from a Codespace.)
 
 volumes:
-  mongodb-data:
\ No newline at end of file
+  mongodb-data:
+  node-nm:
\ No newline at end of file
diff --git a/.devcontainer/node.sh b/.devcontainer/node.sh
index 3422fc1..0b47058 100644
--- a/.devcontainer/node.sh
+++ b/.devcontainer/node.sh
@@ -81,6 +81,9 @@ check_packages apt-utils \
         manpages-dev \
         init-system-helpers
 
+echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \
+    && chmod 0440 /etc/sudoers.d/$USERNAME
+
 # Install yarn
 if type yarn > /dev/null 2>&1; then
     echo "Yarn already installed."