From e4d57b5653d30994b8ba0c785537511820ab48a0 Mon Sep 17 00:00:00 2001 From: Wilmer Arambula Date: Wed, 3 Sep 2025 06:24:47 -0400 Subject: [PATCH 1/2] fix(build): Update Docker commands and badge links in `README.md` for accurate workflow status. --- .github/workflows/build.yml | 20 +++++++++++--------- CHANGELOG.md | 1 + README.md | 4 ++-- docker/php/php.ini | 2 ++ docker/supervisor/conf.d/queue.conf | 9 +++++++-- 5 files changed, 23 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1daca0c..dae971e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,20 +25,22 @@ jobs: - name: Checkout. uses: actions/checkout@v5 - - name: Install docker compose. + - name: Show docker version. run: | - sudo curl -L "https://github.com/docker/compose/releases/latest/download/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose - sudo chmod +x /usr/local/bin/docker-compose - docker-compose --version + docker version + docker compose version - name: Build and start containers. - run: docker-compose up -d --build + run: docker compose up -d --build - - name: Wait for container to be ready. + - name: Wait for readiness. run: | - echo "Waiting 30 seconds for container initialization..." - sleep 30 - docker logs yii2-apache + for i in {1..60}; do + if docker exec yii2-apache sh -lc "curl -ksS -o /dev/null -w '%{http_code}' https://localhost | grep -qE '200|302'"; then + echo "Service is ready"; exit 0; fi + sleep 2 + done + echo "Service not ready"; docker logs yii2-apache; exit 1 - name: Codeceptcion build. run: docker exec yii2-apache vendor/bin/codecept build diff --git a/CHANGELOG.md b/CHANGELOG.md index dc6150a..78c95af 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ - Bug #175: Update allowed IPs in configuration for development purposes in `configuration.md` (@terabytesoftw) - Bug #177: Add missing config path to ECS configuration in `ecs.php` (@terabytesoftw) - Bug #180: Update paths to ignore in GitHub Actions workflow for pull requests and pushes (@terabytesoftw) +- Bug #184: Update Docker commands and badge links in `README.md` for accurate workflow status (@terabytesoftw) ## 0.1.0 August 31, 2025 diff --git a/README.md b/README.md index fe8b741..cf0a259 100644 --- a/README.md +++ b/README.md @@ -15,10 +15,10 @@ Yii 22.0.x - + Codeception - + PHPStan

diff --git a/docker/php/php.ini b/docker/php/php.ini index 92fe1f7..aa22113 100644 --- a/docker/php/php.ini +++ b/docker/php/php.ini @@ -2,6 +2,8 @@ date.timezone = UTC display_errors = Off expose_php = Off +log_errors = On +error_log = /proc/self/fd/2 memory_limit = 512M post_max_size = 150M session.auto_start = Off diff --git a/docker/supervisor/conf.d/queue.conf b/docker/supervisor/conf.d/queue.conf index b8eba53..f6f2f60 100644 --- a/docker/supervisor/conf.d/queue.conf +++ b/docker/supervisor/conf.d/queue.conf @@ -2,8 +2,13 @@ process_name=%(program_name)s_%(process_num)02d command=/usr/local/bin/php /app/yii queue/listen --verbose=1 --color=0 autorestart=true -autostart=true -numprocs=4 +# Enable only after installing yiisoft/yii2-queue; flipped on via image build or entrypoint. +autostart=false +# Keep demo light; can be raised later. +numprocs=1 +stopasgroup=true +killasgroup=true +stopsignal=TERM stderr_logfile=/dev/stderr stderr_logfile_maxbytes=0 stdout_logfile=/dev/stdout From ad6afd11e7b6fa42c2f6c4f3edffcbc2a7a7839b Mon Sep 17 00:00:00 2001 From: Wilmer Arambula Date: Wed, 3 Sep 2025 06:36:38 -0400 Subject: [PATCH 2/2] Apply fixed review coderabbitai nitpick comments. --- .github/workflows/build.yml | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index dae971e..8ca0813 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -42,7 +42,7 @@ jobs: done echo "Service not ready"; docker logs yii2-apache; exit 1 - - name: Codeceptcion build. + - name: Codeception build. run: docker exec yii2-apache vendor/bin/codecept build - name: Run codeception tests. diff --git a/README.md b/README.md index cf0a259..ecb4a98 100644 --- a/README.md +++ b/README.md @@ -137,7 +137,7 @@ final class SiteController extends Controller ## Quality code [![Codecov](https://img.shields.io/codecov/c/github/yii2-extensions/app-basic.svg?branch=apache&style=for-the-badge&logo=codecov&logoColor=white&label=Coverage)](https://codecov.io/github/yii2-extensions/app-basic) -[![PHPStan Level Max](https://img.shields.io/badge/PHPStan-Level%20Max-4F5D95.svg?style=for-the-badge&logo=php&logoColor=white)](https://github.com/yii2-extensions/app-basic/actions/workflows/static.yml) +[![PHPStan Level Max](https://img.shields.io/badge/PHPStan-Level%20Max-4F5D95.svg?style=for-the-badge&logo=php&logoColor=white)](https://github.com/yii2-extensions/app-basic/actions/workflows/static.yml?query=branch%3Aapache) [![StyleCI](https://img.shields.io/badge/StyleCI-Passed-44CC11.svg?style=for-the-badge&logo=styleci&logoColor=white)](https://github.styleci.io/repos/165419144?branch=apache) ## Documentation