refactor: move compose configs

xdanielsb · xdanielsb · commit 621d3fc09e9f · 2025-06-22T20:34:41.000+02:00
diff --git a/.github/workflows/cd-keycloak.yml b/.github/workflows/cd-keycloak.yml
@@ -21,7 +21,7 @@ jobs:
           host: ${{ secrets.HOST }}
           username: root
           key: ${{ secrets.SSH_PRIVATE_KEY }}
-          source: "infra/docker-compose.keycloak.yml,infra/keycloak"
+          source: "infra/compose/docker-compose.keycloak.yml,infra/keycloak/realm-export.json"
           target: "/root/survey-app"
           strip_components: 0
           rm: false
@@ -34,7 +34,7 @@ jobs:
           username: root
           key: ${{ secrets.SSH_PRIVATE_KEY }}
           script: |
-            cat << 'EOF' > /root/survey-app/infra/.env
+            cat << 'EOF' > /root/survey-app/infra/compose/.env
               ${{ secrets.ENV_FILE }}
             EOF
 
@@ -45,7 +45,7 @@ jobs:
           username: root
           key: ${{ secrets.SSH_PRIVATE_KEY }}
           script: |
-            cat << 'EOF' > /root/survey-app/infra/CaddyfileKeycloak
+            cat << 'EOF' > /root/survey-app/infra/compose/CaddyfileKeycloak
               ${{ secrets.CADDYFILE_KEYCLOAK }}
             EOF
 
@@ -57,5 +57,5 @@ jobs:
           key: ${{ secrets.SSH_PRIVATE_KEY }}
           script: |
             cd /root/survey-app
-            docker compose -f infra/docker-compose.keycloak.yml down
-            docker compose -f infra/docker-compose.keycloak.yml --env-file infra/.env up -d --build
+            docker compose -f infra/compose/docker-compose.keycloak.yml down
+            docker compose -f infra/compose/docker-compose.keycloak.yml --env-file infra/compose/.env up -d --build
diff --git a/.github/workflows/cd-prod.yml b/.github/workflows/cd-prod.yml
@@ -34,7 +34,7 @@ jobs:
           username: root
           key: ${{ secrets.SSH_PRIVATE_KEY }}
           script: |
-            cat << 'EOF' > /root/survey-app/infra/.env
+            cat << 'EOF' > /root/survey-app/infra/compose/.env
               ${{ secrets.ENV_FILE }}
             EOF
 
@@ -45,7 +45,7 @@ jobs:
           username: root
           key: ${{ secrets.SSH_PRIVATE_KEY }}
           script: |
-            cat << 'EOF' > /root/survey-app/infra/Caddyfile
+            cat << 'EOF' > /root/survey-app/infra/compose/Caddyfile
               ${{ secrets.CADDY_FILE }}
             EOF
 
@@ -68,5 +68,5 @@ jobs:
           key: ${{ secrets.SSH_PRIVATE_KEY }}
           script: |
             cd /root/survey-app
-            docker compose -f infra/docker-compose.yml down
-            docker compose -f infra/docker-compose.yml --env-file infra/.env up -d --build
+            docker compose -f infra/compose/docker-compose.yml down
+            docker compose -f infra/compose/docker-compose.yml --env-file infra/compose/.env up -d --build
diff --git a/.github/workflows/cd-staging.yml b/.github/workflows/cd-staging.yml
@@ -37,7 +37,7 @@ jobs:
           username: root
           key: ${{ secrets.SSH_PRIVATE_KEY }}
           script: |
-            cat << 'EOF' > /root/survey-app/infra/.env
+            cat << 'EOF' > /root/survey-app/infra/compose/.env
               ${{ secrets.ENV_FILE }}
             EOF
 
@@ -48,7 +48,7 @@ jobs:
           username: root
           key: ${{ secrets.SSH_PRIVATE_KEY }}
           script: |
-            cat << 'EOF' > /root/survey-app/infra/Caddyfile
+            cat << 'EOF' > /root/survey-app/infra/compose/Caddyfile
               ${{ secrets.CADDY_FILE }}
             EOF
 
@@ -71,5 +71,5 @@ jobs:
           key: ${{ secrets.SSH_PRIVATE_KEY }}
           script: |
             cd /root/survey-app
-            docker compose -f infra/docker-compose.yml down
-            docker compose -f infra/docker-compose.yml --env-file infra/.env up -d --build
+            docker compose -f infra/compose/docker-compose.yml down
+            docker compose -f infra/compose/docker-compose.yml --env-file infra/compose/.env up -d --build
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,7 @@
 *.swp
 .idea
-infra/Caddyfile
-infra/.env
+infra/compose/Caddyfile
+infra/compose/.env
 backups/
 secrets/
 *.swo
diff --git a/Makefile b/Makefile
@@ -3,28 +3,28 @@
 # Usage: make restore FILE=backups/your_backup.dump
 prod-restore-db:
 	@echo "📦 Restoring from: $(FILE)"
-	@./infra/scripts/restore_db.sh --file $(FILE)
+	@./infra/compose/scripts/restore_db.sh --file $(FILE)
 
 prod-list-backups:
-	docker compose -f infra/docker-compose.yml run --rm --entrypoint patronx patronx-worker list
+	docker compose -f infra/compose/docker-compose.yml run --rm --entrypoint patronx patronx-worker list
 
 prod-up:
-	docker compose -f infra/docker-compose.yml --env-file infra/.env up -d
+	docker compose -f infra/compose/docker-compose.yml --env-file infra/compose/.env up -d
 
 prod-down:
-	docker compose -f infra/docker-compose.yml down
+	docker compose -f infra/compose/docker-compose.yml down
 
 prod-logs:
-	docker compose -f infra/docker-compose.yml logs -f
+	docker compose -f infra/compose/docker-compose.yml logs -f
 
 prod-log-service:
-	docker compose -f infra/docker-compose.yml logs -f $(SERVICE)
+	docker compose -f infra/compose/docker-compose.yml logs -f $(SERVICE)
 
 prod-ps:
-	docker compose -f infra/docker-compose.yml ps
+	docker compose -f infra/compose/docker-compose.yml ps
 
 prod-restart:
-	docker compose -f infra/docker-compose.yml restart $(SERVICE)
+	docker compose -f infra/compose/docker-compose.yml restart $(SERVICE)
 
 caddy-reload: ## Usage: make caddy-reload CONTAINER=<container-name>
 	docker exec $(CONTAINER) caddy reload --config /etc/caddy/Caddyfile --adapter caddyfile
@@ -36,34 +36,34 @@ container-exec:
 	docker exec -it $(CONTAINER) $(CMD)
 
 dev-up:
-	docker compose -f infra/docker-compose.dev.yml --env-file infra/.env up --build --force-recreate -d
+	docker compose -f infra/compose/docker-compose.dev.yml --env-file infra/compose/.env up --build --force-recreate -d
 
 dev-down:
-	docker compose -f infra/docker-compose.dev.yml down
+	docker compose -f infra/compose/docker-compose.dev.yml down
 
 dev-logs:
-	docker compose -f infra/docker-compose.dev.yml logs -f
+	docker compose -f infra/compose/docker-compose.dev.yml logs -f
 
 dev-ps:
-	docker compose -f infra/docker-compose.dev.yml ps
+	docker compose -f infra/compose/docker-compose.dev.yml ps
 
 keycloak-up:
-	docker compose -f infra/docker-compose.keycloak.yml --env-file infra/.env up -d
+	docker compose -f infra/compose/docker-compose.keycloak.yml --env-file infra/compose/.env up -d
 
 keycloak-down:
-	docker compose -f infra/docker-compose.keycloak.yml down
+	docker compose -f infra/compose/docker-compose.keycloak.yml down
 
 keycloak-logs:
-	docker compose -f infra/docker-compose.keycloak.yml logs -f
+	docker compose -f infra/compose/docker-compose.keycloak.yml logs -f
 
 keycloak-log-service:
-	docker compose -f infra/docker-compose.keycloak.yml logs -f $(SERVICE)
+	docker compose -f infra/compose/docker-compose.keycloak.yml logs -f $(SERVICE)
 
 keycloak-ps:
-	docker compose -f infra/docker-compose.keycloak.yml ps
+	docker compose -f infra/compose/docker-compose.keycloak.yml ps
 
 keycloak-restart:
-	docker compose -f infra/docker-compose.keycloak.yml restart $(SERVICE)
+	docker compose -f infra/compose/docker-compose.keycloak.yml restart $(SERVICE)
 
 ollama-pull:
 	docker exec -it ollama ollama pull tinyllama
diff --git a/README.md b/README.md
@@ -52,9 +52,10 @@ infra/
   elk/
   scripts/
   keycloak/
-  docker-compose.yml
-  docker-compose.dev.yml
-  Caddyfile
+  compose/
+    docker-compose.yml
+    docker-compose.dev.yml
+    Caddyfile
 performance/
   stress_tests/
 Makefile
@@ -66,7 +67,7 @@ Makefile
  # db + api + ui + elk
 
  $ make dev-up           # start all services
- # docker compose -f infra/docker-compose.dev.yml --env-file infra/.env up --build --force-recreate -d
+ # docker compose -f infra/compose/docker-compose.dev.yml --env-file infra/compose/.env up --build --force-recreate -d
 
  # stop services
  $ make dev-down
diff --git a/docs/data-recovery.md b/docs/data-recovery.md
@@ -6,7 +6,7 @@ This document describes the steps to restore the production database using the e
 
 - Docker and Docker Compose installed
 - Access to the backups folder generated by PatronX
-- A working `.env` file inside `infra/` with database credentials
+- A working `.env` file inside `infra/compose/` with database credentials
 - Optional AWS credentials configured if using S3 offloading
 
 ## Recovery Steps
@@ -24,7 +24,7 @@ This document describes the steps to restore the production database using the e
    ```bash
    make prod-restore-db FILE=backups/2024-06-20.dump
    ```
-   Internally this calls `infra/scripts/restore_db.sh` which runs a temporary PatronX container to perform the restore.
+  Internally this calls `infra/compose/scripts/restore_db.sh` which runs a temporary PatronX container to perform the restore.
 4. **Verify the restore.** Confirm the application starts and migrations apply correctly:
    ```bash
    make prod-up
diff --git a/infra/compose/.env.example b/infra/compose/.env.example
diff --git a/infra/compose/.env.patronx.example b/infra/compose/.env.patronx.example
diff --git a/infra/compose/Caddyfile b/infra/compose/Caddyfile
diff --git a/infra/compose/CaddyfileKeycloak b/infra/compose/CaddyfileKeycloak
diff --git a/infra/compose/docker-compose.dev.yml b/infra/compose/docker-compose.dev.yml
@@ -9,7 +9,7 @@ services:
       PGDATA: /var/lib/postgresql/data
     volumes:
       - db-data:/var/lib/postgresql/data
-      - ../services/backend/db/init:/docker-entrypoint-initdb.d
+      - ../../services/backend/db/init:/docker-entrypoint-initdb.d
     ports:
       - "5432:5432"
 
@@ -33,7 +33,7 @@ services:
       - ELASTIC_SEARCH_URL=http://elasticsearch:9200
       - ENVIRONMENT=development
     volumes:
-      - ./elk/logstash.conf:/usr/share/logstash/pipeline/logstash.conf
+      - ../elk/logstash.conf:/usr/share/logstash/pipeline/logstash.conf
     depends_on:
       - elasticsearch
 
@@ -74,7 +74,7 @@ services:
       AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY}
       AWS_DEFAULT_REGION: ${AWS_REGION}
     volumes:
-      - ../backups:/app/backups
+      - ../../backups:/app/backups
     depends_on:
       - db
       - rabbitmq
@@ -125,7 +125,7 @@ services:
       GOOGLE_CLIENT_ID_PROD: ${GOOGLE_CLIENT_ID_PROD}
       GOOGLE_CLIENT_SECRET_PROD: ${GOOGLE_CLIENT_SECRET_PROD}
     volumes:
-      - ./keycloak/realm-export.json:/opt/keycloak/data/import/realm-export.json
+      - ../keycloak/realm-export.json:/opt/keycloak/data/import/realm-export.json
     ports:
       - "8082:8080"
 
diff --git a/infra/compose/docker-compose.keycloak.yml b/infra/compose/docker-compose.keycloak.yml
@@ -9,7 +9,7 @@ services:
       PGDATA: /var/lib/postgresql/data
     volumes:
       - db-data:/var/lib/postgresql/data
-      - ../backups:/backups
+      - ../../backups:/backups
     healthcheck:
       test: ["CMD", "pg_isready", "-d", "${POSTGRES_DB}", "-U", "${POSTGRES_USER}"]
       interval: 5s
@@ -50,7 +50,7 @@ services:
       AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY}
       AWS_DEFAULT_REGION: ${AWS_REGION}
     volumes:
-      - ../backups:/backups
+      - ../../backups:/backups
     depends_on:
       - db
       - rabbitmq
@@ -80,7 +80,7 @@ services:
       KC_DB_USERNAME: ${POSTGRES_USER}
       KC_DB_PASSWORD: ${POSTGRES_PASSWORD}
     volumes:
-      - ./keycloak/realm-export.json:/opt/keycloak/data/import/realm-export.json
+      - ../keycloak/realm-export.json:/opt/keycloak/data/import/realm-export.json
     depends_on:
       - db
 
diff --git a/infra/compose/docker-compose.yml b/infra/compose/docker-compose.yml
@@ -9,8 +9,8 @@ services:
       PGDATA: /var/lib/postgresql/data
     volumes:
       - db-data:/var/lib/postgresql/data
-      - ../services/backend/db/init:/docker-entrypoint-initdb.d
-      - ../backups:/backups
+      - ../../services/backend/db/init:/docker-entrypoint-initdb.d
+      - ../../backups:/backups
     healthcheck:
       test: ["CMD", "pg_isready", "-d", "${POSTGRES_DB}", "-U", "${POSTGRES_USER}"]
       interval: 5s
@@ -36,7 +36,7 @@ services:
       - ELASTIC_SEARCH_URL=${ELASTIC_SEARCH_URL}
       - ENVIRONMENT=${ENVIRONMENT}
     volumes:
-      - ./elk/logstash.conf:/usr/share/logstash/pipeline/logstash.conf
+      - ../elk/logstash.conf:/usr/share/logstash/pipeline/logstash.conf
     depends_on:
       - elasticsearch
 
@@ -52,7 +52,7 @@ services:
 
   backend:
     build:
-      context: ../services/backend
+      context: ../../services/backend
       network: "host"
     container_name: survey-backend
     restart: always
@@ -94,11 +94,11 @@ services:
       retries: 20
       start_period: 10s
     volumes:
-      - ../invoices:/app/invoices
+      - ../../invoices:/app/invoices
 
   frontend:
     build:
-      context: ../services/frontend
+      context: ../../services/frontend
       network: "host"
       args:
         VITE_BACKEND_URL: ${VITE_BACKEND_URL}
@@ -151,7 +151,7 @@ services:
       AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY}
       AWS_DEFAULT_REGION: ${AWS_REGION}
     volumes:
-      - ../backups:/backups
+      - ../../backups:/backups
     depends_on:
       - db
       - rabbitmq
@@ -160,7 +160,7 @@ services:
     image: prom/prometheus:v2.54.0
     container_name: prometheus
     volumes:
-      - ./monitoring/prometheus.yml:/etc/prometheus/prometheus.yml:ro
+      - ../monitoring/prometheus.yml:/etc/prometheus/prometheus.yml:ro
       - prometheus_data:/prometheus
     command:
       - '--config.file=/etc/prometheus/prometheus.yml'
@@ -171,8 +171,8 @@ services:
     image: grafana/grafana:9.5.7
     container_name: grafana
     volumes:
-      - ./monitoring/grafana/provisioning:/etc/grafana/provisioning:ro
-      - ./monitoring/grafana/provisioning/dashboards:/var/lib/grafana/dashboards
+      - ../monitoring/grafana/provisioning:/etc/grafana/provisioning:ro
+      - ../monitoring/grafana/provisioning/dashboards:/var/lib/grafana/dashboards
     environment:
       - GF_SECURITY_ADMIN_PASSWORD=${GRAFANA_PASSWORD}
       - GF_USERS_ALLOW_SIGN_UP=false
@@ -191,7 +191,7 @@ services:
 
   analytics:
     build:
-      context: ../services/analytics
+      context: ../../services/analytics
       network: "host"
     container_name: ai-analytics
     environment:
@@ -213,7 +213,7 @@ services:
 
   backoffice:
     build:
-      context: ../services/backoffice
+      context: ../../services/backoffice
       network: "host"
     container_name: survey-backoffice
     restart: always
diff --git a/infra/scripts/restore_db.sh b/infra/scripts/restore_db.sh
@@ -20,19 +20,19 @@ done
 echo "📦 Selected backup: $FILE"
 
 echo "Stopping running services"
-docker compose -f infra/docker-compose.yml down
+docker compose -f infra/compose/docker-compose.yml down
 
 echo "Starting the database only"
-docker compose -f infra/docker-compose.yml up db -d
+docker compose -f infra/compose/docker-compose.yml up db -d
 
 echo "Restoring database using PatronX"
-docker compose -f infra/docker-compose.yml run --rm \
+docker compose -f infra/compose/docker-compose.yml run --rm \
   -v "$(realpath "$FILE"):/tmp/backup.dump" \
   --entrypoint patronx patronx-worker \
   restore --inp "/tmp/backup.dump"
 
 echo "Restarting all services"
-docker compose -f infra/docker-compose.yml up -d
+docker compose -f infra/compose/docker-compose.yml up -d
 
 echo "✅ Restore complete."
 
