From 447f99b2f5fc95cb0d6675e95adea8327eae3dd3 Mon Sep 17 00:00:00 2001
From: Nate Cybulski <npc@google.com>
Date: Mon, 3 Feb 2025 15:35:18 -0800
Subject: [PATCH 1/2] doodscratch

---
 src/workbench-jupyter-docker/.devcontainer.json  | 1 +
 src/workbench-jupyter-docker/docker-compose.yaml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/workbench-jupyter-docker/.devcontainer.json b/src/workbench-jupyter-docker/.devcontainer.json
index ac061e63..52bb29b5 100644
--- a/src/workbench-jupyter-docker/.devcontainer.json
+++ b/src/workbench-jupyter-docker/.devcontainer.json
@@ -4,6 +4,7 @@
   "service": "app",
   "shutdownAction": "none",
   "workspaceFolder": "/workspace",
+  "initializeCommand": "DOCKER_GID=`getent group docker | cut -d: -f3` && echo \"DOCKER_GID=${DOCKER_GID}\" > .env",
   "postCreateCommand": "./startupscript/post-startup.sh jupyter /home/jupyter ${templateOption:cloud} ${templateOption:login} && ./startupscript/setup-docker.sh",
   // re-mount bucket files on container start up
   "postStartCommand": [
diff --git a/src/workbench-jupyter-docker/docker-compose.yaml b/src/workbench-jupyter-docker/docker-compose.yaml
index 06ac129e..b491fc9a 100644
--- a/src/workbench-jupyter-docker/docker-compose.yaml
+++ b/src/workbench-jupyter-docker/docker-compose.yaml
@@ -3,7 +3,7 @@ services:
   app:
     container_name: "application-server"
     image: "us-central1-docker.pkg.dev/verily-workbench-public/apps/workbench-jupyter:latest"
-    user: "jupyter"
+    user: "jupyter:${DOCKER_GID}"
     restart: always
     volumes:
       - .:/workspace:cached

From 646e6ba8d5a12d8a8ebc50be1870da37c5eaf75b Mon Sep 17 00:00:00 2001
From: Nate Cybulski <npc@google.com>
Date: Mon, 3 Feb 2025 17:06:02 -0800
Subject: [PATCH 2/2] forward port

---
 src/workbench-jupyter-docker/docker-compose.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/workbench-jupyter-docker/docker-compose.yaml b/src/workbench-jupyter-docker/docker-compose.yaml
index b491fc9a..6ef85ee4 100644
--- a/src/workbench-jupyter-docker/docker-compose.yaml
+++ b/src/workbench-jupyter-docker/docker-compose.yaml
@@ -15,6 +15,7 @@ services:
       - /etc/docker:/home/jupyter/.docker
     ports:
       - "8888:8888"
+      - "8000:8000"
     networks:
       - app-network
     cap_add: