From 0e6a427aa5837b57d33e8311a4cb97ba02003a81 Mon Sep 17 00:00:00 2001 From: Sohel Ahmed Mesaniya Date: Tue, 4 Mar 2025 16:26:07 +0530 Subject: [PATCH 1/2] Change to `docker compose` --- .github/workflows/test.yml | 6 +++--- CONTRIBUTING.md | 2 +- Makefile | 30 +++++++++++++++--------------- docker-compose.yml | 2 +- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8487efc3..ff20d49f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -33,12 +33,12 @@ jobs: uses: ndeloof/install-compose-action@v0.0.1 with: # version: v3.5 # defaults to 'latest' - legacy: true # will also install in PATH as `docker-compose` + 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 +57,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 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 053e65a9..534aba0d 100644 --- a/CONTRIBUTING.md +++ b/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 diff --git a/Makefile b/Makefile index 72e173f8..8c03eb48 100644 --- a/Makefile +++ b/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,7 +24,7 @@ test: php $(PHPARGS) vendor/bin/phpunit clean_all: - docker-compose down + docker compose down sudo rm -rf tests/tmp/* clean: @@ -32,38 +32,38 @@ clean: 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 diff --git a/docker-compose.yml b/docker-compose.yml index 2eda366e..2005d415 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3.5" +name: yii2-docker services: php: image: yii2-openapi-php:${PHP_VERSION:-8.3} From 98d57ac9a39e4c8e1ee1ff9bd2ee424fa6b8e040 Mon Sep 17 00:00:00 2001 From: Sohel Ahmed Mesaniya Date: Wed, 5 Mar 2025 14:09:35 +0530 Subject: [PATCH 2/2] Remove legacy Docker Compose from GitHub Action --- .github/workflows/test.yml | 3 --- Makefile | 2 +- docker-compose.yml | 1 - 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ff20d49f..462cb33e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -31,9 +31,6 @@ jobs: # Run every tests inside Docker container - name: Docker Compose Setup uses: ndeloof/install-compose-action@v0.0.1 - with: - # version: v3.5 # defaults to 'latest' - legacy: true # will also install in PATH as `docker compose` - name: Clean run: make clean_all diff --git a/Makefile b/Makefile index 8c03eb48..9a23ae35 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ test: php $(PHPARGS) vendor/bin/phpunit clean_all: - docker compose down + docker compose down --remove-orphans sudo rm -rf tests/tmp/* clean: diff --git a/docker-compose.yml b/docker-compose.yml index 2005d415..67d220d1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -73,4 +73,3 @@ networks: ipam: config: - subnet: 172.14.0.0/24 -