From 7e01539a06b9c93d4fceb99565719a75b4cd7717 Mon Sep 17 00:00:00 2001 From: Patrik Nordwall Date: Tue, 6 Aug 2024 10:12:59 +0200 Subject: [PATCH] chore: docker compose (#588) --- .github/workflows/nightly.yml | 2 +- CONTRIBUTING.md | 4 ++-- docker/docker-compose-yugabyte.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 8120e9a4..09f85fff 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -102,7 +102,7 @@ jobs: - name: Start DB run: |- - docker-compose -f docker/docker-compose-yugabyte.yml up -d + docker compose -f docker/docker-compose-yugabyte.yml up -d # TODO: could we poll the port instead of sleep? sleep 10 docker exec -i yb-tserver-n1 /home/yugabyte/bin/ysqlsh -h yb-tserver-n1 -t < ddl-scripts/create_tables_yugabyte.sql diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 328d3caf..8c0645f5 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -7,7 +7,7 @@ The tests expect a locally running database. It can be started with the docker-compose file in the docker folder: ``` -docker-compose -f docker/docker-compose-postgres.yml up --wait +docker compose -f docker/docker-compose-postgres.yml up --wait ``` ``` @@ -52,7 +52,7 @@ The tests expect a locally running database. It can be started with the docker-comopse file in the docker folder: ``` -docker-compose -f docker/docker-compose-yugabyte.yml up +docker compose -f docker/docker-compose-yugabyte.yml up ``` ``` diff --git a/docker/docker-compose-yugabyte.yml b/docker/docker-compose-yugabyte.yml index e19e5862..aed0acec 100644 --- a/docker/docker-compose-yugabyte.yml +++ b/docker/docker-compose-yugabyte.yml @@ -1,4 +1,4 @@ -version: '2' +version: '2.2' # Local Yugabyte database, see https://docs.yugabyte.com/latest/deploy/docker/docker-compose/