Merge branch 'dimitri:main' into use-copy-with-binary

dimitri · Aug 5, 2024 · d935200 · d935200
2 parents 528a1a2 + db08b75
commit d935200
Show file tree

Hide file tree

Showing 33 changed files with 18 additions and 34 deletions.
diff --git 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 → tests/blobs/compose.yaml b/tests/blobs/docker-compose.yml → 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
@@ -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 → ...c-endpos-between-transaction/compose.yaml b/tests/cdc-wal2json/docker-compose.yml → ...c-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
@@ -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 → tests/cdc-low-level/compose.yaml b/tests/cdc-low-level/docker-compose.yml → 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
@@ -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 → tests/cdc-test-decoding/compose.yaml b/tests/cdc-test-decoding/docker-compose.yml → 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
@@ -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/...os-between-transaction/docker-compose.yml → tests/cdc-wal2json/compose.yaml b/...os-between-transaction/docker-compose.yml → 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
@@ -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/...ndpos-in-multi-wal-txn/docker-compose.yml → tests/endpos-in-multi-wal-txn/compose.yaml b/...ndpos-in-multi-wal-txn/docker-compose.yml → 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
@@ -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 → tests/extensions/compose.yaml b/tests/extensions/docker-compose.yml → 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
@@ -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 → tests/filtering/compose.yaml b/tests/filtering/docker-compose.yml → 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
@@ -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
@@ -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 → tests/follow-9.6/compose.yaml b/tests/follow-9.6/docker-compose.yml → 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
@@ -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
@@ -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 → tests/follow-data-only/compose.yaml b/tests/follow-data-only/docker-compose.yml → 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
@@ -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
@@ -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 → tests/follow-wal2json/compose.yaml b/tests/follow-wal2json/docker-compose.yml → 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
@@ -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 → tests/pagila-multi-steps/compose.yaml b/tests/pagila-multi-steps/docker-compose.yml → 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
@@ -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 → tests/pagila-standby/compose.yaml b/tests/pagila-standby/docker-compose.yml → 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
@@ -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 → tests/pagila/compose.yaml b/tests/pagila/docker-compose.yml → 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
@@ -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 → tests/unit/compose.yaml b/tests/unit/docker-compose.yml → tests/unit/compose.yaml
@@ -1,4 +1,3 @@
-version: "3.9"  # optional since v1.27.0
 services:
   source:
     image: postgres:13-bullseye