Merge branch 'release/5.2.0-beta5'

DoPaNik · Aug 28, 2017 · e2dfce5 · e2dfce5
2 parents bb82b85 + d9321bb
commit e2dfce5
Show file tree

Hide file tree

Showing 13 changed files with 100 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -31,7 +31,7 @@ rebuild:
 	docker-compose stop
 	docker-compose pull
 	docker-compose rm --force app
-	docker-compose build --no-cache
+	docker-compose build --no-cache --pull
 	docker-compose up -d --force-recreate
 
 #############################
@@ -79,8 +79,12 @@ root:
 # TYPO3
 #############################
 
+cli:
+	docker-compose run --rm --user application app cli $(ARGS)
+
 scheduler:
-	docker exec -it $$(docker-compose ps -q app) typo3/cli_dispatch.phpsh scheduler $(ARGS)
+	# TODO: remove the workaround "; (exit $?)" when https://github.com/docker/compose/issues/3379 has been fixed
+	docker-compose exec --user application app /bin/bash -c '"$$WEB_DOCUMENT_ROOT"typo3/cli_dispatch.phpsh scheduler $(ARGS); (exit $$?)'
 
 #############################
 # Argument fix workaround

diff --git a/bin/create-project.sh b/bin/create-project.sh
@@ -12,24 +12,26 @@ if [ "$#" -lt 1 ]; then
     exit 1
 fi
 
+#if app dir exists then backup it with timestamp
+[ ! -d "$CODE_DIR" ] || mv "$CODE_DIR" "$CODE_DIR".$(date +%Y%m%d%H%M%S);
 
-rm -rf -- "$CODE_DIR"
-mkdir -p "$CODE_DIR"
+mkdir -p -- "$CODE_DIR/"
+chmod 777 "$CODE_DIR/"
 
 case "$1" in
     ###################################
     ## TYPO3 CMS
     ###################################
     "typo3")
-        execInDir "$CODE_DIR" "docker run --rm --env COMPOSER_CACHE_DIR=/tmp --user $(id -u):$(id -g) -v \$(pwd):/app composer/composer:alpine create-project typo3/cms-base-distribution /app"
+        execInDir "$CODE_DIR" "docker run --rm --env COMPOSER_CACHE_DIR=/tmp --user $(id -u):$(id -g) -v \$(pwd):/app composer:latest create-project typo3/cms-base-distribution /app"
         execInDir "$CODE_DIR" "touch web/FIRST_INSTALL"
         ;;
 
     ###################################
     ## TYPO3 NEOS
     ###################################
     "neos")
-        execInDir "$CODE_DIR" "docker run --rm --env COMPOSER_CACHE_DIR=/tmp --user $(id -u):$(id -g) -v \$(pwd):/app composer/composer:alpine create-project neos/neos-base-distribution /app"
+        execInDir "$CODE_DIR" "docker run --rm --env COMPOSER_CACHE_DIR=/tmp --user $(id -u):$(id -g) -v \$(pwd):/app composer:latest create-project neos/neos-base-distribution /app"
         echo "\nNOTE: You probably want to change the WEB_DOCUMENT_ROOT env in your etc/environment.yml to '/app/Web/' and run 'docker-composer up -d app' to populate the change."
         ;;
 

diff --git a/docker-compose.development.yml b/docker-compose.development.yml
@@ -93,6 +93,15 @@ services:
   #    - VIRTUAL_HOST=solr.boilerplate.docker
   #    - VIRTUAL_PORT=8983
 
+  #######################################
+  # Tika server
+  #######################################
+  #tika:
+  #  build:
+  #    context: docker/tika/
+  #  ports:
+  #    - 19998:9998
+
   #######################################
   # Elasticsearch
   #######################################

diff --git a/docker/mysql/MariaDB-10.Dockerfile b/docker/mysql/MariaDB-10.Dockerfile
@@ -9,6 +9,8 @@
 #
 #++++++++++++++++++++++++++++++++++++++
 
-FROM mariadb:10
+FROM mariadb:10.1
 
 ADD conf/mysql-docker.cnf /etc/mysql/conf.d/z99-docker.cnf
+RUN chown mysql:mysql /etc/mysql/conf.d/z99-docker.cnf \
+    && chmod 0644 /etc/mysql/conf.d/z99-docker.cnf
diff --git a/docker/mysql/MariaDB-5.5.Dockerfile b/docker/mysql/MariaDB-5.5.Dockerfile
@@ -12,3 +12,5 @@
 FROM mariadb:5.5
 
 ADD conf/mysql-docker.cnf /etc/mysql/conf.d/z99-docker.cnf
+RUN chown mysql:mysql /etc/mysql/conf.d/z99-docker.cnf \
+    && chmod 0644 /etc/mysql/conf.d/z99-docker.cnf
diff --git a/docker/mysql/MySQL-5.5.Dockerfile b/docker/mysql/MySQL-5.5.Dockerfile
@@ -12,3 +12,5 @@
 FROM mysql:5.5
 
 ADD conf/mysql-docker.cnf /etc/mysql/conf.d/z99-docker.cnf
+RUN chown mysql:mysql /etc/mysql/conf.d/z99-docker.cnf \
+    && chmod 0644 /etc/mysql/conf.d/z99-docker.cnf
diff --git a/docker/mysql/MySQL-5.6.Dockerfile b/docker/mysql/MySQL-5.6.Dockerfile
@@ -12,3 +12,5 @@
 FROM mysql:5.6
 
 ADD conf/mysql-docker.cnf /etc/mysql/conf.d/z99-docker.cnf
+RUN chown mysql:mysql /etc/mysql/conf.d/z99-docker.cnf \
+    && chmod 0644 /etc/mysql/conf.d/z99-docker.cnf
diff --git a/docker/mysql/MySQL-5.7.Dockerfile b/docker/mysql/MySQL-5.7.Dockerfile
@@ -12,3 +12,5 @@
 FROM mysql:5.7
 
 ADD conf/mysql-docker.cnf /etc/mysql/conf.d/z99-docker.cnf
+RUN chown mysql:mysql /etc/mysql/conf.d/z99-docker.cnf \
+    && chmod 0644 /etc/mysql/conf.d/z99-docker.cnf
diff --git a/docker/mysql/Percona-5.5.Dockerfile b/docker/mysql/Percona-5.5.Dockerfile
@@ -12,3 +12,5 @@
 FROM percona:5.5
 
 ADD conf/mysql-docker.cnf /etc/mysql/conf.d/z99-docker.cnf
+RUN chown mysql:mysql /etc/mysql/conf.d/z99-docker.cnf \
+    && chmod 0644 /etc/mysql/conf.d/z99-docker.cnf
diff --git a/docker/mysql/Percona-5.6.Dockerfile b/docker/mysql/Percona-5.6.Dockerfile
@@ -12,3 +12,5 @@
 FROM percona:5.6
 
 ADD conf/mysql-docker.cnf /etc/mysql/conf.d/z99-docker.cnf
+RUN chown mysql:mysql /etc/mysql/conf.d/z99-docker.cnf \
+    && chmod 0644 /etc/mysql/conf.d/z99-docker.cnf
diff --git a/docker/mysql/Percona-5.7.Dockerfile b/docker/mysql/Percona-5.7.Dockerfile
@@ -12,3 +12,5 @@
 FROM percona:5.7
 
 ADD conf/mysql-docker.cnf /etc/mysql/conf.d/z99-docker.cnf
+RUN chown mysql:mysql /etc/mysql/conf.d/z99-docker.cnf \
+    && chmod 0644 /etc/mysql/conf.d/z99-docker.cnf
diff --git a/docker/tika/Dockerfile b/docker/tika/Dockerfile
@@ -0,0 +1 @@
+FROM logicalspark/docker-tikaserver
diff --git a/etc/environment.yml b/etc/environment.yml
@@ -12,7 +12,68 @@
 # General
 WEB_DOCUMENT_ROOT=/app/web/
 WEB_DOCUMENT_INDEX=index.php
+# (TYPO3 CLI entrypoint < 8 LTS)
 CLI_SCRIPT=php /app/web/typo3/cli_dispatch.phpsh
+# (TYPO3 CLI entrypoint >= 8 LTS)
+#CLI_SCRIPT=php /app/web/typo3/sysext/core/bin/typo3
+
+#######################################
+# PHP settings
+# (available in docker images after 2017-06-15)
+
+# PHP.ini
+
+# php.memory_limit=2G
+# php.date.timezone=UTC
+# php.display_errors=1
+# php.max_execution_time=600
+# php.post_max_size=50M
+# php.upload_max_filesize=50M
+
+# FPM global (master)
+
+# fpm.global.process_control_timeout=5m
+# fpm.global.process.max=100
+
+# FPM pool
+
+# fpm.pool.pm=dynamic
+# fpm.pool.pm.max_children=20
+# fpm.pool.pm.start_servers=20
+# fpm.pool.pm.min_spare_servers=1
+# fpm.pool.pm.max_spare_servers=3
+# fpm.pool.pm.process_idle_timeout=10s
+# fpm.pool.pm.max_requests=1000
+# fpm.pool.request_terminate_timeout=5m
+
+#######################################
+# PHP settings
+# (available in docker images after 2017-06-15)
+
+# PHP.ini
+
+# php.memory_limit=2G
+# php.date.timezone=UTC
+# php.display_errors=1
+# php.max_execution_time=600
+# php.post_max_size=50M
+# php.upload_max_filesize=50M
+
+# FPM global (master)
+
+# fpm.global.process_control_timeout=5m
+# fpm.global.process.max=100
+
+# FPM pool
+
+# fpm.pool.pm=dynamic
+# fpm.pool.pm.max_children=20
+# fpm.pool.pm.start_servers=20
+# fpm.pool.pm.min_spare_servers=1
+# fpm.pool.pm.max_spare_servers=3
+# fpm.pool.pm.process_idle_timeout=10s
+# fpm.pool.pm.max_requests=1000
+# fpm.pool.request_terminate_timeout=5m
 
 #######################################
 # PHP settings