From eadc239018d0ddaf142eff97f56a3f2a52ae5cc0 Mon Sep 17 00:00:00 2001
From: Alphaeus Mote <Alphaeus.Mote@gmail.com>
Date: Wed, 19 Nov 2025 10:20:23 -0500
Subject: [PATCH] chore(docker): simplify bind mounts and remove auto updates

---
 deployment/docker/backend/docker-compose.yml  | 11 ++---------
 deployment/docker/combined/docker-compose.yml | 11 ++---------
 deployment/docker/frontend/docker-compose.yml |  4 +---
 3 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/deployment/docker/backend/docker-compose.yml b/deployment/docker/backend/docker-compose.yml
index fff235a..0ec9e19 100644
--- a/deployment/docker/backend/docker-compose.yml
+++ b/deployment/docker/backend/docker-compose.yml
@@ -21,7 +21,7 @@ services:
     restart: unless-stopped
     stop_signal: SIGTERM
     stop_grace_period: 90s
-    user: '${UID:-0}:${GID:-0}'
+    user: '${UID:-0}:${GID:-1000}'
     logging:
       driver: 'local'
     #env_file: '.env'
@@ -48,12 +48,5 @@ services:
     volumes:
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
-      - "/${STACK_BINDMOUNTROOT:-custom/docker/stacks}/${STACK_NAME:-stk-depl0y-backend-001}/Backend/Data:/var/lib/depl0y:rw"
-      - "/${STACK_BINDMOUNTROOT:-custom/docker/stacks}/${STACK_NAME:-stk-depl0y-backend-001}/Backend/Logs:/var/log/depl0y:rw"
-      - "/${STACK_BINDMOUNTROOT:-custom/docker/stacks}/${STACK_NAME:-stk-depl0y-backend-001}/Backend/CloudInit:/var/lib/depl0y/cloud-init:rw"
-      - "/${STACK_BINDMOUNTROOT:-custom/docker/stacks}/${STACK_NAME:-stk-depl0y-backend-001}/Backend/SSHKeys:/var/lib/depl0y/ssh_keys:rw"
-      - "/${STACK_BINDMOUNTROOT:-custom/docker/stacks}/${STACK_NAME:-stk-depl0y-backend-001}/Backend/ISOs:/var/lib/depl0y/isos:rw"
-      - "/${STACK_BINDMOUNTROOT:-custom/docker/stacks}/${STACK_NAME:-stk-depl0y-backend-001}/Backend/CloudImages:/var/lib/depl0y/cloud-images:rw"
-    labels:
-      com.centurylinklabs.watchtower.enable: ${BACKEND_ENABLEAUTOMATICUPDATES:-true}
+      - "${STACK_BINDMOUNTROOT}/${STACK_NAME}/Backend/Data:/var/lib/depl0y:rw"
 
diff --git a/deployment/docker/combined/docker-compose.yml b/deployment/docker/combined/docker-compose.yml
index 56d4aa3..5a2d8d2 100644
--- a/deployment/docker/combined/docker-compose.yml
+++ b/deployment/docker/combined/docker-compose.yml
@@ -21,7 +21,7 @@ services:
     restart: unless-stopped
     stop_signal: SIGTERM
     stop_grace_period: 90s
-    user: '${UID:-0}:${GID:-0}'
+    user: '${UID:-0}:${GID:-1000}'
     logging:
       driver: 'local'
     #env_file: '.env'
@@ -49,12 +49,5 @@ services:
     volumes:
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
-      - "/${STACK_BINDMOUNTROOT:-custom/docker/stacks}/${STACK_NAME:-stk-depl0y-001}/Application/Data:/var/lib/depl0y:rw"
-      - "/${STACK_BINDMOUNTROOT:-custom/docker/stacks}/${STACK_NAME:-stk-depl0y-001}/Application/Logs:/var/log/depl0y:rw"
-      - "/${STACK_BINDMOUNTROOT:-custom/docker/stacks}/${STACK_NAME:-stk-depl0y-001}/Application/CloudInit:/var/lib/depl0y/cloud-init:rw"
-      - "/${STACK_BINDMOUNTROOT:-custom/docker/stacks}/${STACK_NAME:-stk-depl0y-001}/Application/SSHKeys:/var/lib/depl0y/ssh_keys:rw"
-      - "/${STACK_BINDMOUNTROOT:-custom/docker/stacks}/${STACK_NAME:-stk-depl0y-001}/Application/ISOs:/var/lib/depl0y/isos:rw"
-      - "/${STACK_BINDMOUNTROOT:-custom/docker/stacks}/${STACK_NAME:-stk-depl0y-001}/Application/CloudImages:/var/lib/depl0y/cloud-images:rw"
-    labels:
-      com.centurylinklabs.watchtower.enable: ${APPLICATION_ENABLEAUTOMATICUPDATES:-true}
+      - "${STACK_BINDMOUNTROOT}/${STACK_NAME}/Application/Data:/var/lib/depl0y:rw"
 
diff --git a/deployment/docker/frontend/docker-compose.yml b/deployment/docker/frontend/docker-compose.yml
index 005bfe3..37351ea 100644
--- a/deployment/docker/frontend/docker-compose.yml
+++ b/deployment/docker/frontend/docker-compose.yml
@@ -15,7 +15,7 @@ services:
     restart: unless-stopped
     stop_signal: SIGTERM
     stop_grace_period: 90s
-    user: '${UID:-0}:${GID:-0}'
+    user: '${UID:-0}:${GID:-1000}'
     logging:
       driver: 'local'
     #env_file: '.env'
@@ -30,6 +30,4 @@ services:
     volumes:
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
-    labels:
-      com.centurylinklabs.watchtower.enable: ${FRONTEND_ENABLEAUTOMATICUPDATES:-true}