From 369eff4c1de47541eca2dff5c67d9043c0550ec7 Mon Sep 17 00:00:00 2001
From: Sven laptop <sven@huizevanhoof.nl>
Date: Tue, 5 May 2026 17:57:09 +0200
Subject: [PATCH] fix docker compose

---
 docker-compose.portainer.yml | 60 ---------------------------------
 docker-compose.yml           | 64 +++++++++---------------------------
 2 files changed, 15 insertions(+), 109 deletions(-)
 delete mode 100644 docker-compose.portainer.yml

diff --git a/docker-compose.portainer.yml b/docker-compose.portainer.yml
deleted file mode 100644
index f6c845c..0000000
--- a/docker-compose.portainer.yml
+++ /dev/null
@@ -1,60 +0,0 @@
-# Docker-Compose voor Portainer (remote deployment)
-# Images worden automatisch gebouwd via GitHub Actions en gehost in GitHub Container Registry (GHCR)
-
-version: '3.9'
-
-services:
-  auth_api:
-    # Images van GitHub Container Registry
-    image: ghcr.io/Sven491/XTransit/auth_api:latest
-    # Of specifieke tag (bijv. bij versioning):
-    # image: ghcr.io/YOUR_USERNAME/YOUR_REPO/auth_api:v1.0.0
-    container_name: auth_api
-    ports:
-      - "5000:5000"
-    environment:
-      PORT: 5000
-      JWT_SECRET: ${JWT_SECRET}
-      DB_HOST: db
-      DB_PORT: 5432
-      DB_NAME: ${POSTGRES_DB}
-      DB_USER: ${POSTGRES_USER_AUTH}
-      DB_PASSWORD: ${POSTGRES_PASSWORD_AUTH}
-    depends_on:
-      db:
-        condition: service_healthy
-    restart: unless-stopped
-    # Als je private registry gebruikt, voeg toe:
-    # pull_policy: always
-
-  employee_api:
-    image: ghcr.io/YOUR_USERNAME/YOUR_REPO/employee_api:latest
-    container_name: employee_api
-    ports:
-      - "4000:4000"
-    environment:
-      PORT: 4000
-      DB_HOST: db
-      DB_PORT: 5432
-      DB_NAME: ${POSTGRES_DB}
-      DB_USER: ${POSTGRES_USER_EMPLOYEE}
-      DB_PASSWORD: ${POSTGRES_PASSWORD_EMPLOYEE}
-    depends_on:
-      db:
-        condition: service_healthy
-    restart: unless-stopped
-
-  transit_api:
-    image: ghcr.io/YOUR_USERNAME/YOUR_REPO/transit_api:latest
-    container_name: transit_api
-    ports:
-      - "5001:5001"
-    environment:
-      PORT: 5001
-      JWT_SECRET: ${JWT_SECRET:-your_jwt_secret_key}
-      DB_HOST: db
-      DB_PORT: 5432
-      DB_NAME: ${POSTGRES_DB}
-      DB_USER: ${POSTGRES_USER_TRANSIT}
-      DB_PASSWORD: ${POSTGRES_PASSWORD_TRANSIT}
-    restart: unless-stopped
diff --git a/docker-compose.yml b/docker-compose.yml
index 418f153..bdd0d7d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,50 +1,26 @@
 version: '3.9'
 
 services:
-  # PostgreSQL Database
-  db:
-    image: postgres:15-alpine
-    container_name: transit_db
-    environment:
-      POSTGRES_DB: ${POSTGRES_DB:-transit_db}
-      POSTGRES_USER: ${POSTGRES_USER:-transit_user}
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-transit_password}
-    ports:
-      - "5432:5432"
-    volumes:
-      - postgres_data:/var/lib/postgresql/data
-    healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER:-transit_user}"]
-      interval: 10s
-      timeout: 5s
-      retries: 5
-
-  # Auth API
   auth_api:
-    build:
-      context: ./auth_api
-      dockerfile: Dockerfile
+    image: ghcr.io/Sven491/XTransit/auth_api:latest
     container_name: auth_api
     ports:
       - "5000:5000"
     environment:
       PORT: 5000
-      JWT_SECRET: ${JWT_SECRET:-your_jwt_secret_key}
+      JWT_SECRET: ${JWT_SECRET}
       DB_HOST: db
       DB_PORT: 5432
-      DB_NAME: ${POSTGRES_DB:-transit_db}
-      DB_USER: ${POSTGRES_USER:-transit_user}
-      DB_PASSWORD: ${POSTGRES_PASSWORD:-transit_password}
+      DB_NAME: ${POSTGRES_DB}
+      DB_USER: ${POSTGRES_USER_AUTH}
+      DB_PASSWORD: ${POSTGRES_PASSWORD_AUTH}
     depends_on:
       db:
         condition: service_healthy
     restart: unless-stopped
 
-  # Employee API
   employee_api:
-    build:
-      context: ./employee_api
-      dockerfile: Dockerfile
+    image: ghcr.io/Sven491/XTransit/employee_api:latest
     container_name: employee_api
     ports:
       - "4000:4000"
@@ -52,35 +28,25 @@ services:
       PORT: 4000
       DB_HOST: db
       DB_PORT: 5432
-      DB_NAME: ${POSTGRES_DB:-transit_db}
-      DB_USER: ${POSTGRES_USER:-transit_user}
-      DB_PASSWORD: ${POSTGRES_PASSWORD:-transit_password}
+      DB_NAME: ${POSTGRES_DB}
+      DB_USER: ${POSTGRES_USER_EMPLOYEE}
+      DB_PASSWORD: ${POSTGRES_PASSWORD_EMPLOYEE}
     depends_on:
       db:
         condition: service_healthy
     restart: unless-stopped
 
-  # Transit API
   transit_api:
-    build:
-      context: ./transit_api
-      dockerfile: Dockerfile
+    image: ghcr.io/Sven491/XTransit/transit_api:latest
     container_name: transit_api
     ports:
       - "5001:5001"
     environment:
       PORT: 5001
       JWT_SECRET: ${JWT_SECRET:-your_jwt_secret_key}
-      DB_HOST: db
-      DB_PORT: 5432
-      DB_NAME: ${POSTGRES_DB:-transit_db}
-      DB_USER: ${POSTGRES_USER:-transit_user}
-      DB_PASSWORD: ${POSTGRES_PASSWORD:-transit_password}
-    depends_on:
-      db:
-        condition: service_healthy
+      DB_HOST: ${POSTGRES_HOST}
+      DB_PORT: ${POSTGRES_PORT}
+      DB_NAME: ${POSTGRES_DB}
+      DB_USER: ${POSTGRES_USER_TRANSIT}
+      DB_PASSWORD: ${POSTGRES_PASSWORD_TRANSIT}
     restart: unless-stopped
-
-volumes:
-  postgres_data:
-    driver: local