From ed90244f42d9b5ab66abfca935cdfd2326c097c9 Mon Sep 17 00:00:00 2001 From: Shin <2082119+shinsenter@users.noreply.github.com> Date: Fri, 16 Feb 2024 14:34:01 +0900 Subject: [PATCH] [5.x] Improve debug messages (#58) Some minor improvements to the content of debug messages and variable naming. --- .github/workflows/build-template.yml | 1 + .github/workflows/php-web-servers-images.yml | 7 +- CHANGELOG.md | 16 ++- README.md | 14 +-- build/config.sh | 3 + build/docker-squash | 2 +- src/php/base-os.md | 6 +- src/php/common/docker-php-entrypoint | 7 +- src/php/common/os-base.dockerfile | 7 +- .../common/rootfs/etc/cleanup.d/00-php-source | 2 +- .../rootfs/etc/cont-init.d/00-usergroup | 12 +- .../common/rootfs/etc/cont-init.d/10-optimize | 4 +- .../common/rootfs/etc/cont-init.d/10-project | 60 +++++----- .../common/rootfs/etc/cont-init.d/10-sendmail | 2 + .../common/rootfs/etc/cont-init.d/50-autorun | 2 + .../common/rootfs/etc/cont-init.d/50-crontabs | 4 +- .../rootfs/etc/cont-init.d/99-other-fixes | 4 +- .../common/rootfs/usr/local/bin/debug-echo | 27 +++++ src/php/common/rootfs/usr/local/bin/web-chown | 4 +- src/php/common/rootfs/usr/local/bin/web-cmd | 2 +- src/php/common/rootfs/usr/local/bin/web-debug | 2 - src/php/common/rootfs/usr/local/sbin/autorun | 4 +- src/php/common/rootfs/usr/local/sbin/cleanup | 4 +- src/php/common/rootfs/usr/local/sbin/mkcert | 4 +- src/php/common/rootfs/usr/local/sbin/pkg-add | 35 +++--- src/php/common/rootfs/usr/local/sbin/pkg-del | 29 ++--- src/php/common/shell-php/phpaddmod | 10 +- src/php/common/shell-php/phpdelmod | 2 +- src/php/common/shell-s6/s6-service | 2 +- src/php/with-apache.md | 6 +- .../rootfs/etc/cont-init.d/zz-start-apache | 3 +- .../rootfs/usr/local/sbin/a2dismod | 2 +- .../with-apache/rootfs/usr/local/sbin/a2enmod | 2 +- .../rootfs/usr/local/sbin/apache-mpm | 6 +- src/php/with-f8p.md | 6 +- .../rootfs/etc/cont-init.d/zz-start-f8p | 2 +- src/php/with-nginx.md | 6 +- .../rootfs/etc/cont-init.d/zz-start-nginx | 2 +- src/php/with-unit.md | 6 +- .../rootfs/etc/cont-init.d/zz-start-unit | 2 +- .../with-unit/rootfs/usr/local/bin/unit-conf | 10 +- src/webapps/cakephp4/README.md | 6 +- .../cakephp4/rootfs/startup/boot-cakephp4 | 4 +- src/webapps/codeigniter4/README.md | 6 +- .../rootfs/startup/boot-codeigniter4 | 4 +- src/webapps/crater/README.md | 6 +- src/webapps/drupal/README.md | 6 +- src/webapps/drupal/rootfs/startup/boot-drupal | 4 +- src/webapps/flarum/README.md | 6 +- src/webapps/flarum/rootfs/startup/boot-flarum | 4 +- src/webapps/fuelphp/README.md | 6 +- .../fuelphp/rootfs/startup/boot-fuelphp | 4 +- src/webapps/grav/README.md | 6 +- src/webapps/grav/rootfs/startup/boot-grav | 4 +- src/webapps/hyperf/README.md | 6 +- src/webapps/hyperf/rootfs/startup/boot-hyperf | 4 +- src/webapps/kirby/README.md | 6 +- src/webapps/kirby/rootfs/startup/boot-kirby | 4 +- src/webapps/laminas/README.md | 6 +- .../laminas/rootfs/startup/boot-laminas | 4 +- src/webapps/laravel/README.md | 6 +- .../laravel/rootfs/startup/boot-laravel | 4 +- src/webapps/mautic/README.md | 6 +- src/webapps/mautic/rootfs/startup/boot-mautic | 4 +- src/webapps/phpixie/README.md | 104 ++++++++++++++++++ src/webapps/phpixie/phpixie.dockerfile | 30 +++++ .../phpixie/rootfs/startup/boot-phpixie | 3 + src/webapps/phpmyadmin/README.md | 6 +- .../phpmyadmin/rootfs/startup/boot-phpmyadmin | 12 +- src/webapps/slim/README.md | 6 +- src/webapps/slim/rootfs/startup/boot-slim | 4 +- src/webapps/statamic/README.md | 6 +- src/webapps/symfony/README.md | 6 +- .../symfony/rootfs/startup/boot-symfony | 4 +- src/webapps/wordpress/README.md | 8 +- .../rootfs/etc/cont-init.d/10-create-project | 30 ++--- .../wordpress/rootfs/startup/boot-wordpress | 4 +- src/webapps/wordpress/wordpress.dockerfile | 1 - src/webapps/yii/README.md | 6 +- src/webapps/yii/rootfs/startup/boot-yii | 4 +- 80 files changed, 443 insertions(+), 238 deletions(-) create mode 100755 src/php/common/rootfs/usr/local/bin/debug-echo delete mode 100755 src/php/common/rootfs/usr/local/bin/web-debug create mode 100644 src/webapps/phpixie/README.md create mode 100644 src/webapps/phpixie/phpixie.dockerfile create mode 100755 src/webapps/phpixie/rootfs/startup/boot-phpixie diff --git a/.github/workflows/build-template.yml b/.github/workflows/build-template.yml index cdcf98fb..daba02d8 100644 --- a/.github/workflows/build-template.yml +++ b/.github/workflows/build-template.yml @@ -135,6 +135,7 @@ jobs: file: ${{ env.BUILD_DOCKERFILE }} context: ${{ env.BUILD_CONTEXT }} tags: ${{ env.BUILD_TMP_NAME }} + sbom: true build-args: | BUILD_CACHE_KEY=${{ env.BUILD_CACHE_KEY }} BUILD_CACHE_PATH=${{ env.BUILD_CACHE_PATH }} diff --git a/.github/workflows/php-web-servers-images.yml b/.github/workflows/php-web-servers-images.yml index 72e2dcfc..31ce34b8 100644 --- a/.github/workflows/php-web-servers-images.yml +++ b/.github/workflows/php-web-servers-images.yml @@ -144,8 +144,11 @@ jobs: - "app-cakephp4" - "app-codeigniter4" - "app-drupal" + - "app-fuelphp" + - "app-laminas" - "app-laravel" - "app-phpmyadmin" + - "app-slim" - "app-symfony" - "app-wordpress" php_version: @@ -175,13 +178,11 @@ jobs: app: - "app-crater" - "app-flarum" - - "app-fuelphp" - "app-grav" - "app-hyperf" - "app-kirby" - - "app-laminas" - "app-mautic" - - "app-slim" + - "app-phpixie" - "app-statamic" - "app-yii" php_version: diff --git a/CHANGELOG.md b/CHANGELOG.md index 68ee2a82..af32d9ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,11 +2,23 @@ All notable changes to this project will be documented in this file. +## [5.0.1] - 2024-02-16 + +We have made some minor improvements to the content of debug messages and variable naming. + ## [5.0.0] - 2024-02-15 -We are rolling out updated Docker images based on the [official PHP Docker images](https://hub.docker.com/_/php). We have taken steps to minimize the impact of this change on your existing setup. +We are thrilled to announce the rollout of updated Docker images (v5) built directly from the [official PHP Docker images](https://hub.docker.com/_/php) to ensure you get the most up-to-date packages and bug fixes! + +Check out the document and available tags on Docker Hub: +https://hub.docker.com/r/shinsenter/php +> The `-alpine` and `-tidy` tags are lightweight Alpine-based images to speed up your builds and save bandwidth. + +These images are updated daily to stay current with the latest PHP, OS, and tooling updates for maximum freshness. We also apply stable version tags on a separate repo for dependable production images: +https://hub.docker.com/r/shinsenter/php-archives/tags -We are using different Docker image tags to maintain the old Docker image versions. All old Docker images have been published with `*-deprecated` tag names. However, we will no longer provide any update for the old Docker images. https://hub.docker.com/r/shinsenter/php/tags?page=1&name=-deprecated +Old image versions (pre v5.x) now have `-deprecated` tags but will no longer receive updates. See them here: +https://hub.docker.com/r/shinsenter/php/tags?name=-deprecated