Skip to content

Commit

Permalink
Replace docker-compose with docker compose
Browse files Browse the repository at this point in the history
  • Loading branch information
findinpath committed Jul 3, 2023
1 parent 1ed7946 commit 39444b2
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ source env/bin/activate

This will create and activate a new Python virtual environment.

#### Docker and `docker-compose`
#### Docker and `docker compose`

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 and `docker compose` are both used in testing. Specific instructions for you OS can be found [here](https://docs.docker.com/get-docker/).

## Running `dbt-trino` in development

Expand Down
6 changes: 3 additions & 3 deletions docker/init_starburst.bash
Original file line number Diff line number Diff line change
Expand Up @@ -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'
6 changes: 3 additions & 3 deletions docker/init_trino.bash
Original file line number Diff line number Diff line change
Expand Up @@ -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'
2 changes: 1 addition & 1 deletion docker/remove_starburst.bash
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion docker/remove_trino.bash
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 39444b2

Please sign in to comment.