From 40168a2e263306eb5925d89d2953e8ffbd4c670d Mon Sep 17 00:00:00 2001 From: ManUtopiK Date: Thu, 20 Oct 2022 15:41:56 +0200 Subject: [PATCH] Name container --- composes/hasura/compose.yml | 2 ++ composes/pgadmin/compose.yml | 2 +- composes/{db => postgres}/compose.yml | 5 +++-- composes/{db => postgres}/init-data.sh | 0 docker-compose.yml | 8 ++++---- 5 files changed, 10 insertions(+), 7 deletions(-) create mode 100644 composes/hasura/compose.yml rename composes/{db => postgres}/compose.yml (84%) rename composes/{db => postgres}/init-data.sh (100%) diff --git a/composes/hasura/compose.yml b/composes/hasura/compose.yml new file mode 100644 index 0000000..c023af0 --- /dev/null +++ b/composes/hasura/compose.yml @@ -0,0 +1,2 @@ +services: + hasura \ No newline at end of file diff --git a/composes/pgadmin/compose.yml b/composes/pgadmin/compose.yml index e875c73..ed8b530 100644 --- a/composes/pgadmin/compose.yml +++ b/composes/pgadmin/compose.yml @@ -9,5 +9,5 @@ services: - "5050:80" restart: always depends_on: - db: + postgres: condition: service_healthy \ No newline at end of file diff --git a/composes/db/compose.yml b/composes/postgres/compose.yml similarity index 84% rename from composes/db/compose.yml rename to composes/postgres/compose.yml index 9b95105..08f52f1 100644 --- a/composes/db/compose.yml +++ b/composes/postgres/compose.yml @@ -1,5 +1,6 @@ services: - db: + postgres: + container_name: postgres image: postgres:14 restart: always environment: @@ -9,7 +10,7 @@ services: - POSTGRES_NON_ROOT_USER - POSTGRES_NON_ROOT_PASSWORD volumes: - - db_storage:/var/lib/postgresql/data + - postgres_storage:/var/lib/postgresql/data - ./init-data.sh:/docker-entrypoint-initdb.d/init-data.sh healthcheck: test: diff --git a/composes/db/init-data.sh b/composes/postgres/init-data.sh similarity index 100% rename from composes/db/init-data.sh rename to composes/postgres/init-data.sh diff --git a/docker-compose.yml b/docker-compose.yml index 36807fb..ffc6dd9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,9 +1,9 @@ services: - db: + postgres: extends: - file: composes/db/compose.yml - service: db + file: composes/postgres/compose.yml + service: postgres pgadmin: extends: @@ -11,4 +11,4 @@ services: service: pgadmin volumes: - db_storage: + postgres_storage: