From 009e5cde201f3d1738e1fa8d90d98b7dc56dc8fe Mon Sep 17 00:00:00 2001 From: mgramin Date: Thu, 18 Jan 2024 12:21:57 +0300 Subject: [PATCH 1/5] Update --- docker-compose.yaml => docker-compose.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename docker-compose.yaml => docker-compose.yml (100%) diff --git a/docker-compose.yaml b/docker-compose.yml similarity index 100% rename from docker-compose.yaml rename to docker-compose.yml From 24e07f53f69c90a111e31c16551217e015a7c4d4 Mon Sep 17 00:00:00 2001 From: mgramin Date: Thu, 18 Jan 2024 12:26:24 +0300 Subject: [PATCH 2/5] Update --- docker-compose.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 7349679..1b0c8cf 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -66,10 +66,3 @@ services: condition: service_healthy pgadmin: condition: service_started - - - check: - container_name: check - image: sodadata/soda-core - volumes: - - ./soda:/sodacl From 5df620f299cd376c454320e7ebca80e1b5c11997 Mon Sep 17 00:00:00 2001 From: mgramin Date: Fri, 19 Jan 2024 16:23:42 +0300 Subject: [PATCH 3/5] Update --- docker-compose.yml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 1b0c8cf..534795b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -37,19 +37,6 @@ services: retries: 30 - pgadmin: - container_name: pgadmin - image: dpage/pgadmin4 - environment: - PGADMIN_DEFAULT_EMAIL: ${PGADMIN_DEFAULT_EMAIL:-pgadmin4@pgadmin.org} - PGADMIN_DEFAULT_PASSWORD: postgres - PGADMIN_CONFIG_SERVER_MODE: 'False' - volumes: - - ./pgadmin/servers.json:/pgadmin4/servers.json - ports: - - "8888:80" - - databases: container_name: databases image: docker/whalesay @@ -64,5 +51,3 @@ services: condition: service_healthy output_db: condition: service_healthy - pgadmin: - condition: service_started From f0bb17d216315d1a518654aa6fb8edbe338d5286 Mon Sep 17 00:00:00 2001 From: mgramin Date: Fri, 19 Jan 2024 16:28:08 +0300 Subject: [PATCH 4/5] Update --- docker-compose.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 534795b..841fcbb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,13 +4,10 @@ services: input_db: container_name: input_db - image: postgres:15 + image: synthesizedio/pagila environment: POSTGRES_USER: ${POSTGRES_USER:-postgres} POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-postgres} - volumes: - - ./schema.sql:/docker-entrypoint-initdb.d/1.sql - - ./data.sql:/docker-entrypoint-initdb.d/2.sql ports: [ "6000:5432" ] healthcheck: test: "pg_isready -d postgres -q -U ${POSTGRES_USER:-postgres}" @@ -22,12 +19,10 @@ services: output_db: container_name: output_db - image: postgres:15 + image: postgres:16 environment: POSTGRES_USER: ${POSTGRES_USER:-postgres} POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-postgres} - volumes: - - ./schema.sql:/docker-entrypoint-initdb.d/1.sql ports: [ "6001:5432" ] healthcheck: test: "pg_isready -d postgres -q -U ${POSTGRES_USER:-postgres}" From ddd89fb9c0b05148e833684c7a8aa0aaacdd5a67 Mon Sep 17 00:00:00 2001 From: mgramin Date: Fri, 19 Jan 2024 16:34:06 +0300 Subject: [PATCH 5/5] Update --- docker-compose.yml | 30 +----------------------------- 1 file changed, 1 insertion(+), 29 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 841fcbb..af19498 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,4 @@ -version: '3.5' +version: '3.1' services: @@ -9,12 +9,6 @@ services: POSTGRES_USER: ${POSTGRES_USER:-postgres} POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-postgres} ports: [ "6000:5432" ] - healthcheck: - test: "pg_isready -d postgres -q -U ${POSTGRES_USER:-postgres}" - interval: "3s" - timeout: "3s" - start_period: "3s" - retries: 30 output_db: @@ -24,25 +18,3 @@ services: POSTGRES_USER: ${POSTGRES_USER:-postgres} POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-postgres} ports: [ "6001:5432" ] - healthcheck: - test: "pg_isready -d postgres -q -U ${POSTGRES_USER:-postgres}" - interval: "3s" - timeout: "3s" - start_period: "3s" - retries: 30 - - - databases: - container_name: databases - image: docker/whalesay - command: > - cowsay - "Both the source and target databases have been started on - port 6000 and 6001 respectively, and are ready for TDK exercises! - To check it out with pgAdmin, simply go to this link: - http://localhost:8888 and use 'postgres' as the password." - depends_on: - input_db: - condition: service_healthy - output_db: - condition: service_healthy