From fb1f026c9e0a5d6ff6b549c6b8d9358956a9bd42 Mon Sep 17 00:00:00 2001 From: Marius Grama Date: Tue, 27 Jun 2023 15:46:01 +0200 Subject: [PATCH] Replace `docker-compose` with `docker compose` --- CONTRIBUTING.md | 4 ++-- docker/init_starburst.bash | 6 +++--- docker/init_trino.bash | 6 +++--- docker/remove_starburst.bash | 2 +- docker/remove_trino.bash | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 23501ba0..258ce8b0 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -44,9 +44,9 @@ source env/bin/activate This will create and activate a new Python virtual environment. -#### Docker and `docker-compose` +#### Docker -Docker and `docker-compose` are both used in testing. Specific instructions for you OS can be found [here](https://docs.docker.com/get-docker/). +Docker is both used in testing. Specific instructions for you OS can be found [here](https://docs.docker.com/get-docker/). ## Running `dbt-trino` in development diff --git a/docker/init_starburst.bash b/docker/init_starburst.bash index c516cfc2..7d23ef18 100755 --- a/docker/init_starburst.bash +++ b/docker/init_starburst.bash @@ -6,6 +6,6 @@ cd .. set -exo pipefail -docker-compose -f docker-compose-starburst.yml build -docker-compose -f docker-compose-starburst.yml up -d -timeout 5m bash -c -- 'while ! docker-compose -f docker-compose-starburst.yml logs trino 2>&1 | tail -n 1 | grep "SERVER STARTED"; do sleep 2; done' +docker compose -f docker-compose-starburst.yml build +docker compose -f docker-compose-starburst.yml up -d +timeout 5m bash -c -- 'while ! docker compose -f docker-compose-starburst.yml logs trino 2>&1 | tail -n 1 | grep "SERVER STARTED"; do sleep 2; done' diff --git a/docker/init_trino.bash b/docker/init_trino.bash index c41c6658..06cafd4b 100755 --- a/docker/init_trino.bash +++ b/docker/init_trino.bash @@ -6,6 +6,6 @@ cd .. set -exo pipefail -docker-compose -f docker-compose-trino.yml build -docker-compose -f docker-compose-trino.yml up -d -timeout 5m bash -c -- 'while ! docker-compose -f docker-compose-trino.yml logs trino 2>&1 | tail -n 1 | grep "SERVER STARTED"; do sleep 2; done' +docker compose -f docker-compose-trino.yml build +docker compose -f docker-compose-trino.yml up -d +timeout 5m bash -c -- 'while ! docker compose -f docker-compose-trino.yml logs trino 2>&1 | tail -n 1 | grep "SERVER STARTED"; do sleep 2; done' diff --git a/docker/remove_starburst.bash b/docker/remove_starburst.bash index b678bc0f..937923c2 100755 --- a/docker/remove_starburst.bash +++ b/docker/remove_starburst.bash @@ -3,4 +3,4 @@ # move to wherever we are so docker things work cd "$(dirname "${BASH_SOURCE[0]}")" cd .. -docker-compose -f docker-compose-starburst.yml down +docker compose -f docker-compose-starburst.yml down diff --git a/docker/remove_trino.bash b/docker/remove_trino.bash index 600432f7..055157b6 100755 --- a/docker/remove_trino.bash +++ b/docker/remove_trino.bash @@ -3,4 +3,4 @@ # move to wherever we are so docker things work cd "$(dirname "${BASH_SOURCE[0]}")" cd .. -docker-compose -f docker-compose-trino.yml down +docker compose -f docker-compose-trino.yml down