Make it so that we can have dev env for convex too

host/convex/docker/compose.yml

@@ -1,22 +1,22 @@
 networks:
-  nginx-bridge:
+  ${NETWORK:-nginx-bridge}:
     external: true
 services:
   convex-backend:
-    image: ghcr.io/get-convex/convex-backend:08139ef318b1898dad7731910f49ba631631c902
+    image: ghcr.io/get-convex/convex-backend:${BACKEND_TAG:-00bd92723422f3bff968230c94ccdeb8c1719832}
     container_name: ${BACKEND_CONTAINER_NAME:-convex-backend}
     hostname: ${BACKEND_CONTAINER_NAME:-convex-backend}
-    domainname: convex.gbrown.org
-    #user: 1000:1000
-    networks: [nginx-bridge]
-    #ports: [3210:3210,3211:3211] # 3210: API | 3211: Base URL
+    domainname: ${BACKEND_DOMAIN_NAME:-convex.gbrown.org}
+    networks: ['${NETWORK}']
+    #user: '1000:1000'
+    #ports: ['${BACKEND_PORT:-3210}:3210','${SITE_PROXY_PORT:-3211}:3211']
     volumes: [./data:/convex/data]
     labels: ['com.centurylinklabs.watchtower.enable=true']
-    env_file: [.env]
+    env_file: ['.env']
     environment:
-      - INSTANCE_NAME=${INSTANCE_NAME:-}
-      - INSTANCE_SECRET=${INSTANCE_SECRET:-}
-      - CONVEX_CLOUD_ORIGIN=${CONVEX_CLOUD_ORIGIN:-http://${BACKEND_CONTAINER_NAME:-convex-backend}:${PORT:-3210}}
+      - INSTANCE_NAME
+      - INSTANCE_SECRET
+      - CONVEX_CLOUD_ORIGIN=${CONVEX_CLOUD_ORIGIN:-http://${BACKEND_CONTAINER_NAME:-convex-backend}:${BACKEND_PORT:-3210}}
       - CONVEX_SITE_ORIGIN=${CONVEX_SITE_ORIGIN:-http://${BACKEND_CONTAINER_NAME:-convex-backend}:${SITE_PROXY_PORT:-3211}}
       - DISABLE_BEACON=${DISABLE_BEACON:-}
       - REDACT_LOGS_TO_CLIENT=${REDACT_LOGS_TO_CLIENT:-}
@@ -33,15 +33,13 @@ services:
     stop_signal: SIGINT
 
   convex-dashboard:
-    image: ghcr.io/get-convex/convex-dashboard:33cef775a8a6228cbacee4a09ac2c4073d62ed13
+    image: ghcr.io/get-convex/convex-dashboard:${DASHBOARD_TAG:-33cef775a8a6228cbacee4a09ac2c4073d62ed13}
     container_name: ${DASHBOARD_CONTAINER_NAME:-convex-dashboard}
     hostname: ${DASHBOARD_CONTAINER_NAME:-convex-dashboard}
-    domainname: dashboard.convex.gbrown.org
+    domainname: ${DASHBOARD_DOMAIN_NAME:-dashboard.${BACKEND_DOMAIN_NAME:-convex.gbrown.org}}
     #user: 1000:1000
-    networks: [nginx-bridge]
-    stop_grace_period: 10s
-    stop_signal: SIGINT
-    ports: [6791:6791] # Dashboard
+    networks: ['${NETWORK}']
+    ports: ['${DASHBOARD_PORT:-6791}:6791']
     labels: ['com.centurylinklabs.watchtower.enable=true']
     env_file: [.env]
     environment:
@@ -52,3 +50,6 @@ services:
     stdin_open: true
     tty: true
     restart: unless-stopped
+    stop_grace_period: 10s
+    stop_signal: SIGINT
+

host/convex/docker/env.example

@@ -1,15 +1,23 @@
-BACKEND_CONTAINER_NAME=
-DASHBOARD_CONTAINER_NAME=
-INSTANCE_NAME=
-CONVEX_CLOUD_ORIGIN=
-CONVEX_SITE_ORIGIN=
-DISABLE_BEACON=
-REDACT_LOGS_TO_CLIENT=
-DO_NOT_REQUIRE_SSL=
-NEXT_PUBLIC_DEPLOYMENT_URL=
+NETWORK=nginx-bridge
+BACKEND_TAG=00bd92723422f3bff968230c94ccdeb8c1719832
+BACKEND_CONTAINER_NAME=tt-convex-backend
+BACKEND_DOMAIN_NAME=convex.gbrown.org
+#BACKEND_PORT=
+#SITE_PROXY_PORT=
+DASHBOARD_TAG=33cef775a8a6228cbacee4a09ac2c4073d62ed13
+DASHBOARD_CONTAINER_NAME=tt-convex-dashboard
+DASHBOARD_DOMAIN=dashboard.convex.gbrown.org
+#DASHBOARD_PORT
+INSTANCE_NAME=Convex.gib
+#INSTANCE_SECRET=
+CONVEX_CLOUD_ORIGIN=https://api.convex.gbrown.org
+CONVEX_SITE_ORIGIN=https://convex.gbrown.org
+DISABLE_BEACON=true
+REDACT_LOGS_TO_CLIENT=true
+DO_NOT_REQUIRE_SSL=true
+NEXT_PUBLIC_DEPLOYMENT_URL=https://api.convex.gbrown.org
 #POSTGRES_URL=
 #DATABASE_URL=
-#INSTANCE_SECRET=
 #CONVEX_RELEASE_VERSION_DEV=
 #ACTIONS_USER_TIMEOUT_SECS=
 #MYSQL_URL=

host/next/docker/compose.yml

@@ -1,17 +1,18 @@
 networks:
-  nginx-bridge:
+  ${NETWORK}:
     external: true
 services:
   techtracker-next:
     build:
       context: ../../..
       dockerfile: host/next/docker/Dockerfile
-    image: techtracker-next:alpine
-    container_name: techtracker-next
-    hostname: techtracker-next
-    domainname: techtracker.gbrown.org
-    networks: [nginx-bridge]
-    ports: ['3000:3000']
+    image: ${CONTAINER_NAME}:alpine
+    container_name: ${CONTAINER_NAME}
+    env_file: [.env]
+    hostname: ${CONTAINER_NAME}
+    domainname: ${DOMAIN_NAME}
+    networks: ['${NETWORK}']
+    #ports: ['${PORT}:3000']
     tty: true
     stdin_open: true
     restart: unless-stopped

host/next/docker/env.example

@@ -0,0 +1,8 @@
+NETWORK=nginx-bridge
+CONTAINER_NAME=techtracker-next
+DOMAIN_NAME=techtracker.gbrown.org
+# Port is disabled by default as suggested
+# config is to have reverse proxy on the same
+# network so you can just forward to the
+# port on the internal network.
+PORT=3000