Skip to content

Commit

Permalink
change docker-compose syntax
Browse files Browse the repository at this point in the history
  • Loading branch information
d-rk committed Aug 7, 2024
1 parent a6a244f commit 4cf4b66
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
6 changes: 3 additions & 3 deletions docker/run-integration-tests.sh
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -14,15 +14,15 @@ 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


# docker compose down
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
Expand Down

0 comments on commit 4cf4b66

Please sign in to comment.