From 350b862ae7d592b59b1747a9a834642806486e1a Mon Sep 17 00:00:00 2001 From: Aurince AKAKPO Date: Sat, 20 Dec 2025 18:05:02 +0100 Subject: [PATCH] correction creation user par defaut --- db-init/01-enable-postgis.sql | 2 ++ docker-compose-prod.yml | 13 ++++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 db-init/01-enable-postgis.sql diff --git a/db-init/01-enable-postgis.sql b/db-init/01-enable-postgis.sql new file mode 100644 index 0000000..032f6f9 --- /dev/null +++ b/db-init/01-enable-postgis.sql @@ -0,0 +1,2 @@ +CREATE EXTENSION IF NOT EXISTS postgis; +CREATE EXTENSION IF NOT EXISTS postgis_topology; \ No newline at end of file diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml index d92adc4..7f8170d 100644 --- a/docker-compose-prod.yml +++ b/docker-compose-prod.yml @@ -1,13 +1,13 @@ services: db: - image: postgres:15 + image: postgis/postgis:15-3.4 container_name: fiscad-db restart: always environment: - POSTGRES_DB: fiscad_db #${POSTGRES_DB_FISCAD} - POSTGRES_USER: fiscad_user # ${POSTGRES_USER_FISCAD} + POSTGRES_DB: ${POSTGRES_DB_FISCAD} + POSTGRES_USER: ${POSTGRES_USER_FISCAD} POSTGRES_PASSWORD_FILE: /run/secrets/postgresPassword secrets: @@ -18,9 +18,10 @@ services: volumes: - db-data-fiscad:/var/lib/postgresql/data + - ./db-init:/docker-entrypoint-initdb.d healthcheck: - test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER_FISCAD} -d ${POSTGRES_DB_FISCAD} "] + test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER_FISCAD} -d ${POSTGRES_DB_FISCAD}"] interval: 10s timeout: 5s retries: 5 @@ -32,8 +33,10 @@ services: dockerfile: Dockerfile container_name: fiscad-app restart: on-failure + depends_on: - - db + db: + condition: service_healthy environment: SPRING_DATASOURCE_URL: jdbc:postgresql://db:5432/${POSTGRES_DB_FISCAD}