Merge branch 'release/1.4.0'

Author: Markus Blaschke

docker/typo3/Dockerfile

@@ -1,52 +1,14 @@
 FROM ubuntu:14.04
 
-ENV DEBIAN_FRONTEND noninteractive
-
-RUN apt-get update
-
-RUN mkdir -p /opt/docker/ /var/log/supervisor
+COPY conf/php.ini          /etc/php5/mods-available/typo3.ini
 COPY conf/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
-COPY bin/* /opt/docker/
-
-RUN apt-get install -y \
-    supervisor \
-    php5-cli \
-    php5-fpm \
-    php5-json \
-    php5-intl \
-    php5-curl \
-    php5-mysqlnd \
-    php5-xhprof \
-    php5-memcached \
-    php5-redis \
-    php5-mcrypt \
-    php5-gd \
-    php5-sqlite \
-    php5-xmlrpc \
-    php5-xsl \
-    php5-geoip \
-    php5-ldap
+COPY conf/locale.conf      /opt/docker/locale.conf
+COPY bin/*                 /opt/docker/
 
-RUN apt-get install -y \
-    graphicsmagick \
-    zip \
-    unzip \
-    curl \
-    mysql-client \
-    nodejs \
-    nodejs-legacy \
-    node-less \
-    npm
-
-ADD conf/php.ini /etc/php5/mods-available/typo3.ini
-RUN php5enmod typo3
-
-RUN curl -sS https://getcomposer.org/installer | php
-RUN mv composer.phar /usr/local/bin/composer
+RUN bash /opt/docker/install.sh
 
 ADD ./htdocs /var/www/htdocs
 
-
 EXPOSE 9000
 
 VOLUME /var/www/

docker/typo3/bin/install.sh

@@ -0,0 +1,71 @@
+#!/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
+
+export DEBIAN_FRONTEND="noninteractive"
+
+#############################
+# Common tasks
+#############################
+
+mkdir -p /opt/docker/ \
+         /var/log/supervisor
+
+#############################
+# Install packages
+#############################
+
+apt-get update
+
+apt-get install -y \
+    supervisor \
+    php5-cli \
+    php5-fpm \
+    php5-json \
+    php5-intl \
+    php5-curl \
+    php5-mysqlnd \
+    php5-xhprof \
+    php5-memcached \
+    php5-redis \
+    php5-mcrypt \
+    php5-gd \
+    php5-sqlite \
+    php5-xmlrpc \
+    php5-xsl \
+    php5-geoip \
+    php5-ldap
+
+apt-get install -y \
+    graphicsmagick \
+    zip \
+    unzip \
+    curl \
+    mysql-client \
+    nodejs \
+    nodejs-legacy \
+    node-less \
+    npm
+
+#############################
+# Generate locales
+#############################
+
+cat /opt/docker/locale.conf >> /var/lib/locales/supported.d/local
+locale-gen
+
+#############################
+# Enable php modules
+#############################
+## custom config
+php5enmod typo3
+
+#############################
+# Composer
+#############################
+
+curl -sS https://getcomposer.org/installer | php
+mv composer.phar /usr/local/bin/composer

docker/typo3/conf/locale.conf

@@ -0,0 +1,11 @@
+en_GB.UTF-8 UTF-8
+en_GB ISO-8859-1
+en_GB.ISO-8859-15 ISO-8859-15
+
+en_US.UTF-8 UTF-8
+en_US ISO-8859-1
+en_US.ISO-8859-15 ISO-8859-15
+
+de_DE.UTF-8 UTF-8
+de_DE ISO-8859-1
+de_DE@euro ISO-8859-15