Update docker-compose for PostgreSQL and improved env config

Author: sebastiankrll

.github/workflows/deploy.yml

@@ -14,9 +14,6 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Create .env file
-        run: echo "${{ secrets.ENV_FILE }}" > ./docker/.env
-
       - name: Set up SSH
         uses: webfactory/ssh-agent@v0.8.0
         with:

docker/docker-compose.prod.yml

@@ -1,33 +1,38 @@
 services:
-  timescaledb:
-    image: timescale/timescaledb:latest-pg17
-    container_name: sr24_timescaledb
+  postgres:
+    image: postgres:18.1
+    container_name: sr24_postgres
     restart: unless-stopped
     environment:
       POSTGRES_USER: ${POSTGRES_USER}
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
       POSTGRES_DB: ${POSTGRES_DB}
+      POSTGRES_PORT: ${POSTGRES_PORT}
     volumes:
-      - timescaledb_data:/var/lib/postgresql/data
+      - postgres_data:/var/lib/postgresql/data
     networks:
       - sr24_backend
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}"]
+      test: [ "CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}" ]
       interval: 10s
       timeout: 5s
       retries: 5
 
   redis:
-    image: redis:latest
+    image: redis:8.4.0
     container_name: sr24_redis
     restart: unless-stopped
+    environment:
+      REDIS_PORT: ${REDIS_PORT}
+      REDIS_PASSWORD: ${REDIS_PASSWORD}
+      REDIS_DB: ${REDIS_DB}
     command: [ "redis-server", "--appendonly", "yes" ]
     volumes:
       - redis_data:/data
     networks:
       - sr24_backend
     healthcheck:
-      test: ["CMD", "redis-cli", "ping"]
+      test: [ "CMD", "redis-cli", "ping" ]
       interval: 5s
       timeout: 3s
       retries: 5
@@ -40,32 +45,36 @@ services:
     environment:
       POSTGRES_URL: postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB}?schema=public
     depends_on:
-      timescaledb:
+      postgres:
         condition: service_healthy
     networks:
       - sr24_backend
+    labels:
+      - "traefik.enable=false"
     restart: "no"
+
   web:
     build:
       context: ..
       dockerfile: apps/web/Dockerfile
       args:
-        NEXT_PUBLIC_API_URL: "https://radar.skruellex.com/api"
-        NEXT_PUBLIC_WEBSOCKET_URL: "wss://radar.skruellex.com/ws"
+        NEXT_PUBLIC_API_URL: "https://${DOMAIN}/api"
+        NEXT_PUBLIC_WEBSOCKET_URL: "wss://${DOMAIN}/ws"
     container_name: sr24_web
     restart: always
     environment:
       NODE_ENV: production
-      HOST: 0.0.0.0
+      HOST: ${HOST}
+      PORT: ${WEB_PORT}
     networks:
       - traefik_proxy
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.nextjs.rule=Host(`radar.skruellex.com`)"
+      - "traefik.http.routers.nextjs.rule=Host(`${DOMAIN}`)"
       - "traefik.http.routers.nextjs.entrypoints=websecure"
       - "traefik.http.routers.nextjs.tls=true"
       - "traefik.http.routers.nextjs.tls.certresolver=letsencrypt"
-      - "traefik.http.services.nextjs.loadbalancer.server.port=3000"
+      - "traefik.http.services.nextjs.loadbalancer.server.port=${WEB_PORT}"
       - "traefik.docker.network=traefik_proxy"
 
   api:
@@ -76,17 +85,20 @@ services:
     restart: always
     environment:
       NODE_ENV: production
-      API_PORT: 3001
       POSTGRES_USER: ${POSTGRES_USER}
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
       POSTGRES_DB: ${POSTGRES_DB}
-      POSTGRES_HOST: timescaledb
-      POSTGRES_PORT: 5432
-      REDIS_HOST: redis
-      REDIS_PORT: 6379
+      POSTGRES_HOST: ${POSTGRES_HOST}
+      POSTGRES_PORT: ${POSTGRES_PORT}
+      REDIS_HOST: ${REDIS_HOST}
+      REDIS_PORT: ${REDIS_PORT}
+      REDIS_PASSWORD: ${REDIS_PASSWORD}
+      REDIS_DB: ${REDIS_DB}
+      API_HOST: ${HOST}
+      API_PORT: ${API_PORT}
       TRUST_PROXY: "true"
     depends_on:
-      timescaledb:
+      postgres:
         condition: service_healthy
       redis:
         condition: service_healthy
@@ -95,11 +107,11 @@ services:
       - sr24_backend
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.api.rule=Host(`radar.skruellex.com`) && PathPrefix(`/api`)"
+      - "traefik.http.routers.api.rule=Host(`${DOMAIN}`) && PathPrefix(`/api`)"
       - "traefik.http.routers.api.entrypoints=websecure"
       - "traefik.http.routers.api.tls=true"
       - "traefik.http.routers.api.tls.certresolver=letsencrypt"
-      - "traefik.http.services.api.loadbalancer.server.port=3001"
+      - "traefik.http.services.api.loadbalancer.server.port=${API_PORT}"
       - "traefik.http.middlewares.api-stripprefix.stripprefix.prefixes=/api"
       - "traefik.http.routers.api.middlewares=api-stripprefix"
       - "traefik.docker.network=traefik_proxy"
@@ -112,13 +124,15 @@ services:
     restart: always
     environment:
       NODE_ENV: production
-      WEBSOCKET_PORT: 3002
-      WEBSOCKET_HOST: 0.0.0.0
-      REDIS_HOST: redis
-      REDIS_PORT: 6379
+      WS_HOST: ${HOST}
+      WS_PORT: ${WS_PORT}
+      REDIS_HOST: ${REDIS_HOST}
+      REDIS_PORT: ${REDIS_PORT}
+      REDIS_PASSWORD: ${REDIS_PASSWORD}
+      REDIS_DB: ${REDIS_DB}
       TRUST_PROXY: "true"
     depends_on:
-      timescaledb:
+      postgres:
         condition: service_healthy
       redis:
         condition: service_healthy
@@ -127,11 +141,11 @@ services:
       - sr24_backend
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.ws.rule=Host(`radar.skruellex.com`) && PathPrefix(`/ws`)"
+      - "traefik.http.routers.ws.rule=Host(`${DOMAIN}`) && PathPrefix(`/ws`)"
       - "traefik.http.routers.ws.entrypoints=websecure"
       - "traefik.http.routers.ws.tls=true"
       - "traefik.http.routers.ws.tls.certresolver=letsencrypt"
-      - "traefik.http.services.ws.loadbalancer.server.port=3002"
+      - "traefik.http.services.ws.loadbalancer.server.port=${WS_PORT}"
       - "traefik.http.middlewares.ws-stripprefix.stripprefix.prefixes=/ws"
       - "traefik.http.routers.ws.middlewares=ws-stripprefix"
       - "traefik.docker.network=traefik_proxy"
@@ -147,12 +161,14 @@ services:
       POSTGRES_USER: ${POSTGRES_USER}
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
       POSTGRES_DB: ${POSTGRES_DB}
-      POSTGRES_HOST: timescaledb
-      POSTGRES_PORT: 5432
-      REDIS_HOST: redis
-      REDIS_PORT: 6379
+      POSTGRES_HOST: ${POSTGRES_HOST}
+      POSTGRES_PORT: ${POSTGRES_PORT}
+      REDIS_HOST: ${REDIS_HOST}
+      REDIS_PORT: ${REDIS_PORT}
+      REDIS_PASSWORD: ${REDIS_PASSWORD}
+      REDIS_DB: ${REDIS_DB}
     depends_on:
-      timescaledb:
+      postgres:
         condition: service_healthy
       redis:
         condition: service_healthy
@@ -172,12 +188,14 @@ services:
       POSTGRES_USER: ${POSTGRES_USER}
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
       POSTGRES_DB: ${POSTGRES_DB}
-      POSTGRES_HOST: timescaledb
-      POSTGRES_PORT: 5432
-      REDIS_HOST: redis
-      REDIS_PORT: 6379
+      POSTGRES_HOST: ${POSTGRES_HOST}
+      POSTGRES_PORT: ${POSTGRES_PORT}
+      REDIS_HOST: ${REDIS_HOST}
+      REDIS_PORT: ${REDIS_PORT}
+      REDIS_PASSWORD: ${REDIS_PASSWORD}
+      REDIS_DB: ${REDIS_DB}
     depends_on:
-      timescaledb:
+      postgres:
         condition: service_healthy
       redis:
         condition: service_healthy
@@ -193,5 +211,5 @@ networks:
     driver: bridge
 
 volumes:
-  timescaledb_data:
+  postgres_data:
   redis_data: