From 4cf4b66a4d7b9e4499484b7bd43bfb806f5db841 Mon Sep 17 00:00:00 2001 From: Dirk Wilden Date: Wed, 7 Aug 2024 11:55:57 +0200 Subject: [PATCH] change docker-compose syntax --- .github/contributing.md | 2 +- .github/workflows/lint_test.yml | 4 ++-- docker/run-integration-tests.sh | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/contributing.md b/.github/contributing.md index 8fcea0f2..53267cc6 100644 --- a/.github/contributing.md +++ b/.github/contributing.md @@ -41,7 +41,7 @@ In order to develop integration tests locally, you just have to start the kafka ```shell cd docker -docker-compose up -d +docker compose up -d ``` This will start 3 kafka brokers, one zookeeper, an avro schema-registry. diff --git a/.github/workflows/lint_test.yml b/.github/workflows/lint_test.yml index 0915f949..399f2a56 100644 --- a/.github/workflows/lint_test.yml +++ b/.github/workflows/lint_test.yml @@ -28,7 +28,7 @@ jobs: - name: Run Unit tests run: make test - name: Upload logs - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: test-logs path: test.log @@ -66,7 +66,7 @@ jobs: timeout_minutes: 10 command: make integration_test - name: Upload logs - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: it-logs path: integration-test.log diff --git a/docker/run-integration-tests.sh b/docker/run-integration-tests.sh index 905213d2..d88a96e9 100755 --- a/docker/run-integration-tests.sh +++ b/docker/run-integration-tests.sh @@ -1,7 +1,7 @@ #!/bin/bash # use: # export NO_DOCKER_COMPOSE=true -# to skip docker-compose when it is already running locally +# to skip docker compose when it is already running locally set -e set -o pipefail @@ -14,7 +14,7 @@ echo "using kafka version: ${KAFKAVERSION}" # docker compose up pushd ${ROOT_DIR} if [[ -z "${NO_DOCKER_COMPOSE}" ]]; then - docker-compose -f ${SCRIPT_DIR}/docker-compose.yml --env-file=${SCRIPT_DIR}/.env up -d + docker compose -f ${SCRIPT_DIR}/docker-compose.yml --env-file=${SCRIPT_DIR}/.env up -d fi @@ -22,7 +22,7 @@ fi function tearDown { popd >/dev/null 2>&1 if [[ -z "${NO_DOCKER_COMPOSE}" ]]; then - docker-compose -f ${SCRIPT_DIR}/docker-compose.yml --env-file=${SCRIPT_DIR}/.env down + docker compose -f ${SCRIPT_DIR}/docker-compose.yml --env-file=${SCRIPT_DIR}/.env down fi } trap tearDown EXIT