From c0ff2a27f9482e31dc7adcb41232d6d78b099188 Mon Sep 17 00:00:00 2001 From: Uladzimir Havenchyk Date: Tue, 6 Aug 2024 13:53:22 +0300 Subject: [PATCH] replace deprecated docker-compose with docker compose --- .github/workflows/tests.yaml | 6 +++--- kadmin.sh | 2 +- send-presto-query.sh | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index cc5c120..bebd15c 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -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 diff --git a/kadmin.sh b/kadmin.sh index 6d66297..1f93707 100644 --- a/kadmin.sh +++ b/kadmin.sh @@ -2,7 +2,7 @@ set -euo pipefail -docker-compose run \ +docker compose run \ -e KRB5_TRACE=/dev/stderr \ machine-example-com \ kadmin \ diff --git a/send-presto-query.sh b/send-presto-query.sh index 252cd5f..93a76e5 100755 --- a/send-presto-query.sh +++ b/send-presto-query.sh @@ -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 bob@EXAMPLE.COM &>/dev/null; curl -X POST \ --insecure \ @@ -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 bob@EXAMPLE.COM &>/dev/null; curl -X GET \ --insecure \ @@ -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 bob@EXAMPLE.COM &>/dev/null; curl -X GET \ --insecure \