Fix README and FrankenPHP source tag

Author: shinsenter

README.md

@@ -54,32 +54,32 @@ You can simply copy and paste one of these `docker run` commands to run a contai
 
 ```shell
 # non-interactive
-docker run --rm shinsenter/php:8.3-cli php -m
+docker run shinsenter/php:8.3-cli php -m
 
 # interactive
-docker run -it --rm -v ./myproject:/var/www/html shinsenter/php:8.3-cli
+docker run -it -v ./myproject:/var/www/html shinsenter/php:8.3-cli
 ```
 
 #### PHP-FPM
 
 ```shell
-docker run --rm -v ./myproject:/var/www/html -p 9000:9000 shinsenter/php:8.3-fpm
+docker run -v ./myproject:/var/www/html -p 9000:9000 shinsenter/php:8.3-fpm
 ```
 
 #### PHP-FPM + Nginx (or Apache, FrankenPHP, Nginx Unit)
 
 ```shell
 # with Nginx
-docker run --rm -v ./myproject:/var/www/html -p 80:80 -p 443:443 shinsenter/php:8.3-fpm-nginx
+docker run -v ./myproject:/var/www/html -p 80:80 -p 443:443 shinsenter/php:8.3-fpm-nginx
 
 # with Apache
-docker run --rm -v ./myproject:/var/www/html -p 80:80 -p 443:443 shinsenter/php:8.3-fpm-apache
+docker run -v ./myproject:/var/www/html -p 80:80 -p 443:443 shinsenter/php:8.3-fpm-apache
 
 # with FrankenPHP
-docker run --rm -v ./myproject:/var/www/html -p 80:80 -p 443:443 shinsenter/php:8.3-frankenphp
+docker run -v ./myproject:/var/www/html -p 80:80 -p 443:443 shinsenter/php:8.3-frankenphp
 
 # with Nginx Unit
-docker run --rm -v ./myproject:/var/www/html -p 80:80 -p 443:443 shinsenter/php:8.3-unit-php
+docker run -v ./myproject:/var/www/html -p 80:80 -p 443:443 shinsenter/php:8.3-unit-php
 ```
 
 ## Customizing Settings via Environment Variables
@@ -102,7 +102,7 @@ This naming convention helps you easily identify which environment variable appl
 #### Command Line
 
 ```shell
-docker run --rm \
+docker run \
     -v ./myproject:/var/www/html \
     -e PHP_DISPLAY_ERRORS='1' \
     -e PHP_POST_MAX_SIZE='100M' \
@@ -162,7 +162,7 @@ zip
 
 > 👉🏻 Info: The pre-installed PHP extensions from the official Docker images are excluded from this list.
 
-> 💡 Hint: Run `docker run --rm shinsenter/php:8.3-cli php -m` in the container
+> 💡 Hint: Run `docker run shinsenter/php:8.3-cli php -m` in the container
 to get a list of extensions (you can replace `8.3` with a specific PHP version).
 
 ## Adding PHP Extensions
@@ -193,7 +193,7 @@ have a look at [the install-php-extensions project](https://github.com/mlocati/d
 The default application directory is `/var/www/html` and can be customized via the `$APP_PATH` environment variable:
 
 ```shell
-docker run --rm -p 80:80 -p 443:443 -p 443:443/udp \
+docker run -p 80:80 -p 443:443 -p 443:443/udp \
     -v "$PWD":/app \
     -e APP_PATH=/app \
     shinsenter/php:8.3-fpm-nginx
@@ -206,7 +206,7 @@ Moreover, the default document root
 can be customized by setting the `$DOCUMENT_ROOT` environment variable:
 
 ```shell
-docker run --rm -p 80:80 -p 443:443 -p 443:443/udp \
+docker run -p 80:80 -p 443:443 -p 443:443/udp \
     -v "$PWD":/app \
     -e APP_PATH=/app \
     -e DOCUMENT_ROOT=/public \
@@ -234,7 +234,7 @@ The available variables are:
 
 For example, to run a container as the user `myapp` with uid `5000`, you could do:
 ```shell
-docker run --rm -p 80:80 -p 443:443 -p 443:443/udp \
+docker run -p 80:80 -p 443:443 -p 443:443/udp \
     -e APP_USER=myapp \
     -e APP_UID=5000 \
     shinsenter/php:8.3-fpm-nginx
@@ -260,16 +260,19 @@ The autorun feature saves time by executing initialization scripts without manua
 
 #### Usage
 
-For example, a script called `00-copy-config` could be copied into `/startup/` via a Dockerfile.
+For example, a script called `00-migration` could be copied into `/startup/` via a Dockerfile.
 
 > Note: The script file must have executable permissions to run.
 
 ```Dockerfile
 FROM shinsenter/php:8.3-cli
 
-ADD ./application /var/www/html
-ADD ./autorun/00-copy-config /startup/00-copy-config
-RUN chmod +x /startup/00-copy-config
+ADD ./autorun/00-migration /startup/00-migration
+RUN chmod +x /startup/00-migration
+
+# You may add your constructions from here
+# For example:
+# ADD --chown=$APP_USER:$APP_GROUP ./myproject/ /var/www/html/
 ```
 
 > 👉🏻 Info: The startup directory already includes a script called `99-greeting` that prints a welcome message when the container starts:
@@ -289,12 +292,12 @@ DockerHub: https://docker.shin.company/php
 (To edit this welcome message, add your text to /etc/welcome.txt)
 
 ----------------------------------------
-Container      : shinsenter/php
-Distro         : Alpine Linux v3.19
-Timezone       : UTC (GMT+0000)
-UID / GID      : www-data:www-data (82:82)
-App Root       : /var/www/html
-Document Root  : /var/www/html/public
+Container     : shinsenter/php
+Distro        : Debian GNU/Linux 12 (bookworm)
+Timezone      : UTC (GMT+0000)
+UID / GID     : www-data:www-data (33:33)
+App Root      : /var/www/html
+Document Root : /var/www/html
 ----------------------------------------
 
 PHP Docker Images (https://hub.docker.com/r/shinsenter/php)
@@ -307,11 +310,11 @@ but WITHOUT ANY WARRANTY. See the GNU GPL for more details.
 
 To get support, please contact: SHIN (@shinsenter)
 
-PHP 8.3.3 (fpm-fcgi) (built: Feb 16 2024 23:20:45)
+PHP 8.3.9 (cli) (built: Jul  6 2024 00:42:01) (NTS)
 Copyright (c) The PHP Group
-Zend Engine v4.3.3, Copyright (c) Zend Technologies
-    with Zend OPcache v8.3.3, Copyright (c), by Zend Technologies
-Composer version 2.7.1 2024-02-09 15:26:28
+Zend Engine v4.3.9, Copyright (c) Zend Technologies
+    with Zend OPcache v8.3.9, Copyright (c), by Zend Technologies
+Composer version 2.7.7 2024-06-10 22:11:12
 ```
 
 #### Disable autorun scripts
@@ -320,7 +323,7 @@ To disable autorunning scripts, set the `DISABLE_AUTORUN_SCRIPTS` environment va
 
 For example, you can do this with `docker run`:
 ```shell
-docker run --rm -e DISABLE_AUTORUN_SCRIPTS=1 shinsenter/php:8.3-fpm-nginx
+docker run -e DISABLE_AUTORUN_SCRIPTS=1 shinsenter/php:8.3-fpm-nginx
 ```
 
 Or in a `docker-compose.yml`:
@@ -344,7 +347,7 @@ This works both with `docker run` and in `docker-compose.yml`.
 #### Command Line
 
 ```shell
-docker run --rm -e DEBUG=1 shinsenter/php:8.3-fpm-nginx
+docker run -e DEBUG=1 shinsenter/php:8.3-fpm-nginx
 ```
 
 #### docker-compose.yml

build/config.sh

@@ -141,7 +141,7 @@ with-f8p)
     PREFIX="frankenphp"
     BUILD_NAME="shinsenter/frankenphp"
     S6_VERSION="latest"
-    BUILD_SOURCE_IMAGE="dunglas/frankenphp:$(get_dockerhub_latest_tag "dunglas/frankenphp" 1 "1-php$PHP_VERSION$SUFFIX")"
+    BUILD_SOURCE_IMAGE="dunglas/frankenphp:1-php$PHP_VERSION$SUFFIX"
     BUILD_DOCKERFILE=$BASE_DIR/src/php/with-f8p.dockerfile
     BUILD_PLATFORM="linux/386,linux/amd64,linux/arm/v7,linux/arm64/v8"
     BUILD_CACHE_KEY="frankenphp@$(get_dockerhub_latest_sha "dunglas/frankenphp" 1 "1-php$PHP_VERSION$SUFFIX" | head -c17)"
@@ -191,7 +191,6 @@ app-*)
         ;;
     grav)
         # https://learn.getgrav.org/17/basics/installation
-        LATEST_PHP="8.1"
         verlt "$PHP_VERSION" "7.3" && SKIP_BUILD=1
         ;;
     hyperf)
@@ -219,7 +218,7 @@ app-*)
     mautic)
         # https://docs.mautic.org/en/5.x/getting_started/how_to_install_mautic.html#installing-with-composer
         LATEST_PHP="8.1"
-        verlt "$PHP_VERSION" "8.0" && SKIP_BUILD=1
+        verlt "$PHP_VERSION" "7.4" && SKIP_BUILD=1
         ;;
     phpixie)
         # https://phpixie.com/quickstart.html

src/php/base-os.md

@@ -29,34 +29,37 @@ Build the following Dockerfile and try it out:
 ```Dockerfile
 FROM shinsenter/ubuntu-s6:latest
 
-# Add your instructions here
-# E.g. ADD ./your-project/src/ /var/www/html/
+# You may add your constructions from here
+# For example:
+# ADD --chown=$APP_USER:$APP_GROUP ./myproject/ /var/www/html/
 ```
 
 #### Debian
 
 ```Dockerfile
 FROM shinsenter/debian-s6:latest
 
-# Add your instructions here
-# E.g. ADD ./your-project/src/ /var/www/html/
+# You may add your constructions from here
+# For example:
+# ADD --chown=$APP_USER:$APP_GROUP ./myproject/ /var/www/html/
 ```
 
 #### Alpine
 
 ```Dockerfile
 FROM shinsenter/alpine-s6:latest
 
-# Add your instructions here
-# E.g. ADD ./your-project/src/ /var/www/html/
+# You may add your constructions from here
+# For example:
+# ADD --chown=$APP_USER:$APP_GROUP ./myproject/ /var/www/html/
 ```
 
 ## Application Directory
 
 The default application directory is `/var/www/html` and can be customized via the `$APP_PATH` environment variable:
 
 ```shell
-docker run --rm -v "$PWD":/app \
+docker run -v "$PWD":/app \
     -e APP_PATH=/app \
     shinsenter/ubuntu-s6:latest
 ```
@@ -79,7 +82,7 @@ The available variables are:
 
 For example, to run a container as user `myapp` with uid `5000`, you could do:
 ```shell
-docker run --rm \
+docker run \
     -e APP_USER=myapp \
     -e APP_UID=5000 \
     shinsenter/ubuntu-s6:latest
@@ -103,15 +106,15 @@ This mechanism can be used to initialize projects before the main program on the
 
 #### Usage
 
-For example, a script called `00-copy-config` could be copied into `/startup/` via a Dockerfile.
+For example, a script called `00-migration` could be copied into `/startup/` via a Dockerfile.
 
 > Note: The script file must have executable permissions to run.
 
 ```Dockerfile
 FROM shinsenter/ubuntu-s6:latest
 
-ADD ./autorun/00-copy-config /startup/00-copy-config
-RUN chmod +x /startup/00-copy-config
+ADD ./autorun/00-migration /startup/00-migration
+RUN chmod +x /startup/00-migration
 ```
 
 > 👉🏻 Info: The startup directory already includes a script called `99-greeting` that prints a welcome message when container starts.
@@ -122,7 +125,7 @@ To disable autorunning scripts, set `DISABLE_AUTORUN_SCRIPTS=1` as an environmen
 
 For example, this can be done with docker run:
 ```shell
-docker run --rm -e DISABLE_AUTORUN_SCRIPTS=1 shinsenter/ubuntu-s6:latest bash
+docker run -e DISABLE_AUTORUN_SCRIPTS=1 shinsenter/ubuntu-s6:latest bash
 ```
 
 Or in a `docker-compose.yml`:
@@ -145,7 +148,7 @@ This works both with `docker run` and in `docker-compose.yml`.
 #### Command Line
 
 ```shell
-docker run --rm -e DEBUG=1 shinsenter/ubuntu-s6:latest bash
+docker run -e DEBUG=1 shinsenter/ubuntu-s6:latest bash
 ```
 
 #### docker-compose.yml

src/php/common/rootfs/startup/99-greeting

@@ -23,6 +23,6 @@ Document Root : $(app-root)
 $([ -f $LICENSE_TXT ] && cat $LICENSE_TXT | sed "s#%EMAIL%#$EMAIL#g" | sed "s#%YEAR%#$YEAR#g")
 
 $(if has-cmd php-fpm;  then php-fpm -v; elif has-cmd php; then php -v; fi)
-$(if has-cmd composer; then composer -V; fi)
+$(if has-cmd composer; then composer -V 2>&1 | head -n1; fi)
 "
 fi

src/php/with-apache.md

@@ -16,7 +16,7 @@ allowing you to get started with your projects faster without additional install
 ## Usage
 
 ```shell
-docker run --rm -p 80:80 -p 443:443 -p 443:443/udp \
+docker run -p 80:80 -p 443:443 -p 443:443/udp \
     -v ./myproject:/var/www/html \
     shinsenter/phpfpm-apache:latest
 ```
@@ -52,7 +52,7 @@ COPY my_site.key /etc/ssl/site/server.key
 #### Using docker run
 
 ```shell
-docker run --rm -p 80:80 -p 443:443 -p 443:443/udp \
+docker run -p 80:80 -p 443:443 -p 443:443/udp \
     -v ./myproject:/var/www/html \
     -v ./my_site.crt:/etc/ssl/site/server.crt \
     -v ./my_site.key:/etc/ssl/site/server.key \

src/php/with-apache/rootfs/etc/apache2/apache2.conf

@@ -182,6 +182,11 @@ Timeout 60
     Options -Indexes +FollowSymLinks +MultiViews
 </Directory>
 
+# enable CORS for web fonts
+<FilesMatch "\.(ttf|ttc|otf|eot|woff2?)$">
+    Header set Access-Control-Allow-Origin "*"
+</FilesMatch>
+
 # For any files that match PHP, pass it to PHP-FPM for processing
 <FilesMatch "\.php$">
     ProxyFCGIBackendType GENERIC

src/php/with-f8p.dockerfile

@@ -32,4 +32,6 @@ HEALTHCHECK CMD curl -sf http://localhost:2019/metrics || exit 1
 
 ################################################################################
 
+ARG   BUILD_SOURCE_IMAGE
+LABEL build_from="$BUILD_SOURCE_IMAGE"
 LABEL traefik.enable=true

src/php/with-f8p.md

@@ -16,7 +16,7 @@ allowing you to get started with your projects faster without additional install
 ## Usage
 
 ```shell
-docker run --rm -p 80:80 -p 443:443 -p 443:443/udp \
+docker run -p 80:80 -p 443:443 -p 443:443/udp \
     -v ./myproject:/var/www/html \
     shinsenter/frankenphp:latest
 ```
@@ -52,7 +52,7 @@ COPY my_site.key /etc/ssl/site/server.key
 #### Using docker run
 
 ```shell
-docker run --rm -p 80:80 -p 443:443 -p 443:443/udp \
+docker run -p 80:80 -p 443:443 -p 443:443/udp \
     -v ./myproject:/var/www/html \
     -v ./my_site.crt:/etc/ssl/site/server.crt \
     -v ./my_site.key:/etc/ssl/site/server.key \

src/php/with-f8p/f8p-config.dockerfile

@@ -25,9 +25,14 @@ env-default CADDY_GLOBAL_OPTIONS ''
 env-default CADDY_EXTRA_CONFIG ''
 env-default CADDY_SERVER_EXTRA_DIRECTIVES ''
 
+if [ -f /etc/caddy/Caddyfile ]; then
+    frankenphp fmt --overwrite /etc/caddy/Caddyfile
+fi
+
 # create s6 services
 if has-cmd s6-service; then
     s6-service frankenphp longrun '#!/usr/bin/env sh
+
 if [ -f /etc/caddy/envvars ]; then
     source /etc/caddy/envvars
 fi

src/php/with-f8p/f8p-install.dockerfile

@@ -17,17 +17,15 @@ echo 'Install FrankenPHP'
 
 set -e
 
-# phpaddmod sockets swoole
-
-if has-cmd frankenphp; then
-    ln -nsf "$(command -v frankenphp)" /usr/local/sbin/caddy
+if ! has-cmd frankenphp; then
+    exit 1
 fi
 
 if has-cmd setcap; then
-    setcap cap_net_bind_service=+ep /usr/local/bin/frankenphp
+    setcap cap_net_bind_service=+ep "$(command -v frankenphp)"
 fi
 
-if [ -x "$LEGACY_ENTRYPOINT" ]; then
-    sed -i 's|php|frankenphp run|g' "$LEGACY_ENTRYPOINT"
-fi
+ln -nsf "$(command -v frankenphp)" /usr/local/sbin/caddy
+
+frankenphp version
 EOF