develop #65

Merged
judaur2005 merged 2 commits from develop into main 2025-12-20 17:07:04 +00:00
2 changed files with 10 additions and 5 deletions

View File

@@ -0,0 +1,2 @@
CREATE EXTENSION IF NOT EXISTS postgis;
CREATE EXTENSION IF NOT EXISTS postgis_topology;

View File

@@ -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,6 +18,7 @@ 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}"]
@@ -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}