diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f2b8464..a77c571 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,11 +42,6 @@ jobs: restore-keys: | ${{ runner.os }}-dialyzer2- - - name: Set up Docker Compose - run: | - sudo curl -L "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose - sudo chmod +x /usr/local/bin/docker-compose - # Install Erlang - name: Install Erlang/OTP uses: erlef/setup-beam@v1 @@ -65,4 +60,4 @@ jobs: run: | export KAFKA_VERSION=${{ matrix.kafka }} make test-env - make eunit || (cd scripts && docker-compose logs) + make eunit || (cd scripts && docker compose logs) diff --git a/scripts/docker-compose.yml b/scripts/docker-compose.yml index 257a413..36a3c90 100644 --- a/scripts/docker-compose.yml +++ b/scripts/docker-compose.yml @@ -1,5 +1,3 @@ -version: '2' - services: zookeeper: image: "zmstone/kafka:${KAFKA_VERSION}" diff --git a/scripts/setup-test-env.sh b/scripts/setup-test-env.sh index f05b2df..a2662c2 100755 --- a/scripts/setup-test-env.sh +++ b/scripts/setup-test-env.sh @@ -26,8 +26,8 @@ export KAFKA_VERSION=$VERSION TD="$(cd "$(dirname "$0")" && pwd)" -docker-compose -f $TD/docker-compose.yml down || true -docker-compose -f $TD/docker-compose.yml up -d +docker compose -f $TD/docker-compose.yml down || true +docker compose -f $TD/docker-compose.yml up -d # give kafka some time sleep 5 @@ -70,4 +70,3 @@ docker exec kafka-1 /opt/kafka/bin/kafka-consumer-groups.sh --bootstrap-server l if [[ "$KAFKA_VERSION" != 0.9* ]] && [[ "$KAFKA_VERSION" != 0.10* ]]; then docker exec kafka-1 /opt/kafka/bin/kafka-configs.sh --zookeeper localhost:2181 --alter --add-config 'SCRAM-SHA-256=[iterations=8192,password=ecila],SCRAM-SHA-512=[password=ecila]' --entity-type users --entity-name alice fi -