[CI FIx] Use Docker Compose V2 (apache#575)

HonahX · Apr 3, 2024 · 474b37b · 474b37b
1 parent 5ef9f3d
commit 474b37b
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/.github/workflows/python-integration.yml b/.github/workflows/python-integration.yml
@@ -43,4 +43,4 @@ jobs:
       run: make test-integration
     - name: Show debug logs
       if: ${{ failure() }}
-      run: docker-compose -f dev/docker-compose.yml logs
+      run: docker compose -f dev/docker-compose.yml logs
diff --git a/Makefile b/Makefile
@@ -37,17 +37,17 @@ test-s3:
 	poetry run pytest tests/ -m s3 ${PYTEST_ARGS}
 
 test-integration:
-	docker-compose -f dev/docker-compose-integration.yml kill
-	docker-compose -f dev/docker-compose-integration.yml rm -f
-	docker-compose -f dev/docker-compose-integration.yml up -d
+	docker compose -f dev/docker-compose-integration.yml kill
+	docker compose -f dev/docker-compose-integration.yml rm -f
+	docker compose -f dev/docker-compose-integration.yml up -d
 	sleep 10
-	docker-compose -f dev/docker-compose-integration.yml exec -T spark-iceberg ipython ./provision.py
+	docker compose -f dev/docker-compose-integration.yml exec -T spark-iceberg ipython ./provision.py
 	poetry run pytest tests/ -v -m integration ${PYTEST_ARGS}
 
 test-integration-rebuild:
-	docker-compose -f dev/docker-compose-integration.yml kill
-	docker-compose -f dev/docker-compose-integration.yml rm -f
-	docker-compose -f dev/docker-compose-integration.yml build --no-cache
+	docker compose -f dev/docker-compose-integration.yml kill
+	docker compose -f dev/docker-compose-integration.yml rm -f
+	docker compose -f dev/docker-compose-integration.yml build --no-cache
 
 test-adlfs:
 	sh ./dev/run-azurite.sh
@@ -58,12 +58,12 @@ test-gcs:
 	poetry run  pytest tests/ -m gcs ${PYTEST_ARGS}
 
 test-coverage:
-	docker-compose -f dev/docker-compose-integration.yml kill
-	docker-compose -f dev/docker-compose-integration.yml rm -f
-	docker-compose -f dev/docker-compose-integration.yml up -d
+	docker compose -f dev/docker-compose-integration.yml kill
+	docker compose -f dev/docker-compose-integration.yml rm -f
+	docker compose -f dev/docker-compose-integration.yml up -d
 	sh ./dev/run-azurite.sh
 	sh ./dev/run-gcs-server.sh
-	docker-compose -f dev/docker-compose-integration.yml exec -T spark-iceberg ipython ./provision.py
+	docker compose -f dev/docker-compose-integration.yml exec -T spark-iceberg ipython ./provision.py
 	poetry run coverage run --source=pyiceberg/ -m pytest tests/ ${PYTEST_ARGS}
 	poetry run coverage report -m --fail-under=90
 	poetry run coverage html

diff --git a/dev/run-azurite.sh b/dev/run-azurite.sh
@@ -23,8 +23,8 @@ set -ex
 if [ $(docker ps -q --filter "name=azurite" --filter "status=running" ) ]; then
     echo "Azurite backend running"
 else
-    docker-compose -f dev/docker-compose-azurite.yml kill
-    docker-compose -f dev/docker-compose-azurite.yml up -d
+    docker compose -f dev/docker-compose-azurite.yml kill
+    docker compose -f dev/docker-compose-azurite.yml up -d
     while [ -z $(docker ps -q --filter "name=azurite" --filter "status=running" ) ]
     do
       echo "Waiting for Azurite"

diff --git a/dev/run-gcs-server.sh b/dev/run-gcs-server.sh
@@ -23,8 +23,8 @@ set -ex
 if [ $(docker ps -q --filter "name=gcs-server" --filter "status=running" ) ]; then
     echo "Fake GCS Server running"
 else
-    docker-compose -f dev/docker-compose-gcs-server.yml kill
-    docker-compose -f dev/docker-compose-gcs-server.yml up -d
+    docker compose -f dev/docker-compose-gcs-server.yml kill
+    docker compose -f dev/docker-compose-gcs-server.yml up -d
     while [ -z $(docker ps -q --filter "name=gcs-server" --filter "status=running" ) ]
     do
       echo "Waiting for Fake GCS Server"

diff --git a/dev/run-minio.sh b/dev/run-minio.sh
@@ -23,8 +23,8 @@ set -ex
 if [ $(docker ps -q --filter "name=pyiceberg-minio" --filter "status=running" ) ]; then
     echo "Minio backend running"
 else
-    docker-compose -f dev/docker-compose.yml kill
-    docker-compose -f dev/docker-compose.yml up -d
+    docker compose -f dev/docker-compose.yml kill
+    docker compose -f dev/docker-compose.yml up -d
     while [ -z $(docker ps -q --filter "name=pyiceberg-minio" --filter "status=running" ) ]
     do
       echo "Waiting for Minio"