Merge pull request #94 from php-openapi/19-upgrade-docker-compose-to-docker-compose

Upgrade `docker-compose` to `docker compose`

Author: cebe

.github/workflows/test.yml

@@ -31,14 +31,11 @@ jobs:
       # Run every tests inside Docker container
       - name: Docker Compose Setup
         uses: ndeloof/[email protected]
-        with:
-          # version: v3.5 # defaults to 'latest'
-          legacy: true    # will also install in PATH as `docker-compose`
 
       - name: Clean
         run: make clean_all
 
-      - name: docker-compose up
+      - name: docker compose up
         run: make up
 
       # https://github.com/shivammathur/setup-php?tab=readme-ov-file#cache-composer-dependencies
@@ -57,7 +54,7 @@ jobs:
           restore-keys: ${{ runner.os }}-composer-
 
       - name: Install Docker and composer dependencies
-        run: docker-compose exec php php -v && make installdocker
+        run: docker compose exec php php -v && make installdocker
 
       - name: Migrate
         run: make UID=0 migrate

CONTRIBUTING.md

@@ -84,7 +84,7 @@ Creating yii2-openapi_maria_1    ... done
 Creating yii2-openapi_mysql_1    ... done
 Creating yii2-openapi_postgres_1 ... done
 Creating yii2-openapi_php_1      ... done
-docker-compose exec php bash
+docker compose exec php bash
 
 root@f9928598f841:/app# php -v
 

Makefile

@@ -10,7 +10,7 @@ check-style:
 	vendor/bin/php-cs-fixer fix --diff --dry-run
 
 check-style-from-host:
-	docker-compose run --rm php sh -c 'vendor/bin/php-cs-fixer fix --diff --dry-run'
+	docker compose run --rm php sh -c 'vendor/bin/php-cs-fixer fix --diff --dry-run'
 
 fix-style:
 	vendor/bin/indent --tabs composer.json
@@ -24,46 +24,46 @@ test:
 	php $(PHPARGS) vendor/bin/phpunit
 
 clean_all:
-	docker-compose down
+	docker compose down --remove-orphans
 	sudo rm -rf tests/tmp/*
 
 clean:
 	sudo rm -rf tests/tmp/app/*
 	sudo rm -rf tests/tmp/docker_app/*
 
 down:
-	docker-compose down --remove-orphans
+	docker compose down --remove-orphans
 
 up:
-	docker-compose up -d
+	docker compose up -d
 	echo "Waiting for mariadb to start up..."
-	docker-compose exec -T mysql timeout 60s sh -c "while ! (mysql -udbuser -pdbpass -h maria --execute 'SELECT 1;' > /dev/null 2>&1); do echo -n '.'; sleep 0.1 ; done; echo 'ok'" || (docker-compose ps; docker-compose logs; exit 1)
+	docker compose exec -T mysql timeout 60s sh -c "while ! (mysql -udbuser -pdbpass -h maria --execute 'SELECT 1;' > /dev/null 2>&1); do echo -n '.'; sleep 0.1 ; done; echo 'ok'" || (docker compose ps; docker compose logs; exit 1)
 
 	echo "Waiting for Mysql to start up..."
-	docker-compose exec -T mysql timeout 60s sh -c "while ! (mysql -udbuser -pdbpass -h mysql --execute 'SELECT 1;' > /dev/null 2>&1); do echo -n '.'; sleep 0.1 ; done; echo 'ok'" || (docker-compose ps; docker-compose logs; exit 1)
+	docker compose exec -T mysql timeout 60s sh -c "while ! (mysql -udbuser -pdbpass -h mysql --execute 'SELECT 1;' > /dev/null 2>&1); do echo -n '.'; sleep 0.1 ; done; echo 'ok'" || (docker compose ps; docker compose logs; exit 1)
 
 cli:
-	docker-compose exec --user=$(UID) php bash
+	docker compose exec --user=$(UID) php bash
 
 cli_root:
-	docker-compose exec --user="root" php bash
+	docker compose exec --user="root" php bash
 
 cli_mysql:
-	docker-compose exec --user=$(UID) mysql bash
+	docker compose exec --user=$(UID) mysql bash
 
 migrate:
-	docker-compose run --user=$(UID) --rm php sh -c 'mkdir -p "tests/tmp/app"'
-	docker-compose run --user=$(UID) --rm php sh -c 'mkdir -p "tests/tmp/docker_app"'
-	docker-compose run --user=$(UID) --rm php sh -c 'cd /app/tests && ./yii migrate  --interactive=0'
+	docker compose run --user=$(UID) --rm php sh -c 'mkdir -p "tests/tmp/app"'
+	docker compose run --user=$(UID) --rm php sh -c 'mkdir -p "tests/tmp/docker_app"'
+	docker compose run --user=$(UID) --rm php sh -c 'cd /app/tests && ./yii migrate  --interactive=0'
 
 installdocker:
-	docker-compose run --user=$(UID) --rm php composer install && chmod +x tests/yii
+	docker compose run --user=$(UID) --rm php composer install && chmod +x tests/yii
 
 tests_dir_write_permission:
-	docker-compose run --user="root" --rm php chmod -R 777 tests/tmp/ # TODO avoid 777 https://github.com/cebe/yii2-openapi/issues/156
+	docker compose run --user="root" --rm php chmod -R 777 tests/tmp/ # TODO avoid 777 https://github.com/cebe/yii2-openapi/issues/156
 
 testdocker:
-	docker-compose run --user=$(UID) --rm php sh -c 'vendor/bin/phpunit --repeat 3'
+	docker compose run --user=$(UID) --rm php sh -c 'vendor/bin/phpunit --repeat 3'
 
 efs: clean_all up migrate # Everything From Scratch
 

docker-compose.yml

@@ -1,4 +1,4 @@
-version: "3.5"
+name: yii2-docker
 services:
     php:
         image: yii2-openapi-php:${PHP_VERSION:-8.3}
@@ -73,4 +73,3 @@ networks:
         ipam:
           config:
               - subnet: 172.14.0.0/24
-