Skip to content

Commit

Permalink
Merge pull request #3 from metabase/docker-compose-syntax
Browse files Browse the repository at this point in the history
replace deprecated docker-compose with docker compose
  • Loading branch information
uladzimirdev authored Aug 8, 2024
2 parents 0138359 + c0ff2a2 commit 3c4eb27
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Build image
run: docker-compose build
run: docker compose build
- name: Start environment
run: docker-compose up -d
run: docker compose up -d
- name: Run tests
run: ./test.sh
- name: Dunp logs
if: always()
run: docker-compose logs
run: docker compose logs
2 changes: 1 addition & 1 deletion kadmin.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -euo pipefail

docker-compose run \
docker compose run \
-e KRB5_TRACE=/dev/stderr \
machine-example-com \
kadmin \
Expand Down
6 changes: 3 additions & 3 deletions send-presto-query.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ fi

function send_query {
SQL="${1}"
RESPONSE="$(docker-compose run --rm -e KRB5_TRACE=/dev/null machine-example-com bash -c "
RESPONSE="$(docker compose run --rm -e KRB5_TRACE=/dev/null machine-example-com bash -c "
kinit -k [email protected] &>/dev/null;
curl -X POST \
--insecure \
Expand All @@ -35,7 +35,7 @@ function send_query {
echo "${RESPONSE}" | jq .

while [[ "${STATE}" == "QUEUED" ]]; do
RESPONSE="$(docker-compose run --rm -e KRB5_TRACE=/dev/null machine-example-com bash -c "
RESPONSE="$(docker compose run --rm -e KRB5_TRACE=/dev/null machine-example-com bash -c "
kinit -k [email protected] &>/dev/null;
curl -X GET \
--insecure \
Expand All @@ -51,7 +51,7 @@ function send_query {
exit 1
fi
while [[ ! "${NEXT_URL}" == "null" ]]; do
RESPONSE="$(docker-compose run --rm -e KRB5_TRACE=/dev/null machine-example-com bash -c "
RESPONSE="$(docker compose run --rm -e KRB5_TRACE=/dev/null machine-example-com bash -c "
kinit -k [email protected] &>/dev/null;
curl -X GET \
--insecure \
Expand Down

0 comments on commit 3c4eb27

Please sign in to comment.