From 421bf82712c4d896532a4760f6f6a13cc6689a92 Mon Sep 17 00:00:00 2001
From: Marc-Antoine Manningham <marc-antoine.m@outlook.com>
Date: Tue, 22 Oct 2024 23:05:07 -0400
Subject: [PATCH] fix: update compose 4
---
docker-compose.yml | 14 +++++++++++---
server/launch_db.sh | 2 +-
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/docker-compose.yml b/docker-compose.yml
index a95c4ca..7cc34ea 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,7 +21,8 @@ services:
- /var/run/docker.sock:/var/run/docker.sock
backend-cqi:
image: registry.git.step.polymtl.ca/lemark/cqi-qec2025:main
- container_name: backend_cqi_container
+ ports:
+ - "6942:80"
labels:
- "traefik.http.routers.backend-cqi.rule=Host(`api.cqi-qec.qc.ca`)" # Put the URL here
- "traefik.http.services.backend-cqi.loadbalancer.server.port=6942"
@@ -31,16 +32,23 @@ services:
- ./.env
volumes:
- ./.env:/app/.env
+ networks:
+ - database_bridge
depends_on:
- postgres
- postgres:
+ database:
image: postgres
- container_name: postgres_container
+ restart: always
ports:
- "5432:5432"
env_file:
- ./.env
volumes:
- postgres_data:/var/lib/postgresql/data
+ networks:
+ - database_bridge
volumes:
postgres_data:
+networks:
+ database_bridge:
+ driver: bridge
diff --git a/server/launch_db.sh b/server/launch_db.sh
index 3057a9e..82ab166 100755
--- a/server/launch_db.sh
+++ b/server/launch_db.sh
@@ -20,7 +20,7 @@ docker run \
-d postgres
export PGPASSWORD=${DB_PASSWORD}
-until psql -h "${DB_HOST}" -U "${DB_USER}" -p "${DB_PORT}" -d "postgres" -c '\q'; do
+until psql -h "${POSTGRES_HOST}" -U "${POSTGRES_USER}" -p "${POSTGRES_PORT}" -d "postgres" -c '\q'; do
>&2 echo "Postgres is unavailable - sleeping"
sleep 1
done
--
GitLab