Update docker compose syntax to keep GitHub Actions happy (#569)

amacneil · Aug 19, 2024 · 8079766 · 8079766
1 parent 8db7622
commit 8079766
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 15 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -113,29 +113,29 @@ jobs:
           set -x
           docker version
           docker buildx version
-          docker-compose version
+          docker compose version
 
       - name: Build Docker image
         run: |
           set -x
-          docker-compose build
-          docker-compose run --rm --no-deps dbmate --version
+          docker compose build
+          docker compose run --rm --no-deps dbmate --version
 
       - name: Run make build
-        run: docker-compose run --rm --no-deps dev make build ls
+        run: docker compose run --rm --no-deps dev make build ls
 
       - name: Run make lint
-        run: docker-compose run --rm --no-deps dev make lint
+        run: docker compose run --rm --no-deps dev make lint
 
       - name: Start test dependencies
         run: |
           set -x
-          docker-compose pull --ignore-buildable --quiet
-          docker-compose up --detach
-          docker-compose run --rm dev make wait
+          docker compose pull --ignore-buildable --quiet
+          docker compose up --detach
+          docker compose run --rm dev make wait
 
       - name: Run make test
-        run: docker-compose run --rm dev make test
+        run: docker compose run --rm dev make test
 
       - name: Login to Docker Hub
         uses: docker/login-action@v3

diff --git a/Makefile b/Makefile
@@ -68,13 +68,13 @@ update-deps:
 
 .PHONY: docker-build
 docker-build:
-	docker-compose pull --ignore-buildable
-	docker-compose build
+	docker compose pull --ignore-buildable
+	docker compose build
 
 .PHONY: docker-all
 docker-all: docker-build
-	docker-compose run --rm dev make all
+	docker compose run --rm dev make all
 
 .PHONY: docker-dev
 docker-dev:
-	-docker-compose run --rm dev
+	-docker compose run --rm dev
diff --git a/README.md b/README.md
@@ -609,7 +609,7 @@ _If you notice any inaccuracies in this table, please [propose a change](https:/
 
 Dbmate is written in Go, pull requests are welcome.
 
-Tests are run against a real database using docker-compose. To build a docker image and run the tests:
+Tests are run against a real database using docker compose. To build a docker image and run the tests:
 
 ```sh
 $ make docker-all

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,4 +1,3 @@
-version: "2.3"
 services:
   dev:
     build: