[5.x] Add Sulu CMS (#61)

.github/workflows/build-template.yml

@@ -104,6 +104,7 @@ jobs:
           build-args: |
             BUILD_CACHE_KEY=${{ env.BUILD_CACHE_KEY }}
             BUILD_CACHE_PATH=${{ env.BUILD_CACHE_PATH }}
+            BUILD_FROM_IMAGE=${{ env.BUILD_FROM_IMAGE }}
             BUILD_CONTEXT=${{ env.BUILD_CONTEXT }}
             BUILD_DATE=${{ env.BUILD_DATE }}
             BUILD_DESC=${{ env.BUILD_DESC }}
@@ -139,6 +140,7 @@ jobs:
           build-args: |
             BUILD_CACHE_KEY=${{ env.BUILD_CACHE_KEY }}
             BUILD_CACHE_PATH=${{ env.BUILD_CACHE_PATH }}
+            BUILD_FROM_IMAGE=${{ env.BUILD_FROM_IMAGE }}
             BUILD_CONTEXT=${{ env.BUILD_CONTEXT }}
             BUILD_DATE=${{ env.BUILD_DATE }}
             BUILD_DESC=${{ env.BUILD_DESC }}

.github/workflows/php-web-servers-images.yml

@@ -184,6 +184,7 @@ jobs:
           - "app-mautic"
           - "app-phpixie"
           - "app-statamic"
+          - "app-sulu"
           - "app-yii"
         php_version:
           - "8.3"

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file.
 
+## [5.0.3] - 2024-03-12
+
+Added Sulu containers, updated descriptions for DockerHub repositories.
+
 ## [5.0.2] - 2024-02-23
 
 Tightened Apache directory permissions to deny access to dotfiles and system directories. This also fixes #59.

README.md

@@ -179,7 +179,7 @@ RUN phpaddmod imagick swoole xdebug
 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 \
+docker run --rm -p 80:80 -p 443:443 -p 443:443/udp \
     -v "$PWD":/app \
     -e APP_PATH=/app \
     shinsenter/php:8.3-fpm-nginx
@@ -190,7 +190,7 @@ This would change the web application directory to `/app`.
 Moreover, the default document root (a relative path inside the application directory that contains your index.php file) can be customized by setting the `$DOCUMENT_ROOT` environment variable:
 
 ```shell
-docker run --rm -p 80:80 -p 443:443 \
+docker run --rm -p 80:80 -p 443:443 -p 443:443/udp \
     -v "$PWD":/app \
     -e APP_PATH=/app \
     -e DOCUMENT_ROOT=/public \
@@ -216,7 +216,7 @@ The available variables are:
 
 For example, to run a container as user `myapp` with uid `5000`, you could do:
 ```shell
-docker run --rm -p 80:80 -p 443:443 \
+docker run --rm -p 80:80 -p 443:443 -p 443:443/udp \
     -e APP_USER=myapp \
     -e APP_UID=5000 \
     shinsenter/php:8.3-fpm-nginx
@@ -269,11 +269,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)
-Web Root  : /var/www/html
+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
 ----------------------------------------
 
 PHP Docker Images (https://hub.docker.com/r/shinsenter/php)
@@ -286,11 +287,11 @@ but WITHOUT ANY WARRANTY. See the GNU GPL for more details.
 
 To get support, please contact: SHIN (@shinsenter)
 
-PHP 8.3.2 (cli) (built: Jan 27 2024 04:26:04) (NTS)
+PHP 8.3.3 (fpm-fcgi) (built: Feb 16 2024 23:20:45)
 Copyright (c) The PHP Group
-Zend Engine v4.3.2, Copyright (c) Zend Technologies
-    with Zend OPcache v8.3.2, Copyright (c), by Zend Technologies
-Composer version 2.6.6 2023-12-08 18:32:26
+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
 ```
 
 #### Disable autorun scripts

build/config.sh

@@ -120,7 +120,7 @@ with-unit)
     S6_VERSION="latest"
     BUILD_DOCKERFILE=$BASE_DIR/src/php/with-unit.dockerfile
     BUILD_SOURCE_IMAGE="https://codeload.github.com/nginx/unit/tar.gz/refs/tags/$unit_version"
-    BUILD_CACHE_KEY="unit@$unit_version"
+    BUILD_CACHE_KEY="unit@$(echo "$unit_version" | head -c17)"
     PHP_VARIANT="zts$SUFFIX"
     verlt "$PHP_VERSION" "7.4" && SKIP_BUILD=1
     ;;
@@ -138,12 +138,14 @@ with-f8p)
     BUILD_SOURCE_IMAGE="dunglas/frankenphp:$(get_dockerhub_latest_tag "dunglas/frankenphp" 1 "latest-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 "latest-php$PHP_VERSION$SUFFIX" | head -c17)"
     PHP_VARIANT="zts$SUFFIX"
     verlt "$PHP_VERSION" "8.2" && SKIP_BUILD=1
     ;;
 app-*)
     # implement later
     APP_NAME="${APP//app-/}"
+    BUILD_FROM_IMAGE="shinsenter/phpfpm-apache"
     BUILD_NAME="shinsenter/$APP_NAME"
     BUILD_DOCKERFILE=$BASE_DIR/src/webapps/$APP_NAME/$APP_NAME.dockerfile
     PHP_VARIANT="$SUFFIX"
@@ -161,6 +163,7 @@ app-*)
     crater)
         # https://docs.craterapp.com/installation.html
         LATEST_PHP="8.1"
+        BUILD_FROM_IMAGE="shinsenter/phpfpm-nginx"
         verlt "$PHP_VERSION" "7.4" && SKIP_BUILD=1
         ;;
     drupal)
@@ -169,6 +172,7 @@ app-*)
         ;;
     flarum)
         # https://docs.flarum.org/install/
+        BUILD_FROM_IMAGE="shinsenter/phpfpm-nginx"
         verlt "$PHP_VERSION" "7.3" && SKIP_BUILD=1
         ;;
     fuelphp)
@@ -183,6 +187,7 @@ app-*)
     hyperf)
         # https://hyperf.wiki/3.1/#/en/quick-start/install
         BUILD_PLATFORM="linux/amd64,linux/arm/v7,linux/arm64/v8"
+        BUILD_FROM_IMAGE="shinsenter/phpfpm-nginx"
         verlt "$PHP_VERSION" "7.2" && SKIP_BUILD=1
         if verlte "8.3" "$PHP_VERSION"; then
             BUILD_PLATFORM="linux/amd64,linux/arm64/v8"
@@ -194,10 +199,12 @@ app-*)
         ;;
     laminas)
         # https://docs.laminas.dev/tutorials/getting-started/skeleton-application/
+        BUILD_FROM_IMAGE="shinsenter/phpfpm-nginx"
         verlt "$PHP_VERSION" "7.3" && SKIP_BUILD=1
         ;;
     laravel)
         # https://laravel.com/docs/master/installation
+        BUILD_FROM_IMAGE="shinsenter/phpfpm-nginx"
         ;;
     mautic)
         # https://docs.mautic.org/en/5.x/getting_started/how_to_install_mautic.html#installing-with-composer
@@ -209,6 +216,7 @@ app-*)
         ;;
     phpmyadmin)
         # https://docs.phpmyadmin.net/en/latest/setup.html
+        BUILD_FROM_IMAGE="shinsenter/phpfpm-nginx"
         ;;
     slim)
         # https://www.slimframework.com/docs/v4/start/installation.html
@@ -220,14 +228,20 @@ app-*)
     symfony)
         # https://symfony.com/doc/current/setup.html
         ;;
+    sulu)
+        # https://github.com/sulu/skeleton
+        ;;
     wordpress)
         # https://wordpress.org/documentation/category/installation/
         ;;
     yii)
         # https://www.yiiframework.com/doc/guide/2.0/en/start-installation
         ;;
     esac
+
+    BUILD_CACHE_KEY="$BUILD_FROM_IMAGE@$(get_dockerhub_latest_sha "$BUILD_FROM_IMAGE" 1 "php$PHP_VERSION$PHP_VARIANT" | head -c17)"
     ;;
+
 *)
     # default
     BUILD_DOCKERFILE=$BASE_DIR/src/php/base-php.dockerfile

src/php/base-php.dockerfile

@@ -11,7 +11,7 @@ ARG  BUILD_FROM_IMAGE=${BUILD_FROM_IMAGE:-php}
 ARG  PHP_VERSION=${PHP_VERSION:-8.3}
 ARG  PHP_VARIANT=${PHP_VARIANT:-fpm-alpine}
 
-FROM php:${PHP_VERSION}-${PHP_VARIANT}
+FROM ${BUILD_FROM_IMAGE}:${PHP_VERSION}-${PHP_VARIANT}
 
 # set PHP variables
 ARG PHP_VERSION=${PHP_VERSION:-8.3}

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

@@ -12,11 +12,12 @@ if ! is-true $DISABLE_GREETING; then
 $([ -f $WELCOME_TXT ] && cat $WELCOME_TXT | sed "s#%PATH%#$WELCOME_TXT#g")
 
 ----------------------------------------
-Container : $NAME
-Distro    : $(source /etc/os-release && echo ${PRETTY_NAME:-Unknown})
-Timezone  : $(date +'%Z') (GMT$(date +'%z'))
-UID / GID : $APP_USER:$APP_GROUP ($(id -u $APP_USER):$(id -g $APP_USER))
-Web Root  : $(app-root)
+Container     : $NAME
+Distro        : $(source /etc/os-release && echo ${PRETTY_NAME:-Unknown})
+Timezone      : $(date +'%Z') (GMT$(date +'%z'))
+UID / GID     : $APP_USER:$APP_GROUP ($(id -u $APP_USER):$(id -g $APP_USER))
+App Root      : $(app-path)
+Document Root : $(app-root)
 ----------------------------------------
 
 $([ -f $LICENSE_TXT ] && cat $LICENSE_TXT | sed "s#%EMAIL%#$EMAIL#g" | sed "s#%YEAR%#$YEAR#g")

src/php/with-apache.dockerfile

@@ -7,6 +7,7 @@
 # License: https://code.shin.company/php/blob/main/LICENSE
 ################################################################################
 
+ARG  BUILD_FROM_IMAGE=${BUILD_FROM_IMAGE:-php}
 ARG  PHP_VERSION=${PHP_VERSION:-8.3}
 ARG  PHP_VARIANT=${PHP_VARIANT:-fpm-alpine}
 

src/php/with-apache.md

@@ -13,7 +13,7 @@ These images also include the latest version of [Composer](https://getcomposer.o
 ## Usage
 
 ```shell
-docker run --rm -p 80:80 -p 443:443 \
+docker run --rm -p 80:80 -p 443:443 -p 443:443/udp \
     -v ./myproject:/var/www/html \
     shinsenter/phpfpm-apache:latest
 ```
@@ -45,7 +45,7 @@ COPY my_site.key /etc/ssl/site/server.key
 #### Using docker run
 
 ```shell
-docker run --rm -p 80:80 -p 443:443 \
+docker run --rm -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.dockerfile

@@ -7,6 +7,7 @@
 # License: https://code.shin.company/php/blob/main/LICENSE
 ################################################################################
 
+ARG  BUILD_FROM_IMAGE=${BUILD_FROM_IMAGE:-php}
 ARG  PHP_VERSION=${PHP_VERSION:-8.3}
 ARG  PHP_VARIANT=${PHP_VARIANT:-zts}
 ARG  BUILD_SOURCE_IMAGE=${BUILD_SOURCE_IMAGE:-dunglas/frankenphp:latest-php${PHP_VERSION}}

src/php/with-f8p.md

@@ -13,7 +13,7 @@ These images also include the latest version of [Composer](https://getcomposer.o
 ## Usage
 
 ```shell
-docker run --rm -p 80:80 -p 443:443 \
+docker run --rm -p 80:80 -p 443:443 -p 443:443/udp \
     -v ./myproject:/var/www/html \
     shinsenter/frankenphp:latest
 ```
@@ -45,7 +45,7 @@ COPY my_site.key /etc/ssl/site/server.key
 #### Using docker run
 
 ```shell
-docker run --rm -p 80:80 -p 443:443 \
+docker run --rm -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-nginx.dockerfile

@@ -7,6 +7,7 @@
 # License: https://code.shin.company/php/blob/main/LICENSE
 ################################################################################
 
+ARG  BUILD_FROM_IMAGE=${BUILD_FROM_IMAGE:-php}
 ARG  PHP_VERSION=${PHP_VERSION:-8.3}
 ARG  PHP_VARIANT=${PHP_VARIANT:-fpm-alpine}
 

src/php/with-nginx.md

@@ -13,7 +13,7 @@ These images also include the latest version of [Composer](https://getcomposer.o
 ## Usage
 
 ```shell
-docker run --rm -p 80:80 -p 443:443 \
+docker run --rm -p 80:80 -p 443:443 -p 443:443/udp \
     -v ./myproject:/var/www/html \
     shinsenter/phpfpm-nginx:latest
 ```
@@ -45,7 +45,7 @@ COPY my_site.key /etc/ssl/site/server.key
 #### Using docker run
 
 ```shell
-docker run --rm -p 80:80 -p 443:443 \
+docker run --rm -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-unit.dockerfile

@@ -7,6 +7,7 @@
 # License: https://code.shin.company/php/blob/main/LICENSE
 ################################################################################
 
+ARG  BUILD_FROM_IMAGE=${BUILD_FROM_IMAGE:-php}
 ARG  PHP_VERSION=${PHP_VERSION:-8.3}
 ARG  PHP_VARIANT=${PHP_VARIANT:-zts}
 

src/php/with-unit.md

@@ -13,7 +13,7 @@ These images also include the latest version of [Composer](https://getcomposer.o
 ## Usage
 
 ```shell
-docker run --rm -p 80:80 -p 443:443 \
+docker run --rm -p 80:80 -p 443:443 -p 443:443/udp \
     -v ./myproject:/var/www/html \
     shinsenter/unit-php:latest
 ```
@@ -45,7 +45,7 @@ COPY my_site.key /etc/ssl/site/server.key
 #### Using docker run
 
 ```shell
-docker run --rm -p 80:80 -p 443:443 \
+docker run --rm -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/webapps/cakephp4/README.md

@@ -1,6 +1,6 @@
 # shinsenter/cakephp4
 
-🌏 (PHP) CakePHP docker containers for both production and development.
+🔋 (PHP / CakePHP) Production-ready container with automatic CakePHP installer.
 
 > Docker Hub: https://hub.docker.com/r/shinsenter/cakephp4
 
@@ -31,7 +31,7 @@ mkdir myproject
 When running the container, mount this empty directory as a volume. For example:
 
 ```shell
-docker run --rm -p 80:80 -p 443:443 \
+docker run --rm -p 80:80 -p 443:443 -p 443:443/udp \
     -v ./myproject:/var/www/html \
     shinsenter/cakephp4:latest
 ```
@@ -69,7 +69,7 @@ COPY my_site.key /etc/ssl/site/server.key
 #### Using docker run
 
 ```shell
-docker run --rm -p 80:80 -p 443:443 \
+docker run --rm -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/webapps/cakephp4/cakephp4.dockerfile

@@ -7,10 +7,11 @@
 # License: https://code.shin.company/php/blob/main/LICENSE
 ################################################################################
 
+ARG  BUILD_FROM_IMAGE=${BUILD_FROM_IMAGE:-shinsenter/phpfpm-apache}
 ARG  PHP_VERSION=${PHP_VERSION:-8.3}
 ARG  PHP_VARIANT=${PHP_VARIANT:-}
 
-FROM shinsenter/phpfpm-apache:php${PHP_VERSION}${PHP_VARIANT}
+FROM ${BUILD_FROM_IMAGE}:php${PHP_VERSION}${PHP_VARIANT}
 
 ################################################################################
 

src/webapps/codeigniter4/README.md

@@ -1,6 +1,6 @@
 # shinsenter/codeigniter4
 
-🌏 (PHP) CodeIgniter docker containers for both production and development.
+🔋 (PHP / CodeIgniter) Production-ready container with automatic CodeIgniter installer.
 
 > Docker Hub: https://hub.docker.com/r/shinsenter/codeigniter4
 
@@ -31,7 +31,7 @@ mkdir myproject
 When running the container, mount this empty directory as a volume. For example:
 
 ```shell
-docker run --rm -p 80:80 -p 443:443 \
+docker run --rm -p 80:80 -p 443:443 -p 443:443/udp \
     -v ./myproject:/var/www/html \
     shinsenter/codeigniter4:latest
 ```
@@ -69,7 +69,7 @@ COPY my_site.key /etc/ssl/site/server.key
 #### Using docker run
 
 ```shell
-docker run --rm -p 80:80 -p 443:443 \
+docker run --rm -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/webapps/codeigniter4/codeigniter4.dockerfile

@@ -7,10 +7,11 @@
 # License: https://code.shin.company/php/blob/main/LICENSE
 ################################################################################
 
+ARG  BUILD_FROM_IMAGE=${BUILD_FROM_IMAGE:-shinsenter/phpfpm-apache}
 ARG  PHP_VERSION=${PHP_VERSION:-8.3}
 ARG  PHP_VARIANT=${PHP_VARIANT:-}
 
-FROM shinsenter/phpfpm-apache:php${PHP_VERSION}${PHP_VARIANT}
+FROM ${BUILD_FROM_IMAGE}:php${PHP_VERSION}${PHP_VARIANT}
 
 ################################################################################