Merge branch 'release/2.0.0'

Author: mblaschke

Makefile

@@ -1,7 +1,3 @@
-BACKUP_DIR = backup
-MYSQL_BACKUP_FILE = database.sql.bz2
-SOLR_BACKUP_FILE = solr.tar.bz2
-
 all: deploy
 
 #############################
@@ -19,27 +15,23 @@ create-neos-project:
 #############################
 
 mysql-backup:
-	test -d "$(BACKUP_DIR)" && { docker-compose run --rm typo3 mysqldump --opt --all-databases | bzip2 > "$(BACKUP_DIR)/$(MYSQL_BACKUP_FILE)"; }
+	docker-compose run --rm --no-deps main bash /docker/bin/backup.sh mysql
 
 mysql-restore:
-	test -s "$(BACKUP_DIR)/$(MYSQL_BACKUP_FILE)" && { bzcat "$(BACKUP_DIR)/$(MYSQL_BACKUP_FILE)" | docker-compose run --rm typo3 mysql; }
+	docker-compose run --rm --no-deps main bash /docker/bin/restore.sh mysql
 
 #############################
 # Solr
 #############################
 
 solr-backup:
-	test -d "$(BACKUP_DIR)"
 	docker-compose stop solr
-	rm -f "$(BACKUP_DIR)/$(SOLR_BACKUP_FILE)"
-	docker-compose run --rm --no-deps typo3 tar jcf "/var/www/$(BACKUP_DIR)/$(SOLR_BACKUP_FILE)" /data/solr/
+	docker-compose run --rm --no-deps main bash /docker/bin/backup.sh solr
 	docker-compose start solr
 
 solr-restore:
-	test -s "$(BACKUP_DIR)/$(SOLR_BACKUP_FILE)"
 	docker-compose stop solr
-	docker-compose run --rm --no-deps typo3 'rm -rf /data/solr/* && mkdir -p /data/solr/'
-	docker-compose run --rm --no-deps typo3 tar jxf "/var/www/$(BACKUP_DIR)/$(SOLR_BACKUP_FILE)" -C /
+	docker-compose run --rm --no-deps main bash /docker/bin/restore.sh solr
 	docker-compose start solr
 
 #############################
@@ -55,9 +47,12 @@ deploy:
 clean:
 	test -d htdocs/typo3temp && { rm -rf htdocs/typo3temp/*; }
 
+bash:
+	docker-compose run --rm main bash
+
 #############################
 # TYPO3
 #############################
 
 scheduler:
-	docker-compose run --rm typo3 typo3/cli_dispatch.phpsh scheduler
+	docker-compose run --rm main typo3/cli_dispatch.phpsh scheduler

README-NEOS.md

@@ -23,8 +23,8 @@ most of the time there is no need to enter any Docker container.
 
 You can run one-shot command inside the `TYPO3` service container:
 
-    $ docker-compose run --rm typo3 flow core:setfilepermissions
+    $ docker-compose run --rm code flow core:setfilepermissions
 
-    $ docker-compose run --rm typo3 bash
+    $ docker-compose run --rm code bash
 
 Webserver is available at Port 8000

README-TYPO3.md

@@ -23,9 +23,9 @@ most of the time there is no need to enter any Docker container.
 
 You can run one-shot command inside the `TYPO3` service container:
 
-    $ docker-compose run --rm typo3 typo3/cli_dispatch.phpsh scheduler
+    $ docker-compose run --rm code typo3/cli_dispatch.phpsh scheduler
 
-    $ docker-compose run --rm typo3 bash
+    $ docker-compose run --rm code bash
 
 Webserver is available at Port 8000
 

README.md

@@ -10,8 +10,8 @@ Supports:
 - MySQL, MariaDB or PerconaDB
 - Solr
 - Elasticsearch (disabled, without configuration)
-- Redis (disabeld)
-- Memcached (disabeld)
+- Redis (disabled)
+- Memcached (disabled)
 - maybe more later...
 
 This Docker boilerplate based on the best practises and don't use too much magic.
@@ -34,6 +34,34 @@ 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.
 
+## Docker short introduction
+
+Create and start containers (eg. first start):
+
+    $ docker-compose up -d
+
+Stop containers
+
+    $ docker-compose stop
+
+Start containers (only stopped containers)
+
+    $ docker-compose start
+
+Build (but not create and start) containers
+
+    $ docker-compose build --no-cache
+
+Delete container content
+
+    $ docker-compose rm --force
+
+Recreate containers (if there is any issue or just to start from a clean build)
+
+    $ docker-compose stop
+    $ docker-compose rm --force
+    $ docker-compose build --no-cache
+    $ docker-compose up -d
 
 ## Create new project
 
@@ -51,6 +79,21 @@ For an existing project just put your files into htdocs/ folder or use git to cl
 
 ## Informations
 
+### Docker layout
+
+Container                 | Description
+------------------------- | -------------------------------
+main                      | Main container with PHP-FPM and tools (your entrypoint for bash, php and other stuff)
+storage                   | Storage container, eg. for Solr data
+nginx                     | Nginx webserver
+httpd (optional)          | Apache HTTPD webserver
+mysql                     | MySQL database
+solr                      | Apache Solr server
+elasticsearch (optional)  | Elasticsearch server
+memcached (optional)      | Memcached server
+redis (optional)          | Redis server
+
+This directory will be mounted under /docker in main, nginx and httpd container.
 
 ### Makefile
 
@@ -127,6 +170,8 @@ Environment           | Description
 TYPO3_CONTEXT         | Context for TYPO3, can be used for TypoScript conditions and AdditionalConfiguration
 FLOW_CONTEXT          | Context for FLOW and NEOS
 <br>                  |
+MAIL_GATEWAY          | Upstream server for sending mails (ssmtp)
+<br>                  |
 MYSQL_ROOT_PASSWORD   | Password for MySQL user "root"
 MYSQL_USER            | Initial created MySQL user
 MYSQL_PASSWORD        | Password for initial MySQL user
@@ -164,6 +209,11 @@ to get both, the Docker configuration and the TYPO3 installation.
 
 For better useability track a whole branch (eg. develop or master) as submodule and not just a single commit.
 
+# Root privilege requirements for NFS
+
+Under Linux and MacOS you will be asked for root rights (sudo).
+If you don't want to enter your password every time [take a look at the vagrant manual for NFS usage](https://docs.vagrantup.com/v2/synced-folders/nfs.html)
+
 ## Credits
 
 This Docker layout is based on https://github.com/denderello/symfony-docker-example/

bin/.config.sh

@@ -24,6 +24,10 @@ SCRIPT_DIR=$(dirname $($READLINK -f "$0"))
 ROOT_DIR=$($READLINK -f "$SCRIPT_DIR/../")
 TYPO3_DIR=$($READLINK -f "$ROOT_DIR/htdocs")
 
+BACKUP_DIR=$($READLINK -f "$ROOT_DIR/backup")
+BACKUP_SOLR_FILE='solr.cores.tbz2'
+BACKUP_MYSQL_FILE='mysql.sql.bz2'
+
 #######################################
 ## Functions
 #######################################

bin/backup.sh

@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+
+set -o pipefail  # trace ERR through pipes
+set -o errtrace  # trace ERR through 'time command' and other functions
+set -o nounset   ## set -u : exit the script if you try to use an uninitialised variable
+set -o errexit   ## set -e : exit the script if any statement returns a non-true return value
+
+source "$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/.config.sh"
+
+if [ "$#" -ne 1 ]; then
+    echo "No type defined"
+    exit 1
+fi
+
+mkdir -p -- "${BACKUP_DIR}"
+
+case "$1" in
+    ###################################
+    ## MySQL
+    ###################################
+    "mysql")
+        rm -f -- "${BACKUP_DIR}/${BACKUP_MYSQL_FILE}"
+        mysqldump --opt --all-databases | bzip2 > "${BACKUP_DIR}/${BACKUP_MYSQL_FILE}"
+        ;;
+
+    ###################################
+    ## Solr
+    ###################################
+    "solr")
+        rm -f -- "${BACKUP_DIR}/${BACKUP_SOLR_FILE}"
+        tar jcf "${BACKUP_DIR}/${BACKUP_SOLR_FILE}" /data/solr/
+        ;;
+esac

bin/create-project.sh

@@ -7,13 +7,14 @@ set -o errexit   ## set -e : exit the script if any statement returns a non-true
 
 source "$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/.config.sh"
 
-
 if [ "$#" -ne 1 ]; then
     echo "No project type defined (either cms or neos)"
     exit 1
 fi
 
-rm -f "$TYPO3_DIR/.gitkeep"
+mkdir -p -- "$TYPO3_DIR/"
+
+rm -f -- "$TYPO3_DIR/.gitkeep"
 
 case "$1" in
     ###################################
@@ -32,4 +33,4 @@ case "$1" in
         ;;
 esac
 
-touch "$TYPO3_DIR/.gitkeep"
+touch -- "$TYPO3_DIR/.gitkeep"

bin/restore.sh

@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+
+set -o pipefail  # trace ERR through pipes
+set -o errtrace  # trace ERR through 'time command' and other functions
+set -o nounset   ## set -u : exit the script if you try to use an uninitialised variable
+set -o errexit   ## set -e : exit the script if any statement returns a non-true return value
+
+source "$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/.config.sh"
+
+if [ "$#" -ne 1 ]; then
+    echo "No type defined"
+    exit 1
+fi
+
+mkdir -p -- "${BACKUP_DIR}"
+
+case "$1" in
+    ###################################
+    ## MySQL
+    ###################################
+    "mysql")
+        bzcat "${BACKUP_DIR}/${BACKUP_MYSQL_FILE}" | mysql
+        ;;
+
+    ###################################
+    ## Solr
+    ###################################
+    "solr")
+        rm -rf /data/solr/* && mkdir -p /data/solr/
+        tar jxf "${BACKUP_DIR}/${BACKUP_SOLR_FILE}" -C /
+        ;;
+esac

docker-compose.yml

@@ -1,12 +1,13 @@
-typo3:
-  build: docker/typo3/
+main:
+  build: docker/main/
   links:
     - solr
     - mysql
     #- redis
     #- memcached
   volumes:
-    - ./:/var/www/
+    - ./:/docker/
+    - /tmp/debug/:/tmp/debug/
   volumes_from:
     - storage
   env_file:
@@ -17,9 +18,9 @@ nginx:
   ports:
     - 8000:80
   links:
-    - typo3
+    - main
   volumes_from:
-    - typo3
+    - main
   env_file:
     - docker-env.yml
 
@@ -28,9 +29,9 @@ nginx:
 #  ports:
 #    - 8000:80
 #  links:
-#    - fpm
+#    - main
 #  volumes_from:
-#    - typo3
+#    - main
 #  env_file:
 #    - docker-env.yml
 

docker-env.yml

@@ -1,7 +1,11 @@
+DOCUMENT_ROOT=htdocs/
+
 TYPO3_CONTEXT=Development/Docker
 FLOW_CONTEXT=Development/Docker
 FLOW_REWRITEURLS=1
 
+MAIL_GATEWAY=192.168.56.2
+
 MYSQL_ROOT_PASSWORD=dev
 MYSQL_USER=dev
 MYSQL_PASSWORD=dev