Merge branch 'develop'

Author: Markus Blaschke

docker-compose.yml

@@ -4,7 +4,7 @@ typo3:
     - solr
     - mysql
   volumes:
-    - ./htdocs:/var/www/html
+    - ./:/var/www/
   env_file:
     - docker-env.yml
 

docker/httpd/conf/vhost.conf

@@ -13,8 +13,8 @@ SetEnv TYPO3_CONTEXT <TYPO3_CONTEXT>
 
 DirectoryIndex index.html index.htm index.php
 
-DocumentRoot "/var/www/html/"
-<Directory "/var/www/html/">
+DocumentRoot "/var/www/htdocs/"
+<Directory "/var/www/htdocs/">
     Options Indexes FollowSymLinks
     AllowOverride All
     Require all granted

docker/nginx/conf/vhost.conf

@@ -9,7 +9,7 @@ server {
         access_log   /dev/stdout;
         error_log    /dev/stdout info;
 
-        root /var/www/html/;
+        root /var/www/htdocs/;
         index index.php;
 
         client_max_body_size 50m;

docker/typo3/Dockerfile

@@ -25,15 +25,17 @@ RUN apt-get install -y \
     graphicsmagick \
     zip \
     unzip \
-    curl
+    curl \
+    mysql-client
 
 RUN curl -sS https://getcomposer.org/installer | php
 RUN mv composer.phar /usr/local/bin/composer
 
 ADD entrypoint.sh /entrypoint.sh
 ADD ./htdocs /var/www/html
 
-WORKDIR /var/www/html
+VOLUME /var/www/
+WORKDIR /var/www/htdocs/
 
 ENTRYPOINT ["/entrypoint.sh"]
 CMD ["echo", "hello"]