From 1ab34f67646cb8c04ffaba601a6f63127a551625 Mon Sep 17 00:00:00 2001 From: gibbyb Date: Fri, 12 Sep 2025 19:25:19 -0500 Subject: [PATCH] Fix env variables overlapping & convex dashboard --- docker/compose.yml | 11 ++++++----- docker/env.example | 6 +++--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/docker/compose.yml b/docker/compose.yml index b8c4a7b..cbb91e1 100644 --- a/docker/compose.yml +++ b/docker/compose.yml @@ -7,17 +7,18 @@ services: build: context: ../ dockerfile: ./docker/Dockerfile - image: ${CONTAINER_NAME}:alpine - container_name: ${CONTAINER_NAME} + image: ${NEXT_CONTAINER_NAME}:alpine + container_name: ${NEXT_CONTAINER_NAME} env_file: [.env] - hostname: ${CONTAINER_NAME} - domainname: ${DOMAIN_NAME} + hostname: ${NEXT_CONTAINER_NAME} + domainname: ${NEXT_DOMAIN_NAME} networks: ['${NETWORK:-nginx-bridge}'] - #ports: ['${PORT}:3000'] + #ports: ['${NEXT_PORT}:3000'] depends_on: ['convex-backend'] tty: true stdin_open: true restart: unless-stopped + convex-backend: image: ghcr.io/get-convex/convex-backend:${BACKEND_TAG:-00bd92723422f3bff968230c94ccdeb8c1719832} container_name: ${BACKEND_CONTAINER_NAME:-convex-backend} diff --git a/docker/env.example b/docker/env.example index d5fc5f1..32f8731 100644 --- a/docker/env.example +++ b/docker/env.example @@ -1,12 +1,12 @@ # Next Envrionment Variables NETWORK=nginx-bridge -CONTAINER_NAME=techtracker-next -DOMAIN_NAME=techtracker.gbrown.org +NEXT_CONTAINER_NAME=techtracker-next +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 +NEXT_PORT=3000 # Convex Environment Variables BACKEND_TAG=00bd92723422f3bff968230c94ccdeb8c1719832