summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorEgor Tensin <egor@tensin.name>2025-12-16 00:00:20 +0100
committerEgor Tensin <egor@tensin.name>2025-12-16 00:00:20 +0100
commit45dbf05891b99f5945616df05485f6fcfda971bd (patch)
tree31951322b7560f3ee8fbc0d4940c539217dc1e35
parentworkflows/ci: upgrade actions (diff)
downloadconfig-links-45dbf05891b99f5945616df05485f6fcfda971bd.tar.gz
config-links-45dbf05891b99f5945616df05485f6fcfda971bd.zip
modernize Compose usage
-rw-r--r--Makefile6
-rw-r--r--test/docker/docker-compose.yml1
2 files changed, 3 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index d713dd2..5c92bec 100644
--- a/Makefile
+++ b/Makefile
@@ -23,9 +23,9 @@ test/linux-home:
test/docker/%: DO
cd test/docker && \
- DISTRO='$*' docker-compose build --force-rm --progress plain --pull -q && \
- docker-compose run --rm test && \
- docker-compose down -v
+ DISTRO='$*' docker compose --progress plain build --force-rm --pull -q && \
+ docker compose run --rm test && \
+ docker compose down -v
# Xenial has bash 4.3, which doesn't support inherit_errexit, which is a good
# thing to test against.
diff --git a/test/docker/docker-compose.yml b/test/docker/docker-compose.yml
index 0689ad3..05f1f6a 100644
--- a/test/docker/docker-compose.yml
+++ b/test/docker/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '3'
services:
test:
build: