Skip to content

Commit

Permalink
Revert "upgrade to docker compose v2"
Browse files Browse the repository at this point in the history
This reverts commit fb03605.
  • Loading branch information
harbu committed Aug 6, 2024
1 parent fb03605 commit 2e3f5fe
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ lint-yaml: $(YAMLLINT)

.PHONY: test-smoke
test-smoke:
docker compose -f docker-compose.yml -f docker-compose-ci.yml config
docker-compose -f docker-compose.yml -f docker-compose-ci.yml config
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ ln -sf $(pwd)/streamr-docker-dev/bin.sh /usr/local/bin/streamr-docker-dev

The docker stack has not been tested in a Windows environment and is not recommended at this time.

If you know what services you need, you don't need to use the `bin.sh`, you can just use `docker compose` directly, like so:
If you know what services you need, you don't need to use the `bin.sh`, you can just use `docker-compose` directly, like so:

1. Install and start Docker service.

Expand Down
6 changes: 3 additions & 3 deletions streamr-docker-dev/bin.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ DRY_RUN=0
FOLLOW=0
WAIT=0
WAIT_TIMEOUT=500 # seconds
DOCKER_COMPOSE="docker compose --ansi never -f docker-compose.yml"
DOCKER_COMPOSE="docker-compose --ansi never -f docker-compose.yml"
if [ -n "${CI-}" ]; then # Apply CI override when running on CI server
DOCKER_COMPOSE="$DOCKER_COMPOSE -f docker compose-ci.yml"
DOCKER_COMPOSE="$DOCKER_COMPOSE -f docker-compose-ci.yml"
fi

# don't start these services unless explicitly started
Expand Down Expand Up @@ -145,7 +145,7 @@ wait() {
while [[ $time_waited -lt $WAIT_TIMEOUT ]]; do
waiting_for_services=()

# Get the id of each image we have in docker compose
# Get the id of each image we have in docker-compose
for image_id in $($DOCKER_COMPOSE ps -q)
do
service_name=$(docker inspect -f "{{.Name}}" "$image_id")
Expand Down

0 comments on commit 2e3f5fe

Please sign in to comment.