Skip to content

Commit 8079766

Browse files
authored
Update docker compose syntax to keep GitHub Actions happy (#569)
1 parent 8db7622 commit 8079766

File tree

4 files changed

+14
-15
lines changed

4 files changed

+14
-15
lines changed

.github/workflows/ci.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -113,29 +113,29 @@ jobs:
113113
set -x
114114
docker version
115115
docker buildx version
116-
docker-compose version
116+
docker compose version
117117
118118
- name: Build Docker image
119119
run: |
120120
set -x
121-
docker-compose build
122-
docker-compose run --rm --no-deps dbmate --version
121+
docker compose build
122+
docker compose run --rm --no-deps dbmate --version
123123
124124
- name: Run make build
125-
run: docker-compose run --rm --no-deps dev make build ls
125+
run: docker compose run --rm --no-deps dev make build ls
126126

127127
- name: Run make lint
128-
run: docker-compose run --rm --no-deps dev make lint
128+
run: docker compose run --rm --no-deps dev make lint
129129

130130
- name: Start test dependencies
131131
run: |
132132
set -x
133-
docker-compose pull --ignore-buildable --quiet
134-
docker-compose up --detach
135-
docker-compose run --rm dev make wait
133+
docker compose pull --ignore-buildable --quiet
134+
docker compose up --detach
135+
docker compose run --rm dev make wait
136136
137137
- name: Run make test
138-
run: docker-compose run --rm dev make test
138+
run: docker compose run --rm dev make test
139139

140140
- name: Login to Docker Hub
141141
uses: docker/login-action@v3

Makefile

+4-4
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,13 @@ update-deps:
6868

6969
.PHONY: docker-build
7070
docker-build:
71-
docker-compose pull --ignore-buildable
72-
docker-compose build
71+
docker compose pull --ignore-buildable
72+
docker compose build
7373

7474
.PHONY: docker-all
7575
docker-all: docker-build
76-
docker-compose run --rm dev make all
76+
docker compose run --rm dev make all
7777

7878
.PHONY: docker-dev
7979
docker-dev:
80-
-docker-compose run --rm dev
80+
-docker compose run --rm dev

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -609,7 +609,7 @@ _If you notice any inaccuracies in this table, please [propose a change](https:/
609609

610610
Dbmate is written in Go, pull requests are welcome.
611611

612-
Tests are run against a real database using docker-compose. To build a docker image and run the tests:
612+
Tests are run against a real database using docker compose. To build a docker image and run the tests:
613613

614614
```sh
615615
$ make docker-all

docker-compose.yml

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
version: "2.3"
21
services:
32
dev:
43
build:

0 commit comments

Comments
 (0)