diff --git a/defaults/main.yml b/defaults/main.yml index 5c61060..1f189c2 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -9,7 +9,7 @@ open_asfa_docker_network: 'open_asfa_net' open_asfa_behind_haproxy: True open_asfa_haproxy_public_net: 'haproxy-public' # DB -open_asfa_db_image: 'postgres:12' +open_asfa_db_image: 'postgres:12-alpine' #open_asfa_db_pwd: 'set it in a vault file' open_asfa_db_name: 'asfadb' open_asfa_db_user: 'asfadb_user' diff --git a/templates/open-asfa-docker-compose.yml.j2 b/templates/open-asfa-docker-compose.yml.j2 index 8cc14c2..4b82d01 100644 --- a/templates/open-asfa-docker-compose.yml.j2 +++ b/templates/open-asfa-docker-compose.yml.j2 @@ -6,10 +6,11 @@ services: networks: - {{ open_asfa_docker_network }} depends_on: - - asfa_pg + - pg environment: SERVER_PORT: 8080 - DB_HOST: {{ open_asfa_docker_service_server_name }}_asfa_pg + #DB_HOST: {{ open_asfa_docker_service_server_name }}_pg + DB_HOST: pg DB_PORT: 5432 SCHEMA: {{ open_asfa_db_name }} DB_USER: {{ open_asfa_db_user }} @@ -44,7 +45,7 @@ services: window: 120s logging: driver: 'journald' - asfa_pg: + pg: image: {{ open_asfa_db_image }} networks: - {{ open_asfa_docker_network }}