Merge branch 'devel'

Author: Markus Blaschke

docker/httpd/Dockerfile

@@ -2,7 +2,7 @@ FROM httpd:2.4
 
 ENV DEBIAN_FRONTEND noninteractive
 
-ADD conf/vhost.conf /usr/local/apache2/conf/docker-vhost.conf
+ADD conf/vhost.conf /usr/local/apache2/conf/.docker-vhost.conf.original
 ADD entrypoint.sh /entrypoint.sh
 
 ENTRYPOINT ["/entrypoint.sh"]

docker/httpd/conf/vhost.conf

@@ -6,7 +6,7 @@ LoadModule proxy_module      modules/mod_proxy.so
 LoadModule proxy_fcgi_module modules/mod_proxy_fcgi.so
 
 <FilesMatch \.php$>
-    SetHandler "proxy:fcgi://<FPM_HOST>:<FPM_PORT>"
+    SetHandler "proxy:fcgi://fpm:<FPM_PORT>"
 </FilesMatch>
 
 SetEnv TYPO3_CONTEXT <TYPO3_CONTEXT>

docker/httpd/entrypoint.sh

@@ -1,10 +1,26 @@
 #!/bin/bash
 
+###################
+# httpd.conf
+###################
+
+# Backup original
+if [ ! -f "/usr/local/apache2/conf/.httpd.conf.original" ]; then
+    cp /usr/local/apache2/conf/httpd.conf /usr/local/apache2/conf/.httpd.conf.original
+fi
+
+cp /usr/local/apache2/conf/.httpd.conf.original /usr/local/apache2/conf/httpd.conf
 
 echo "
 Include conf/docker-vhost.conf
 " >> /usr/local/apache2/conf/httpd.conf
 
+
+###################
+# docker-vhost.conf
+###################
+
+cp /usr/local/apache2/conf/.docker-vhost.conf.original /usr/local/apache2/conf/docker-vhost.conf
 /bin/sed -i "s@<TYPO3_CONTEXT>@${TYPO3_CONTEXT}@"     /usr/local/apache2/conf/docker-vhost.conf
 /bin/sed -i "s@<FPM_HOST>@${FPM_PORT_9000_TCP_ADDR}@" /usr/local/apache2/conf/docker-vhost.conf
 /bin/sed -i "s@<FPM_PORT>@${FPM_PORT_9000_TCP_PORT}@" /usr/local/apache2/conf/docker-vhost.conf

docker/nginx/Dockerfile

@@ -1,6 +1,6 @@
 FROM dockerfile/nginx
 
-ADD conf/vhost.conf /etc/nginx/sites-enabled/default
+ADD conf/vhost.conf /etc/nginx/sites-available/default.tpl
 ADD entrypoint.sh /entrypoint.sh
 
 ENTRYPOINT ["/entrypoint.sh"]

docker/nginx/conf/vhost.conf

@@ -19,7 +19,7 @@ server {
         }
 
         location ~* \.php$ {
-                fastcgi_pass <FPM_HOST>:<FPM_PORT>;
+                fastcgi_pass fpm:<FPM_PORT>;
                 include fastcgi.conf;
                 include fastcgi_params;
                 fastcgi_param TYPO3_CONTEXT "<TYPO3_CONTEXT>";

docker/nginx/entrypoint.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
 
+cp /etc/nginx/sites-available/default.tpl /etc/nginx/sites-enabled/default
 /bin/sed -i "s@<TYPO3_CONTEXT>@${TYPO3_CONTEXT}@"     /etc/nginx/sites-enabled/default
 /bin/sed -i "s@<FPM_HOST>@${FPM_PORT_9000_TCP_ADDR}@" /etc/nginx/sites-enabled/default
 /bin/sed -i "s@<FPM_PORT>@${FPM_PORT_9000_TCP_PORT}@" /etc/nginx/sites-enabled/default

docker/php-fpm/Dockerfile

@@ -1,13 +1,12 @@
-FROM php:5.6-fpm
+FROM ubuntu:14.04
 
 ENV DEBIAN_FRONTEND noninteractive
 
-# Install modules
-RUN apt-get update && apt-get install -y \
-    libfreetype6-dev \
-    libjpeg62-turbo-dev \
-    libmcrypt-dev \
-    libpng12-dev \
+RUN apt-get update
+
+RUN apt-get install -y \
+    php5-cli \
+    php5-fpm \
     php5-json \
     php5-intl \
     php5-curl \
@@ -20,18 +19,18 @@ RUN apt-get update && apt-get install -y \
     php5-xmlrpc \
     php5-xsl \
     php5-geoip \
-    php5-ldap \
+    php5-ldap
+
+RUN apt-get install -y \
     graphicsmagick \
     zip \
     unzip \
-    && docker-php-ext-install iconv mcrypt \
-    && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
-    && docker-php-ext-install gd
+    curl
 
 ADD entrypoint.sh /entrypoint.sh
 
 EXPOSE 9000
 
-WORKDIR /var/www/html
+WORKDIR /var/www
 
-ENTRYPOINT ["/entrypoint.sh"]
+ENTRYPOINT ["/entrypoint.sh"]

docker/php-fpm/entrypoint.sh

@@ -1,5 +1,15 @@
 #!/bin/bash
 
+# Backup original
+if [ ! -f "/usr/local/etc/.php-fpm.conf.default.original" ]; then
+    cp /etc/php5/fpm/pool.d/www.conf /etc/php5/fpm/pool.d/.www.original
+fi
+
+# Restore original
+cp /etc/php5/fpm/pool.d/.www.original  /etc/php5/fpm/pool.d/www.conf
+sed -i "s@listen = /var/run/php5-fpm.sock@listen = 9000@" /etc/php5/fpm/pool.d/www.conf
+
+# Manipulate php-fpm configuration
 echo "
 env[TYPO3_CONTEXT] = ${TYPO3_CONTEXT}
 
@@ -16,6 +26,6 @@ php_value[max_input_time]            = 300
 php_admin_value[post_max_size]       = 50M
 php_admin_value[upload_max_filesize] = 50M
 
-" >> /usr/local/etc/php-fpm.conf.default
+" >> /etc/php5/fpm/pool.d/www.conf
 
-exec php-fpm --nodaemonize
+exec /usr/sbin/php5-fpm --nodaemonize

docker/typo3/Dockerfile

@@ -1,10 +1,12 @@
-FROM php:5.6-fpm
+FROM ubuntu:14.04
 
 ENV DEBIAN_FRONTEND noninteractive
 
-RUN apt-get update && apt-get install -y \
-    git \
-    curl \
+RUN apt-get update
+
+RUN apt-get install -y \
+    php5-cli \
+    php5-fpm \
     php5-json \
     php5-intl \
     php5-curl \
@@ -17,9 +19,13 @@ RUN apt-get update && apt-get install -y \
     php5-xmlrpc \
     php5-xsl \
     php5-geoip \
-    php5-ldap \
+    php5-ldap
+
+RUN apt-get install -y \
     graphicsmagick \
-    mysql-client
+    zip \
+    unzip \
+    curl
 
 RUN curl -sS https://getcomposer.org/installer | php
 RUN mv composer.phar /usr/local/bin/composer