Skip to content

Commit 2e3f5fe

Browse files
committed
Revert "upgrade to docker compose v2"
This reverts commit fb03605.
1 parent fb03605 commit 2e3f5fe

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ lint-yaml: $(YAMLLINT)
2020

2121
.PHONY: test-smoke
2222
test-smoke:
23-
docker compose -f docker-compose.yml -f docker-compose-ci.yml config
23+
docker-compose -f docker-compose.yml -f docker-compose-ci.yml config

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ ln -sf $(pwd)/streamr-docker-dev/bin.sh /usr/local/bin/streamr-docker-dev
4040

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

43-
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:
43+
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:
4444

4545
1. Install and start Docker service.
4646

streamr-docker-dev/bin.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ DRY_RUN=0
1616
FOLLOW=0
1717
WAIT=0
1818
WAIT_TIMEOUT=500 # seconds
19-
DOCKER_COMPOSE="docker compose --ansi never -f docker-compose.yml"
19+
DOCKER_COMPOSE="docker-compose --ansi never -f docker-compose.yml"
2020
if [ -n "${CI-}" ]; then # Apply CI override when running on CI server
21-
DOCKER_COMPOSE="$DOCKER_COMPOSE -f docker compose-ci.yml"
21+
DOCKER_COMPOSE="$DOCKER_COMPOSE -f docker-compose-ci.yml"
2222
fi
2323

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

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

0 commit comments

Comments
 (0)