For 4.1.0

.github/workflows/build-v2.yml

@@ -204,9 +204,8 @@ jobs:
           - 20.04
           - 22.04
         s6_version:
-          - v3.1.2.0
-          - v3.1.2.1
           - v3.1.3.0
+          - v3.1.4.0
     env:
       DOCKER_BUILDKIT: "1"
     steps:

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+
+## 4.1.0 - 2023-02-20
+
+Use [S6 Overlay v3.1.4.0](https://github.com/just-containers/s6-overlay/releases/tag/v3.1.4.0).
+
+
 ## 4.0.0 - 2023-02-09
 
 Use the default `www-data` user and group for web server.

OS_VERSIONS

@@ -1,2 +1,2 @@
-22.04
-20.04
+20.04
+22.04

S6_VERSIONS

@@ -1,3 +1,2 @@
-v3.1.2.0
-v3.1.2.1
-v3.1.3.0
+v3.1.3.0
+v3.1.4.0

src/base-ubuntu/root/etc/services.d/900-crontab/run

@@ -5,7 +5,7 @@ if [ "$ENABLE_CRONTAB" == "true" ]; then
         chown -R root:root /etc/cron.d
         find /etc/cron.d -type f | xargs -I {} sed -i "s/webuser/${WEBUSER}/g" {}
         find /etc/cron.d -type f | xargs -I {} chmod 0644 {}
-        bash -c 'sleep 5;find /etc/cron.d -type f 2>/dev/null | xargs -I {} touch {} 2>/dev/null' &
+        bash -c 'sleep 5; find /etc/cron.d -type f | xargs -I {} touch {} 2>/dev/null' &
     fi
     echo "⚙️ Starting crontab..."
     MAILTO="" exec cron -flnL15

src/servers/fpm-apache/Dockerfile

@@ -68,6 +68,9 @@ ENV APACHE_START_SERVERS=2
 ENV APACHE_THREAD_LIMIT=64
 ENV APACHE_THREADS_PER_CHILD=25
 
+# automatically create index.php
+ENV AUTO_CREATE_INDEX_FILE="false"
+
 ################################################################################
 
 LABEL traefik.enable=true

src/servers/fpm-apache/README.md

@@ -191,6 +191,9 @@ ENV APACHE_THREAD_LIMIT="64"
 # This directive sets the number of threads created by each child process
 ENV APACHE_THREADS_PER_CHILD="25"
 
+# Automatically create index.php
+ENV AUTO_CREATE_INDEX_FILE="true"
+
 # ==========================================================
 
 # You can easily change PHP-FPM configurations

src/servers/fpm-apache/root/etc/apache2/sites-available/000-default.conf

@@ -11,7 +11,7 @@
         AllowOverride All
         Require all granted
         Options -Indexes +FollowSymLinks +MultiViews
-        DirectoryIndex index.php index.html index.htm
+        DirectoryIndex index.html index.htm index.php
     </Directory>
 
     # Set the Timeout
@@ -58,7 +58,7 @@
         AllowOverride All
         Require all granted
         Options -Indexes +FollowSymLinks +MultiViews
-        DirectoryIndex index.php index.html index.htm
+        DirectoryIndex index.html index.htm index.php
     </Directory>
 
     # Set the Timeout

src/servers/fpm-apache/root/etc/cont-init.d/900-apache2

@@ -2,9 +2,9 @@
 WEBROOT="$(webhome)${APACHE_DOCUMENT_ROOT}"
 
 wmd $WEBROOT
-if [ ! -z "$(ls -1 /web/ | grep 'index\.\(ht?ml\|php\)')" ] && [ -z "$(ls -1 $WEBROOT/ | grep 'index\.\(ht?ml\|php\)')" ]; then
+if [ "$AUTO_CREATE_INDEX_FILE" == "true" ] && [ -d /web/ ]; then
     echo; echo "📄 Copying temporary index page to ${WEBROOT}"
-    wdo cp -rf /web/index.* $WEBROOT/
+    wdo cp -r /web/* $WEBROOT/
 fi
 
 if [ ! -d /var/log/apache2 ]; then

src/servers/fpm-nginx/Dockerfile

@@ -49,6 +49,9 @@ ENTRYPOINT ["/init"]
 # sets env variables
 ENV NGINX_DOCUMENT_ROOT=""
 
+# automatically create index.php
+ENV AUTO_CREATE_INDEX_FILE="false"
+
 ################################################################################
 
 LABEL traefik.enable=true

src/servers/fpm-nginx/README.md

@@ -166,6 +166,9 @@ ENV NGINX_DOCUMENT_ROOT=""
 # Set to "true" to fix permission for whole $WEBHOME
 ENV FIX_WEBHOME_PERMISSION="false"
 
+# Automatically create index.php
+ENV AUTO_CREATE_INDEX_FILE="true"
+
 # ==========================================================
 
 # You can easily change PHP-FPM configurations

src/servers/fpm-nginx/root/etc/cont-init.d/900-nginx

@@ -23,9 +23,9 @@ find /etc/nginx/sites-available -type f | \
     xargs -I {} sed -i "s#root \/var\/www\/html;#root ${WEBROOT};#g" {}
 
 wmd $WEBROOT
-if [ ! -z "$(ls -1 /web/ | grep 'index\.\(ht?ml\|php\)')" ] && [ -z "$(ls -1 $WEBROOT/ | grep 'index\.\(ht?ml\|php\)')" ]; then
+if [ "$AUTO_CREATE_INDEX_FILE" == "true" ] && [ -d /web/ ]; then
     echo; echo "📄 Copying temporary index page to ${WEBROOT}"
-    wdo cp -rf /web/index.* $WEBROOT/
+    wdo cp -r /web/* $WEBROOT/
 fi
 
 if [ ! -d /var/log/nginx ]; then

src/webapps/cakephp4/root/startup/add-cakephp4

@@ -4,7 +4,7 @@ CAKE4_ROOT="$(webhome)"
 CAKE4_CHECK="$CAKE4_ROOT/bin/cake"
 
 if [ ! -f "$CAKE4_CHECK" ]; then
-    wait-for-fpm &>/dev/null
+    wait-for-server &>/dev/null
     echo; echo "🤖 Installing $CAKE4_PROJECT from scratch"
     rm -rf $CAKE4_ROOT/webroot $CAKE4_ROOT/index.*
 

src/webapps/codeigniter4/root/startup/add-codeigniter4

@@ -4,7 +4,7 @@ CI4_ROOT="$(webhome)"
 CI4_CHECK="$CI4_ROOT/${COMPOSER_VENDOR_DIR:-vendor}/codeigniter4"
 
 if [ ! -d "$CI4_CHECK" ]; then
-    wait-for-fpm &>/dev/null
+    wait-for-server &>/dev/null
     echo; echo "🤖 Installing $CI4_PROJECT from scratch"
     rm -rf $CI4_ROOT/public $CI4_ROOT/index.*
 

src/webapps/crater/root/startup/add-crater

@@ -4,7 +4,7 @@ CRATER_ROOT="$(webhome)"
 CRATER_ARTISAN="$CRATER_ROOT/artisan"
 
 if [ ! -f "$CRATER_ARTISAN" ]; then
-    wait-for-fpm &>/dev/null
+    wait-for-server &>/dev/null
     echo; echo "🤖 Installing $CRATER_PROJECT from scratch"
     rm -rf $CRATER_ROOT/public $CRATER_ROOT/index.*
 
@@ -44,6 +44,6 @@ if [ -f "$CRATER_ARTISAN" ]; then
     fi
 
     if [ "$CRATER_AUTO_MIGRATION" == "true" ]; then
-        las migrate:refresh --seed --force
+        las migrate:refresh --seed --force --isolated
     fi
 fi

src/webapps/flarum/root/startup/add-flarum

@@ -4,7 +4,7 @@ FLARUM_ROOT="$(webhome)"
 FLARUM_CHECK="$FLARUM_ROOT/flarum"
 
 if [ ! -f "$FLARUM_CHECK" ]; then
-    wait-for-fpm &>/dev/null
+    wait-for-server &>/dev/null
     echo; echo "🤖 Installing $FLARUM_PROJECT from scratch"
     rm -rf $FLARUM_ROOT/public $FLARUM_ROOT/index.*
 

src/webapps/fuelphp/root/startup/add-fuelphp

@@ -4,7 +4,7 @@ FUEL_ROOT="$(webhome)"
 FUEL_CHECK="$FUEL_ROOT/fuel/app"
 
 if [ ! -d "$FUEL_CHECK" ]; then
-    wait-for-fpm &>/dev/null
+    wait-for-server &>/dev/null
     echo; echo "🤖 Installing $FUEL_PROJECT from scratch"
     rm -rf $FUEL_ROOT/public $FUEL_ROOT/index.*
 

src/webapps/grav/root/startup/add-grav

@@ -4,7 +4,7 @@ GRAV_ROOT="$(webhome)"
 GRAV_CHECK="$GRAV_ROOT/bin/grav"
 
 if [ ! -f "$GRAV_CHECK" ]; then
-    wait-for-fpm &>/dev/null
+    wait-for-server &>/dev/null
     echo; echo "🤖 Installing $GRAV_PROJECT from scratch"
     [ -x "$(command -v git)" ] || apt-oneshot git
     rm -rf $GRAV_ROOT/web $GRAV_ROOT/index.*

src/webapps/hyperf/root/startup/add-hyperf

@@ -4,7 +4,7 @@ HYPERF_ROOT="$(webhome)"
 HYPERF_BIN="$HYPERF_ROOT/bin/hyperf.php"
 
 if [ ! -f "$HYPERF_BIN" ]; then
-    wait-for-fpm &>/dev/null
+    wait-for-server &>/dev/null
     echo; echo "🤖 Installing $HYPERF_PROJECT from scratch"
     rm -rf $HYPERF_ROOT/public $HYPERF_ROOT/index.*
 

src/webapps/kirby/root/startup/add-kirby

@@ -4,7 +4,7 @@ KIRBY_ROOT="$(webhome)"
 KIRBY_CHECK="$KIRBY_ROOT/kirby"
 
 if [ ! -d "$KIRBY_CHECK" ]; then
-    wait-for-fpm &>/dev/null
+    wait-for-server &>/dev/null
     echo; echo "🤖 Installing $KIRBY_PROJECT from scratch"
     rm -rf $KIRBY_ROOT/web $KIRBY_ROOT/index.*
 

src/webapps/laminas/root/startup/add-laminas

@@ -4,7 +4,7 @@ ZEND_ROOT="$(webhome)"
 ZEND_CHECK="$ZEND_ROOT/module/Application"
 
 if [ ! -d "$ZEND_CHECK" ]; then
-    wait-for-fpm &>/dev/null
+    wait-for-server &>/dev/null
     echo; echo "🤖 Installing $ZEND_PROJECT from scratch"
     rm -rf $ZEND_ROOT/public $ZEND_ROOT/index.*
 

src/webapps/laravel/root/startup/add-laravel

@@ -4,7 +4,7 @@ LARAVEL_ROOT="$(webhome)"
 LARAVEL_ARTISAN="$LARAVEL_ROOT/artisan"
 
 if [ ! -f "$LARAVEL_ARTISAN" ]; then
-    wait-for-fpm &>/dev/null
+    wait-for-server &>/dev/null
     echo; echo "🤖 Installing $LARAVEL_PROJECT from scratch"
     rm -rf $LARAVEL_ROOT/public $LARAVEL_ROOT/index.*
 
@@ -36,6 +36,6 @@ if [ -f "$LARAVEL_ARTISAN" ]; then
     fi
 
     if [ "$LARAVEL_AUTO_MIGRATION" == "true" ]; then
-        las migrate:refresh --seed --force
+        las migrate:refresh --seed --force --isolated
     fi
 fi

src/webapps/mautic/root/startup/add-mautic

@@ -4,7 +4,7 @@ MAUTIC_ROOT="$(webhome)"
 MAUTIC_CONSOLE="$MAUTIC_ROOT/bin/console"
 
 if [ ! -f "$MAUTIC_CONSOLE" ]; then
-    wait-for-fpm &>/dev/null
+    wait-for-server &>/dev/null
     echo; echo "🤖 Installing $MAUTIC_PROJECT from scratch"
     [ -x "$(command -v git)" ] || apt-oneshot git
     rm -rf $MAUTIC_ROOT/docroot $MAUTIC_ROOT/index.*

src/webapps/phpmyadmin/root/startup/add-phpmyadmin

@@ -4,7 +4,7 @@ PMA_ROOT="$(webhome)"
 PMA_CONFIG="$PMA_ROOT/config.inc.php"
 
 if [ ! -f "$PMA_CONFIG" ]; then
-    wait-for-fpm &>/dev/null
+    wait-for-server &>/dev/null
     echo; echo "🤖 Installing $PMA_PROJECT from scratch"
     rm -rf $PMA_ROOT/index.*
 

src/webapps/slim/root/startup/add-slim

@@ -4,7 +4,7 @@ SLIM_ROOT="$(webhome)"
 SLIM_CHECK="$SLIM_ROOT/src/Application"
 
 if [ ! -d "$SLIM_CHECK" ]; then
-    wait-for-fpm &>/dev/null
+    wait-for-server &>/dev/null
     echo; echo "🤖 Installing $SLIM_PROJECT from scratch"
     rm -rf $SLIM_ROOT/public $SLIM_ROOT/index.*
 

src/webapps/statamic/root/startup/add-statamic

@@ -5,7 +5,7 @@ STATAMIC_BINARY="$STATAMIC_ROOT/please"
 STATAMIC_ARTISAN="$STATAMIC_ROOT/artisan"
 
 if [ ! -f "$STATAMIC_BINARY" ]; then
-    wait-for-fpm &>/dev/null
+    wait-for-server &>/dev/null
     echo; echo "🤖 Installing $STATAMIC_PROJECT from scratch"
     rm -rf $STATAMIC_ROOT/public $STATAMIC_ROOT/index.*
 
@@ -38,6 +38,6 @@ if [ -f "$STATAMIC_ARTISAN" ]; then
     fi
 
     if [ "$STATAMIC_AUTO_MIGRATION" == "true" ]; then
-        las migrate:refresh --seed --force
+        las migrate:refresh --seed --force --isolated
     fi
 fi

src/webapps/symfony/root/startup/add-symfony

@@ -5,7 +5,7 @@ SYMFONY_CONSOLE="$SYMFONY_ROOT/bin/console"
 SYMFONY_DEVKIT="$SYMFONY_ROOT/${COMPOSER_VENDOR_DIR:-vendor}/symfony/debug-bundle"
 
 if [ ! -f "$SYMFONY_CONSOLE" ]; then
-    wait-for-fpm &>/dev/null
+    wait-for-server &>/dev/null
     echo; echo "🤖 Installing $SYMFONY_PROJECT from scratch"
     rm -rf $SYMFONY_ROOT/public $SYMFONY_ROOT/index.*
 

src/webapps/wordpress/root/startup/add-wordpress

@@ -3,7 +3,7 @@ WORDPRESS_ROOT="$(webhome)"
 WORDPRESS_CHECK="$WORDPRESS_ROOT/wp-content"
 
 if [ ! -d "$WORDPRESS_CHECK" ]; then
-    wait-for-fpm &>/dev/null
+    wait-for-server &>/dev/null
     echo; echo "🤖 Installing Wordpress from scratch"
     rm -rf $WORDPRESS_ROOT/index.*
 

src/webapps/yii/root/startup/add-yii

@@ -4,7 +4,7 @@ YII_ROOT="$(webhome)"
 YII_CHECK="$YII_ROOT/yii"
 
 if [ ! -f "$YII_CHECK" ]; then
-    wait-for-fpm &>/dev/null
+    wait-for-server &>/dev/null
     echo; echo "🤖 Installing $YII_PROJECT from scratch"
     rm -rf $YII_ROOT/web $YII_ROOT/index.*
 

tests/common.yml

@@ -45,6 +45,7 @@ services:
         - IMAGE_SUFFIX=
         - PHP_VERSION=${PHP_VERSION:-8.2}
     environment:
+      - AUTO_CREATE_INDEX_FILE=false
       - PHP_DEFAULT_CHARSET=UTF-8
       - PHPFPM_SOCK_PATH=/var/run/php/run.sock
 

tests/docker-compose.webapps.yml

@@ -31,6 +31,8 @@ services:
       - ./data/phpinfo:/opt/www
     ports:
       - 9100:80
+    environment:
+      - AUTO_CREATE_INDEX_FILE=true
 
   ##############################################################################