From db08b75406d2904966034675260ce8c005e468ad Mon Sep 17 00:00:00 2001 From: Hanefi Onaldi Date: Sat, 3 Aug 2024 14:41:45 +0300 Subject: [PATCH] Improve Docker and compose definitions (#861) --- tests/blobs/Dockerfile | 2 +- tests/blobs/{docker-compose.yml => compose.yaml} | 1 - tests/cdc-endpos-between-transaction/Dockerfile | 2 +- .../compose.yaml} | 1 - tests/cdc-low-level/Dockerfile | 2 +- tests/cdc-low-level/{docker-compose.yml => compose.yaml} | 1 - tests/cdc-test-decoding/Dockerfile | 2 +- tests/cdc-test-decoding/{docker-compose.yml => compose.yaml} | 1 - tests/cdc-wal2json/Dockerfile | 2 +- .../docker-compose.yml => cdc-wal2json/compose.yaml} | 1 - tests/endpos-in-multi-wal-txn/Dockerfile | 2 +- .../{docker-compose.yml => compose.yaml} | 1 - tests/extensions/Dockerfile | 2 +- tests/extensions/{docker-compose.yml => compose.yaml} | 1 - tests/filtering/Dockerfile | 2 +- tests/filtering/{docker-compose.yml => compose.yaml} | 1 - tests/follow-9.6/Dockerfile | 2 +- tests/follow-9.6/Dockerfile.inject | 2 +- tests/follow-9.6/{docker-compose.yml => compose.yaml} | 1 - tests/follow-data-only/Dockerfile | 2 +- tests/follow-data-only/Dockerfile.inject | 2 +- tests/follow-data-only/{docker-compose.yml => compose.yaml} | 1 - tests/follow-wal2json/Dockerfile | 2 +- tests/follow-wal2json/Dockerfile.inject | 2 +- tests/follow-wal2json/{docker-compose.yml => compose.yaml} | 1 - tests/pagila-multi-steps/Dockerfile | 2 +- tests/pagila-multi-steps/{docker-compose.yml => compose.yaml} | 1 - tests/pagila-standby/Dockerfile | 2 +- tests/pagila-standby/{docker-compose.yml => compose.yaml} | 2 -- tests/pagila/Dockerfile | 2 +- tests/pagila/{docker-compose.yml => compose.yaml} | 1 - tests/unit/Dockerfile | 2 +- tests/unit/{docker-compose.yml => compose.yaml} | 1 - 33 files changed, 18 insertions(+), 34 deletions(-) rename tests/blobs/{docker-compose.yml => compose.yaml} (94%) rename tests/{cdc-wal2json/docker-compose.yml => cdc-endpos-between-transaction/compose.yaml} (96%) rename tests/cdc-low-level/{docker-compose.yml => compose.yaml} (96%) rename tests/cdc-test-decoding/{docker-compose.yml => compose.yaml} (96%) rename tests/{cdc-endpos-between-transaction/docker-compose.yml => cdc-wal2json/compose.yaml} (96%) rename tests/endpos-in-multi-wal-txn/{docker-compose.yml => compose.yaml} (96%) rename tests/extensions/{docker-compose.yml => compose.yaml} (97%) rename tests/filtering/{docker-compose.yml => compose.yaml} (96%) rename tests/follow-9.6/{docker-compose.yml => compose.yaml} (97%) rename tests/follow-data-only/{docker-compose.yml => compose.yaml} (97%) rename tests/follow-wal2json/{docker-compose.yml => compose.yaml} (97%) rename tests/pagila-multi-steps/{docker-compose.yml => compose.yaml} (94%) rename tests/pagila-standby/{docker-compose.yml => compose.yaml} (99%) rename tests/pagila/{docker-compose.yml => compose.yaml} (96%) rename tests/unit/{docker-compose.yml => compose.yaml} (94%) diff --git a/tests/blobs/Dockerfile b/tests/blobs/Dockerfile index ab68ec39e..abaa3bb4d 100644 --- a/tests/blobs/Dockerfile +++ b/tests/blobs/Dockerfile @@ -6,4 +6,4 @@ COPY ./import.sql import.sql COPY ./imgs imgs USER docker -CMD /usr/src/pgcopydb/copydb.sh +CMD ["/usr/src/pgcopydb/copydb.sh"] diff --git a/tests/blobs/docker-compose.yml b/tests/blobs/compose.yaml similarity index 94% rename from tests/blobs/docker-compose.yml rename to tests/blobs/compose.yaml index 84d0bd17d..c381c46f6 100644 --- a/tests/blobs/docker-compose.yml +++ b/tests/blobs/compose.yaml @@ -1,4 +1,3 @@ -version: "3.9" # optional since v1.27.0 services: source: image: postgres:13-bullseye diff --git a/tests/cdc-endpos-between-transaction/Dockerfile b/tests/cdc-endpos-between-transaction/Dockerfile index 8db52477b..3778cbcc0 100644 --- a/tests/cdc-endpos-between-transaction/Dockerfile +++ b/tests/cdc-endpos-between-transaction/Dockerfile @@ -10,4 +10,4 @@ COPY ./000000010000000000000002.json 000000010000000000000002.json COPY ./000000010000000000000002.sql 000000010000000000000002.sql USER docker -CMD /usr/src/pgcopydb/copydb.sh +CMD ["/usr/src/pgcopydb/copydb.sh"] diff --git a/tests/cdc-wal2json/docker-compose.yml b/tests/cdc-endpos-between-transaction/compose.yaml similarity index 96% rename from tests/cdc-wal2json/docker-compose.yml rename to tests/cdc-endpos-between-transaction/compose.yaml index 3cec69698..5ae9c10d2 100644 --- a/tests/cdc-wal2json/docker-compose.yml +++ b/tests/cdc-endpos-between-transaction/compose.yaml @@ -1,4 +1,3 @@ -version: "3.9" # optional since v1.27.0 services: source: build: diff --git a/tests/cdc-low-level/Dockerfile b/tests/cdc-low-level/Dockerfile index aa72b1acc..dd5231356 100644 --- a/tests/cdc-low-level/Dockerfile +++ b/tests/cdc-low-level/Dockerfile @@ -8,4 +8,4 @@ COPY ./000000010000000000000002.json 000000010000000000000002.json COPY ./000000010000000000000002.sql 000000010000000000000002.sql USER docker -CMD /usr/src/pgcopydb/copydb.sh +CMD ["/usr/src/pgcopydb/copydb.sh"] diff --git a/tests/cdc-low-level/docker-compose.yml b/tests/cdc-low-level/compose.yaml similarity index 96% rename from tests/cdc-low-level/docker-compose.yml rename to tests/cdc-low-level/compose.yaml index ddda25833..a2b1732e7 100644 --- a/tests/cdc-low-level/docker-compose.yml +++ b/tests/cdc-low-level/compose.yaml @@ -1,4 +1,3 @@ -version: "3.9" # optional since v1.27.0 services: source: image: postgres:13-bullseye diff --git a/tests/cdc-test-decoding/Dockerfile b/tests/cdc-test-decoding/Dockerfile index e7141a61f..14650c38e 100644 --- a/tests/cdc-test-decoding/Dockerfile +++ b/tests/cdc-test-decoding/Dockerfile @@ -10,4 +10,4 @@ COPY ./continued-txn.json continued-txn.json COPY ./continued-txn.sql continued-txn.sql USER docker -CMD /usr/src/pgcopydb/copydb.sh +CMD ["/usr/src/pgcopydb/copydb.sh"] diff --git a/tests/cdc-test-decoding/docker-compose.yml b/tests/cdc-test-decoding/compose.yaml similarity index 96% rename from tests/cdc-test-decoding/docker-compose.yml rename to tests/cdc-test-decoding/compose.yaml index 451d09459..7406d7d10 100644 --- a/tests/cdc-test-decoding/docker-compose.yml +++ b/tests/cdc-test-decoding/compose.yaml @@ -1,4 +1,3 @@ -version: "3.9" # optional since v1.27.0 services: source: image: postgres:13-bullseye diff --git a/tests/cdc-wal2json/Dockerfile b/tests/cdc-wal2json/Dockerfile index 238019359..10ee03919 100644 --- a/tests/cdc-wal2json/Dockerfile +++ b/tests/cdc-wal2json/Dockerfile @@ -10,4 +10,4 @@ COPY ./000000010000000000000002.json 000000010000000000000002.json COPY ./000000010000000000000002.sql 000000010000000000000002.sql USER docker -CMD /usr/src/pgcopydb/copydb.sh +CMD ["/usr/src/pgcopydb/copydb.sh"] diff --git a/tests/cdc-endpos-between-transaction/docker-compose.yml b/tests/cdc-wal2json/compose.yaml similarity index 96% rename from tests/cdc-endpos-between-transaction/docker-compose.yml rename to tests/cdc-wal2json/compose.yaml index 3cec69698..5ae9c10d2 100644 --- a/tests/cdc-endpos-between-transaction/docker-compose.yml +++ b/tests/cdc-wal2json/compose.yaml @@ -1,4 +1,3 @@ -version: "3.9" # optional since v1.27.0 services: source: build: diff --git a/tests/endpos-in-multi-wal-txn/Dockerfile b/tests/endpos-in-multi-wal-txn/Dockerfile index 041b2590e..910467dbc 100644 --- a/tests/endpos-in-multi-wal-txn/Dockerfile +++ b/tests/endpos-in-multi-wal-txn/Dockerfile @@ -6,4 +6,4 @@ COPY ./ddl.sql ddl.sql COPY ./multi-wal-txn.sql multi-wal-txn.sql USER docker -CMD /usr/src/pgcopydb/copydb.sh +CMD ["/usr/src/pgcopydb/copydb.sh"] diff --git a/tests/endpos-in-multi-wal-txn/docker-compose.yml b/tests/endpos-in-multi-wal-txn/compose.yaml similarity index 96% rename from tests/endpos-in-multi-wal-txn/docker-compose.yml rename to tests/endpos-in-multi-wal-txn/compose.yaml index 3cec69698..5ae9c10d2 100644 --- a/tests/endpos-in-multi-wal-txn/docker-compose.yml +++ b/tests/endpos-in-multi-wal-txn/compose.yaml @@ -1,4 +1,3 @@ -version: "3.9" # optional since v1.27.0 services: source: build: diff --git a/tests/extensions/Dockerfile b/tests/extensions/Dockerfile index da12c0205..17157bc1b 100644 --- a/tests/extensions/Dockerfile +++ b/tests/extensions/Dockerfile @@ -6,4 +6,4 @@ COPY ./ddl.sql ddl.sql COPY ./countries.sql countries.sql USER docker -CMD /usr/src/pgcopydb/copydb.sh +CMD ["/usr/src/pgcopydb/copydb.sh"] diff --git a/tests/extensions/docker-compose.yml b/tests/extensions/compose.yaml similarity index 97% rename from tests/extensions/docker-compose.yml rename to tests/extensions/compose.yaml index e9bbdf32d..5083835e8 100644 --- a/tests/extensions/docker-compose.yml +++ b/tests/extensions/compose.yaml @@ -1,4 +1,3 @@ -version: "3.9" # optional since v1.27.0 services: source: build: diff --git a/tests/filtering/Dockerfile b/tests/filtering/Dockerfile index 4ddd4469d..8a80def55 100644 --- a/tests/filtering/Dockerfile +++ b/tests/filtering/Dockerfile @@ -12,4 +12,4 @@ COPY ./exclude ./test/exclude USER docker WORKDIR /usr/src/pgcopydb/test/ -CMD /usr/src/pgcopydb/copydb.sh +CMD ["/usr/src/pgcopydb/copydb.sh"] diff --git a/tests/filtering/docker-compose.yml b/tests/filtering/compose.yaml similarity index 96% rename from tests/filtering/docker-compose.yml rename to tests/filtering/compose.yaml index e9dfb8266..c1e154993 100644 --- a/tests/filtering/docker-compose.yml +++ b/tests/filtering/compose.yaml @@ -1,4 +1,3 @@ -version: "3.9" # optional since v1.27.0 services: source: image: postgres:13-bullseye diff --git a/tests/follow-9.6/Dockerfile b/tests/follow-9.6/Dockerfile index 4d1b5175f..fc49cd3e8 100644 --- a/tests/follow-9.6/Dockerfile +++ b/tests/follow-9.6/Dockerfile @@ -6,4 +6,4 @@ COPY ./dml.sql dml.sql COPY ./ddl.sql ddl.sql USER docker -CMD /usr/src/pgcopydb/copydb.sh +CMD ["/usr/src/pgcopydb/copydb.sh"] diff --git a/tests/follow-9.6/Dockerfile.inject b/tests/follow-9.6/Dockerfile.inject index 51c0dc4be..1f4b69e3a 100644 --- a/tests/follow-9.6/Dockerfile.inject +++ b/tests/follow-9.6/Dockerfile.inject @@ -11,4 +11,4 @@ COPY ./inject.sh inject.sh COPY ./dml.sql dml.sql USER docker -CMD /usr/src/pgcopydb/inject.sh +CMD ["/usr/src/pgcopydb/inject.sh"] diff --git a/tests/follow-9.6/docker-compose.yml b/tests/follow-9.6/compose.yaml similarity index 97% rename from tests/follow-9.6/docker-compose.yml rename to tests/follow-9.6/compose.yaml index b15ced55c..47da9d2d0 100644 --- a/tests/follow-9.6/docker-compose.yml +++ b/tests/follow-9.6/compose.yaml @@ -1,4 +1,3 @@ -version: "3.9" # optional since v1.27.0 services: source: build: diff --git a/tests/follow-data-only/Dockerfile b/tests/follow-data-only/Dockerfile index 19a816add..f14ff1801 100644 --- a/tests/follow-data-only/Dockerfile +++ b/tests/follow-data-only/Dockerfile @@ -9,4 +9,4 @@ COPY ./ddl.sql ddl.sql COPY ./multi-wal-txn.sql multi-wal-txn.sql USER docker -CMD /usr/src/pgcopydb/copydb.sh +CMD ["/usr/src/pgcopydb/copydb.sh"] diff --git a/tests/follow-data-only/Dockerfile.inject b/tests/follow-data-only/Dockerfile.inject index 6aae0b9b5..9b985a5f0 100644 --- a/tests/follow-data-only/Dockerfile.inject +++ b/tests/follow-data-only/Dockerfile.inject @@ -12,4 +12,4 @@ COPY ./dml.sql dml.sql COPY ./dml-bufsize.sql dml-bufsize.sql USER docker -CMD /usr/src/pgcopydb/inject.sh +CMD ["/usr/src/pgcopydb/inject.sh"] diff --git a/tests/follow-data-only/docker-compose.yml b/tests/follow-data-only/compose.yaml similarity index 97% rename from tests/follow-data-only/docker-compose.yml rename to tests/follow-data-only/compose.yaml index 34a2d80d9..e901de502 100644 --- a/tests/follow-data-only/docker-compose.yml +++ b/tests/follow-data-only/compose.yaml @@ -1,4 +1,3 @@ -version: "3.9" # optional since v1.27.0 services: source: build: diff --git a/tests/follow-wal2json/Dockerfile b/tests/follow-wal2json/Dockerfile index 4d1b5175f..fc49cd3e8 100644 --- a/tests/follow-wal2json/Dockerfile +++ b/tests/follow-wal2json/Dockerfile @@ -6,4 +6,4 @@ COPY ./dml.sql dml.sql COPY ./ddl.sql ddl.sql USER docker -CMD /usr/src/pgcopydb/copydb.sh +CMD ["/usr/src/pgcopydb/copydb.sh"] diff --git a/tests/follow-wal2json/Dockerfile.inject b/tests/follow-wal2json/Dockerfile.inject index 51c0dc4be..1f4b69e3a 100644 --- a/tests/follow-wal2json/Dockerfile.inject +++ b/tests/follow-wal2json/Dockerfile.inject @@ -11,4 +11,4 @@ COPY ./inject.sh inject.sh COPY ./dml.sql dml.sql USER docker -CMD /usr/src/pgcopydb/inject.sh +CMD ["/usr/src/pgcopydb/inject.sh"] diff --git a/tests/follow-wal2json/docker-compose.yml b/tests/follow-wal2json/compose.yaml similarity index 97% rename from tests/follow-wal2json/docker-compose.yml rename to tests/follow-wal2json/compose.yaml index 23eda66ff..ea5eb5f0f 100644 --- a/tests/follow-wal2json/docker-compose.yml +++ b/tests/follow-wal2json/compose.yaml @@ -1,4 +1,3 @@ -version: "3.9" # optional since v1.27.0 services: source: build: diff --git a/tests/pagila-multi-steps/Dockerfile b/tests/pagila-multi-steps/Dockerfile index 6b9f266be..f0cf93ccb 100644 --- a/tests/pagila-multi-steps/Dockerfile +++ b/tests/pagila-multi-steps/Dockerfile @@ -4,4 +4,4 @@ WORKDIR /usr/src/pgcopydb COPY ./copydb.sh copydb.sh USER docker -CMD /usr/src/pgcopydb/copydb.sh +CMD ["/usr/src/pgcopydb/copydb.sh"] diff --git a/tests/pagila-multi-steps/docker-compose.yml b/tests/pagila-multi-steps/compose.yaml similarity index 94% rename from tests/pagila-multi-steps/docker-compose.yml rename to tests/pagila-multi-steps/compose.yaml index defecb3eb..b34660783 100644 --- a/tests/pagila-multi-steps/docker-compose.yml +++ b/tests/pagila-multi-steps/compose.yaml @@ -1,4 +1,3 @@ -version: "3.9" # optional since v1.27.0 services: source: image: postgres:13-bullseye diff --git a/tests/pagila-standby/Dockerfile b/tests/pagila-standby/Dockerfile index 38b8a8b3d..78dc48929 100644 --- a/tests/pagila-standby/Dockerfile +++ b/tests/pagila-standby/Dockerfile @@ -7,4 +7,4 @@ WORKDIR /usr/src/pgcopydb COPY copydb.sh copydb.sh USER docker -CMD /usr/src/pgcopydb/copydb.sh +CMD ["/usr/src/pgcopydb/copydb.sh"] diff --git a/tests/pagila-standby/docker-compose.yml b/tests/pagila-standby/compose.yaml similarity index 99% rename from tests/pagila-standby/docker-compose.yml rename to tests/pagila-standby/compose.yaml index cb3ecc4d2..5910b07dd 100644 --- a/tests/pagila-standby/docker-compose.yml +++ b/tests/pagila-standby/compose.yaml @@ -1,5 +1,3 @@ -version: "3.9" - x-postgres-base-env: &x-postgres-base-env POSTGRES_USER: postgres POSTGRES_PASSWORD: h4ckm3 diff --git a/tests/pagila/Dockerfile b/tests/pagila/Dockerfile index 38b8a8b3d..78dc48929 100644 --- a/tests/pagila/Dockerfile +++ b/tests/pagila/Dockerfile @@ -7,4 +7,4 @@ WORKDIR /usr/src/pgcopydb COPY copydb.sh copydb.sh USER docker -CMD /usr/src/pgcopydb/copydb.sh +CMD ["/usr/src/pgcopydb/copydb.sh"] diff --git a/tests/pagila/docker-compose.yml b/tests/pagila/compose.yaml similarity index 96% rename from tests/pagila/docker-compose.yml rename to tests/pagila/compose.yaml index babdba0c2..c30526788 100644 --- a/tests/pagila/docker-compose.yml +++ b/tests/pagila/compose.yaml @@ -1,4 +1,3 @@ -version: "3.9" # optional since v1.27.0 services: source: image: postgres:13-bullseye diff --git a/tests/unit/Dockerfile b/tests/unit/Dockerfile index f6c16c047..10ebfa05f 100644 --- a/tests/unit/Dockerfile +++ b/tests/unit/Dockerfile @@ -10,4 +10,4 @@ COPY ./expected ./test/expected USER docker WORKDIR /usr/src/pgcopydb/test/ -CMD /usr/src/pgcopydb/copydb.sh +CMD ["/usr/src/pgcopydb/copydb.sh"] diff --git a/tests/unit/docker-compose.yml b/tests/unit/compose.yaml similarity index 94% rename from tests/unit/docker-compose.yml rename to tests/unit/compose.yaml index 84d0bd17d..c381c46f6 100644 --- a/tests/unit/docker-compose.yml +++ b/tests/unit/compose.yaml @@ -1,4 +1,3 @@ -version: "3.9" # optional since v1.27.0 services: source: image: postgres:13-bullseye