Merge branch 'release/5.2.0-beta5'

Author: mblaschke

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
 
 #############################

docker-compose.development.yml

@@ -92,6 +92,15 @@ services:
  # - VIRTUAL_HOST=solr.boilerplate.docker
  # - VIRTUAL_PORT=8983
 
+ #######################################
+ # Tika server
+ #######################################
+ #tika:
+ # build:
+ # context: docker/tika/
+ # ports:
+ # - 19998:9998
+
  #######################################
  # Elasticsearch
  #######################################

docker/mysql/MariaDB-10.Dockerfile

@@ -12,3 +12,5 @@
 FROM mariadb:10
 
 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

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

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

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

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

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

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

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