Merge branch 'release/3.2.0'

Author: mblaschke

README.md

@@ -1,5 +1,8 @@
 # Dockerized PHP web project boilerplate
 
+![latest v3.0.0](https://img.shields.io/badge/latest-v3.0.0-green.svg?style=flat)
+![License MIT](https://img.shields.io/badge/license-MIT-blue.svg?style=flat)
+
 This is a boilerplate utilizing Docker based with support
 for **TYPO3_CONTEXT** and **FLOW_CONTEXT** for TYPO3, FLOW, NEOS.
 It also supports Symfony and any other PHP base project.
@@ -35,6 +38,8 @@ Use can use my [Vagrant Development VM](https://github.com/mblaschke/vagrant-dev
 If you want to run a Docker VM make sure you're using VMware or Parallels Desktop because of
 the much faster virtualisation (networking, disk access, shared folders) compared to VirtualBox.
 
+For more convenience use [CliTools.phar](https://github.com/mblaschke/vagrant-clitools) (will also run on native Linux, not only Vagrant)
+
 ## Docker short introduction
 
 Create and start containers (eg. first start):
@@ -185,6 +190,8 @@ Port          | 11211
 Environment           | Description
 --------------------- | -------------
 DOCUMENT_ROOT         | Document root for Nginx and Apache HTTPD, can be absolute or relative (to /docker inside the container).
+DOCUMENT_INDEX        | Default document index file for Nginx and Apache HTTPd
+CLI_SCRIPT            | Target for "cli" command of main container
 <br>                  |
 TYPO3_CONTEXT         | Context for TYPO3, can be used for TypoScript conditions and AdditionalConfiguration
 FLOW_CONTEXT          | Context for FLOW and NEOS
@@ -196,6 +203,10 @@ MYSQL_ROOT_PASSWORD   | Password for MySQL user "root"
 MYSQL_USER            | Initial created MySQL user
 MYSQL_PASSWORD        | Password for initial MySQL user
 MYSQL_DATABASE        | Initial created MySQL database
+<br>                  |
+PHP_TIMEZONE          | Timezone (date.timezone) setting for PHP (cli and fpm)
+PHP_UID               | Effective UID for www-data (cli and fpm)
+PHP_GID               | Effective GID for www-data (cli and fpm)
 
 ### Xdebug Remote debugger (PhpStorm)
 

docker-env.yml

@@ -1,18 +1,36 @@
+# Settings: TYPO3 CMS
 DOCUMENT_ROOT=code/
 DOCUMENT_INDEX=index.php
+CLI_SCRIPT=php typo3/cli_dispatch.phpsh
 
+# Settings: NEOS or FLOW
+#DOCUMENT_ROOT=code/Web/
+#DOCUMENT_INDEX=index.php
+#CLI_SCRIPT=php flow
+
+# Settings: SYMFONY FRAMEWORK
+#DOCUMENT_ROOT=code/web/
+#DOCUMENT_INDEX=app_dev.php
+#CLI_SCRIPT=php app/console
+
+# Contexts environment
 TYPO3_CONTEXT=Development/Docker
 FLOW_CONTEXT=Development/Docker
 FLOW_REWRITEURLS=1
+SYMFONY_ENV=dev
+SYMFONY_DEBUG=0
 
+# Service settings
 MAIL_GATEWAY=192.168.56.2
 DNS_DOMAIN=vm vm.dev
 
+# MySQL settings
 MYSQL_ROOT_PASSWORD=dev
 MYSQL_USER=dev
 MYSQL_PASSWORD=dev
 MYSQL_DATABASE=typo3
 
+# PHP Settings
 PHP_TIMEZONE=UTC
 PHP_UID=1000
 PHP_GID=1000

docker/main/bin/dnsmasq.sh

@@ -41,7 +41,7 @@ function dnsmasq_start() {
     echo "nameserver 127.0.0.1" > /etc/resolv.conf
 
     ## wait for 10 hours
-    sleep 36000
+    sleep 10h
 }
 
 ## Fetch IP from services

docker/main/bin/init-system.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 
 ## Set uid/gid for www-data user
-usermod  --uid "${PHP_UID}" --shell /bin/bash --home /home www-data
-groupmod --gid "${PHP_GID}" www-data
+usermod  --uid "${PHP_UID}" --shell /bin/bash --home /home www-data > /dev/null
+groupmod --gid "${PHP_GID}" www-data > /dev/null

docker/main/entrypoint.sh

@@ -44,6 +44,17 @@ case "$1" in
         fi
         ;;
 
+    ## Defined cli script
+    cli)
+        if [ -n "${CLI_SCRIPT}" ]; then
+            shift
+            exec ${CLI_SCRIPT} "$@"
+        else
+            echo "[ERROR] No CLI_SCRIPT in docker-env.yml defined"
+            exit 1
+        fi
+        ;;
+
     ## All other commands
     *)
         ## Set home dir (workaround)

docker/storage/Dockerfile

@@ -9,4 +9,4 @@ RUN chmod -R 777 /data
 VOLUME "/data"
 
 ENTRYPOINT ["/entrypoint.sh"]
-CMD ["none"]
+CMD ["noop"]

docker/storage/entrypoint.sh

@@ -19,8 +19,8 @@ find /data/dns/ -type f -exec rm -rf {} \;
 ## COMMAND
 #############################
 
-if [ "$1" = 'none' ]; then
-    exit 0
+if [ "$1" = 'noop' ]; then
+    exec sleep 10000d
 fi
 
 exec "$@"