From 7cc4b0eaa91cf9641b16d3fbc42cf66a10560c35 Mon Sep 17 00:00:00 2001
From: Matthias Mullie <git@mullie.eu>
Date: Wed, 16 Nov 2022 10:09:48 +0100
Subject: [PATCH] Use more recent docker-compose version

---
 .github/workflows/test.yml | 10 ---------
 docker-compose.yml         | 46 ++++++++++++++++++++++----------------
 makefile                   |  6 ++---
 3 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 41b45d6..96b5b5d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -7,31 +7,21 @@ on:
     branches: [ master ]
 
 jobs:
-
   build:
-
     runs-on: ubuntu-latest
-
     steps:
       - uses: actions/checkout@v2
-
       - name: Test PHP 8.1 & submit codecov
         run: make test PHP=8.1 UP=1 DOWN=0 && bash <(curl -s https://codecov.io/bash) && make down PHP=8.1
-
       - name: Test PHP 8.0
         run: make test PHP=8.0
-
       - name: Test PHP 7.4
         run: make test PHP=7.4
-
       - name: Test PHP 7.3
         run: make test PHP=7.3
-
       - name: Test PHP 7.2
         run: make test PHP=7.2
-
       - name: Test PHP 7.1
         run: make test PHP=7.1
-
       - name: Test PHP 5.6
         run: make test PHP=5.6
diff --git a/docker-compose.yml b/docker-compose.yml
index da77681..66d04b4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
-version: '2.1'
+version: '3.8'
 services:
-  php:
-    build:
+  php: &default-php
+    build: &default-php-build
       context: .
       dockerfile: Dockerfile
     volumes:
@@ -10,43 +10,51 @@ services:
       - ./tests:/var/www/tests
       - ./build:/var/www/build
       - ./phpunit.xml.dist:/var/www/phpunit.xml.dist
-  '8.1':
-    extends: php
+  php-8.1:
+    <<: *default-php
     build:
+      <<: *default-php-build
       args:
         version: 8.1-cli
-  '8.0':
-    extends: php
+  php-8.0:
+    <<: *default-php
     build:
+      <<: *default-php-build
       args:
         version: 8.0-cli
-  '7.4':
-    extends: php
+  php-7.4:
+    <<: *default-php
     build:
+      <<: *default-php-build
       args:
         version: 7.4-cli
-  '7.3':
-    extends: php
+  php-7.3:
+    <<: *default-php
     build:
+      <<: *default-php-build
       args:
         version: 7.3-cli
-  '7.2':
-    extends: php
+  php-7.2:
+    <<: *default-php
     build:
+      <<: *default-php-build
       args:
         version: 7.2-cli
-  '7.1':
-    extends: php
+  php-7.1:
+    <<: *default-php
     build:
+      <<: *default-php-build
       args:
         version: 7.1-cli
-  '7.0':
-    extends: php
+  php-7.0:
+    <<: *default-php
     build:
+      <<: *default-php-build
       args:
         version: 7.0-cli
-  '5.6':
-    extends: php
+  php-5.6:
+    <<: *default-php
     build:
+      <<: *default-php-build
       args:
         version: 5.6-cli
diff --git a/makefile b/makefile
index c01cfb8..ac26c3d 100644
--- a/makefile
+++ b/makefile
@@ -13,12 +13,12 @@ image:
 	docker build -t matthiasmullie/minify .
 
 up:
-	docker-compose up -d $(PHP)
+	docker-compose up -d php-$(PHP)
 
 down:
-	docker-compose stop -t0 $(PHP)
+	docker-compose stop -t0 php-$(PHP)
 
 test:
 	[ $(UP) -eq 1 ] && make up || true
-	$(eval cmd='docker-compose run $(PHP) env XDEBUG_MODE=coverage vendor/bin/phpunit $(TEST)')
+	$(eval cmd='docker-compose run php-$(PHP) env XDEBUG_MODE=coverage vendor/bin/phpunit $(TEST)')
 	eval $(cmd); status=$$?; [ $(DOWN) -eq 1 ] && make down; exit $$status