Move to single .env file

docker/.env.example

@@ -1,41 +0,0 @@
-# Next Envrionment Variables
-NETWORK=nginx-bridge
-NEXT_CONTAINER_NAME=next-app
-NEXT_DOMAIN_NAME=gbrown.org
-NEXT_PORT=3000
-NODE_ENV=production
-SENTRY_AUTH_TOKEN=
-NEXT_PUBLIC_SITE_URL=https://gbrown.org
-NEXT_PUBLIC_CONVEX_URL=https://api.convex.gbrown.org
-NEXT_PUBLIC_PLAUSIBLE_URL=https://plausible.gbrown.org
-NEXT_PUBLIC_SENTRY_DSN=
-NEXT_PUBLIC_SENTRY_ORG=sentry
-NEXT_PUBLIC_SENTRY_PROJECT_NAME=
-PAYLOAD_SECRET=
-PAYLOAD_DB_URL=
-
-# Convex Environment Variables
-BACKEND_TAG=latest
-BACKEND_CONTAINER_NAME=convex-backend
-BACKEND_DOMAIN_NAME=convex.gbrown.org
-#BACKEND_PORT=
-#SITE_PROXY_PORT=
-DASHBOARD_TAG=latest
-DASHBOARD_CONTAINER_NAME=convex-dashboard
-DASHBOARD_DOMAIN=dashboard.convex.gbrown.org
-#DASHBOARD_PORT
-INSTANCE_NAME=convex
-#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=
-#CONVEX_RELEASE_VERSION_DEV=
-#ACTIONS_USER_TIMEOUT_SECS=
-#MYSQL_URL=
-#RUST_LOG=
-#RUST_BACKTRACE=

docker/compose.yml

@@ -22,9 +22,9 @@ services:
       - PAYLOAD_SECRET=${PAYLOAD_SECRET}
       - PAYLOAD_DB_URL=${PAYLOAD_DB_URL}
     hostname: ${NEXT_CONTAINER_NAME}
-    domainname: ${NEXT_DOMAIN_NAME}
+    domainname: ${NEXT_DOMAIN}
     networks: ['${NETWORK:-nginx-bridge}']
-    #ports: ['${NEXT_PORT}:3000']
+    #ports: ['${NEXT_PORT}:${NEXT_PORT}']
     depends_on: ['convex-backend']
     tty: true
     stdin_open: true
@@ -34,7 +34,7 @@ services:
     image: ghcr.io/get-convex/convex-backend:${BACKEND_TAG:-latest}
     container_name: ${BACKEND_CONTAINER_NAME:-convex-backend}
     hostname: ${BACKEND_CONTAINER_NAME:-convex-backend}
-    domainname: ${BACKEND_DOMAIN_NAME:-convex.gbrown.org}
+    domainname: ${BACKEND_DOMAIN:-convex.gbrown.org}
     networks: ['${NETWORK:-nginx-bridge}']
     #user: '1000:1000'
     #ports: ['${BACKEND_PORT:-3210}:3210','${SITE_PROXY_PORT:-3211}:3211']
@@ -63,7 +63,7 @@ services:
     image: ghcr.io/get-convex/convex-dashboard:${DASHBOARD_TAG:-latest}
     container_name: ${DASHBOARD_CONTAINER_NAME:-convex-dashboard}
     hostname: ${DASHBOARD_CONTAINER_NAME:-convex-dashboard}
-    domainname: ${DASHBOARD_DOMAIN_NAME:-dashboard.${BACKEND_DOMAIN_NAME:-convex.gbrown.org}}
+    domainname: ${DASHBOARD_DOMAIN:-dashboard.${BACKEND_DOMAIN:-convex.gbrown.org}}
     networks: ['${NETWORK:-nginx-bridge}']
     #user: 1000:1000
     #ports: ['${DASHBOARD_PORT:-6791}:6791']

docker/generate_convex_admin_key

@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-source ./.env
-sudo docker compose exec ${BACKEND_CONTAINER_NAME} ./generate_admin_key.sh