From ef56714573ae7b260f1403665c36b597e2df5aef Mon Sep 17 00:00:00 2001
From: Spenser Bushey <spenser@spenserbushey.com>
Date: Sat, 10 Dec 2022 21:16:04 -0800
Subject: [PATCH] Updated dev container

Includes tone executable
Automatically runs npm ci and generates client files
---
 .devcontainer/Dockerfile        | 10 ++++++++--
 .devcontainer/devcontainer.json | 11 +++++++++--
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 7d2cae507..1b654124a 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,4 +1,10 @@
 FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:16
-RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
-    && apt-get install ffmpeg gnupg2 -y
+
+COPY --from=sandreas/tone:v0.1.2 /usr/local/bin/tone /usr/local/bin/
+
 ENV NODE_ENV=development
+
+RUN apt-get update && \
+    DEBIAN_FRONTEND=noninteractive \
+    apt-get install ffmpeg gnupg curl tzdata -y && \
+    rm -rf /var/lib/apt/lists/*
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 61ee8e9c6..8af31cd21 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,12 +1,19 @@
 {
     "build": { "dockerfile": "Dockerfile" },
     "mounts": [
-        "source=abs-node-node_modules,target=${containerWorkspaceFolder}/node_modules,type=volume"
+        "source=abs-server-node_modules,target=${containerWorkspaceFolder}/node_modules,type=volume",
+        "source=abs-client-node_modules,target=${containerWorkspaceFolder}/client/node_modules,type=volume"
     ],
     "features": {
         "fish": "latest"
 	},
 	"extensions": [
 		"eamodio.gitlens"
-	]
+    ],
+    "remoteUser": "node",
+    "postStartCommand": {
+        "git": "git config --global --add safe.directory ${containerWorkspaceFolder}",
+        "server": "cd ${containerWorkspaceFolder} && sudo chown $(id -u):$(id -g) node_modules && npm ci",
+        "client": "cd ${containerWorkspaceFolder}/client && sudo chown $(id -u):$(id -g) node_modules && npm ci && npm run generate"
+    }
 }
\ No newline at end of file