Merge pull request #761 from avelanarius/docker-compose-next

Switch from Docker Compose V1 to V2, use "--wait" flag

.github/workflows/cassandra.yml

@@ -19,7 +19,7 @@ jobs:
     - uses: actions/checkout@v3
     - name: Setup 3-node Cassandra cluster
       run: |
-        docker-compose -f test/cluster/cassandra/docker-compose.yml up -d
+        docker compose -f test/cluster/cassandra/docker-compose.yml up -d --wait
       # A separate step for building to separate measuring time of compilation and testing
     - name: Build the project
       run: cargo build --verbose --tests
@@ -28,9 +28,9 @@ jobs:
         CDC='disabled' SCYLLA_URI=172.42.0.2:9042 SCYLLA_URI2=172.42.0.3:9042 SCYLLA_URI3=172.42.0.4:9042 cargo test --verbose -- --skip test_views_in_schema_info
     - name: Stop the cluster
       if: ${{ always() }}
-      run: docker-compose -f test/cluster/cassandra/docker-compose.yml stop
+      run: docker compose -f test/cluster/cassandra/docker-compose.yml stop
     - name: Print the cluster logs
       if: ${{ always() }}
-      run: docker-compose -f test/cluster/cassandra/docker-compose.yml logs
+      run: docker compose -f test/cluster/cassandra/docker-compose.yml logs
     - name: Remove cluster
-      run: docker-compose -f test/cluster/cassandra/docker-compose.yml down
+      run: docker compose -f test/cluster/cassandra/docker-compose.yml down

.github/workflows/rust.yml

@@ -21,7 +21,7 @@ jobs:
     - name: Setup 3-node Scylla cluster
       run: |
         sudo sh -c "echo 2097152 >> /proc/sys/fs/aio-max-nr"
-        docker-compose -f test/cluster/docker-compose.yml up -d
+        docker compose -f test/cluster/docker-compose.yml up -d --wait
     - name: Format check
       run: cargo fmt --verbose --all -- --check
     - name: Clippy check
@@ -38,12 +38,12 @@ jobs:
       run: SCYLLA_URI=172.42.0.2:9042 SCYLLA_URI2=172.42.0.3:9042 SCYLLA_URI3=172.42.0.4:9042 cargo test --verbose
     - name: Stop the cluster
       if: ${{ always() }}
-      run: docker-compose -f test/cluster/docker-compose.yml stop
+      run: docker compose -f test/cluster/docker-compose.yml stop
     - name: Print the cluster logs
       if: ${{ always() }}
-      run: docker-compose -f test/cluster/docker-compose.yml logs
+      run: docker compose -f test/cluster/docker-compose.yml logs
     - name: Remove cluster
-      run: docker-compose -f test/cluster/docker-compose.yml down
+      run: docker compose -f test/cluster/docker-compose.yml down
 
   # Tests that our current minimum supported rust version compiles everything sucessfully
   min_rust:

CONTRIBUTING.md

@@ -31,10 +31,10 @@ Currently, we require new PRs to compile without warnings, pass `cargo fmt` and
 ## Testing
 
 A 3-node ScyllaDB cluster is required to run the tests.
-The simplest way to set it up locally is to use a `docker-compose`.
-Fortunately there is no need to invoke `docker-compose` manually, everything can be handled by our `Makefile`.
+The simplest way to set it up locally is to use a `docker compose`.
+Fortunately there is no need to invoke `docker compose` manually, everything can be handled by our `Makefile`.
 
-To run a cargo test suite, use the command below (note that you must have docker and docker-compose installed):
+To run a cargo test suite, use the command below (note that you must have Docker and Docker Compose V2 installed):
 ```bash
 make test
 ```

Makefile

@@ -1,4 +1,4 @@
-COMPOSE := docker-compose -f test/cluster/docker-compose.yml
+COMPOSE := docker compose -f test/cluster/docker-compose.yml
 
 .PHONY: all
 all: test
@@ -30,14 +30,14 @@ clippy:
 	RUSTFLAGS=-Dwarnings cargo clippy --examples --tests -- -Aclippy::uninlined_format_args
 
 .PHONY: test
-test: up wait-for-cluster
+test: up
 	SCYLLA_URI=172.42.0.2:9042 \
 	 SCYLLA_URI2=172.42.0.3:9042 \
 	 SCYLLA_URI3=172.42.0.4:9042 \
 	 cargo test
 
 .PHONY: dockerized-test
-dockerized-test: up wait-for-cluster
+dockerized-test: up
 	test/dockerized/run.sh
 
 .PHONY: build
@@ -50,7 +50,7 @@ docs:
 
 .PHONY: up
 up:
-	$(COMPOSE) up -d
+	$(COMPOSE) up -d --wait
 	@echo
 	@echo "ScyllaDB cluster is running in the background. Use 'make down' to stop it."
 	@echo
@@ -75,7 +75,3 @@ shell:
 clean: down
 	cargo clean
 	rm -rf docs/book
-
-.PHONY: wait-for-cluster
-wait-for-cluster:
-	@test/cluster/wait.sh

test/dockerized/run.sh

@@ -2,7 +2,7 @@
 
 cd "$(dirname "$0")"/../../
 
-if [[ -z $(docker container ls | grep cluster_scylla) ]]; then
+if [[ -z $(docker container ls | grep cluster-scylla) ]]; then
     echo "Scylla container must be running to execute tests (use 'make up')."
     exit 1
 fi