Add php-fpm flavour

diff --git a/php-apache/docker-entrypoint.sh b/php-apache/docker-entrypoint.sh
index 0178820a44b4f641962bb2f6d2c8178f7226d762..e14c0bd28b807ba80a8a8447e0f95a313f4d1fc1 100755 (executable)
--- a/php-apache/docker-entrypoint.sh
+++ b/php-apache/docker-entrypoint.sh
@@ -68,7 +68,6 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
     \$config['default_port'] = '${ROUNDCUBEMAIL_DEFAULT_PORT}';
     \$config['smtp_server'] = '${ROUNDCUBEMAIL_SMTP_SERVER}';
     \$config['smtp_port'] = '${ROUNDCUBEMAIL_SMTP_PORT}';
-    \$config['log_dir'] = '${ROUNDCUBEMAIL_LOG_DIR}';
     \$config['temp_dir'] = '${ROUNDCUBEMAIL_TEMP_DIR}';
     \$config['plugins'] = ['${ROUNDCUBEMAIL_PLUGINS_PHP}'];
     \$config['zipdownload_selection'] = true;

diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
new file mode 100644 (file)
index 0000000..f07ccff
--- /dev/null
+++ b/php-fpm/Dockerfile
@@ -0,0 +1,46 @@
+FROM php:7.1-fpm
+MAINTAINER Thomas Bruederli <thomas@roundcube.net>
+
+RUN apt-get -qq update \
+  && apt-get install -qq \
+    libfreetype6-dev \
+    libicu-dev \
+    libjpeg62-turbo-dev \
+    libldap2-dev \
+    libpng-dev \
+    libpq-dev \
+    libsqlite3-dev \
+    zlib1g-dev \
+  && rm -rf /var/lib/apt/lists/*
+RUN docker-php-ext-install -j$(nproc) exif intl pdo pdo_mysql pdo_pgsql pdo_sqlite zip
+RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ && docker-php-ext-install -j$(nproc) gd
+RUN docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu && docker-php-ext-install -j$(nproc) ldap
+
+# expose these volumes
+VOLUME /var/roundcube/config
+VOLUME /var/www/html
+
+# Define Roundcubemail version
+ENV ROUNDCUBEMAIL_VERSION 1.3.4
+
+# Download package and extract to web volume
+RUN curl -o roundcubemail.tar.gz -SL https://github.com/roundcube/roundcubemail/releases/download/${ROUNDCUBEMAIL_VERSION}/roundcubemail-${ROUNDCUBEMAIL_VERSION}-complete.tar.gz \
+  && curl -o roundcubemail.tar.gz.asc -SL https://github.com/roundcube/roundcubemail/releases/download/${ROUNDCUBEMAIL_VERSION}/roundcubemail-${ROUNDCUBEMAIL_VERSION}-complete.tar.gz.asc \
+  && export GNUPGHOME="$(mktemp -d)" \
+  && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys F3E4C04BB3DB5D4215C45F7F5AB2BAA141C4F7D5 \
+  && gpg --batch --verify roundcubemail.tar.gz.asc roundcubemail.tar.gz \
+  && rm -r "$GNUPGHOME" roundcubemail.tar.gz.asc \
+  && tar -xzf roundcubemail.tar.gz -C /usr/src/ \
+  # upstream tarballs include ./roundcubemail-${ROUNDCUBEMAIL_VERSION}/ so this gives us /usr/src/roundcubemail-${ROUNDCUBEMAIL_VERSION}
+  && mv /usr/src/roundcubemail-${ROUNDCUBEMAIL_VERSION} /usr/src/roundcubemail \
+  && rm -rf /usr/src/roundcubemail/installer \
+&& rm roundcubemail.tar.gz
+
+# include the wait-for-it.sh script
+RUN curl https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh > /wait-for-it.sh && chmod +x /wait-for-it.sh
+
+COPY docker-entrypoint.sh /
+
+ENTRYPOINT ["/docker-entrypoint.sh"]
+CMD ["php-fpm"]
+

diff --git a/php-fpm/docker-entrypoint.sh b/php-fpm/docker-entrypoint.sh
new file mode 100755 (executable)
index 0000000..884b4c0
--- /dev/null
+++ b/php-fpm/docker-entrypoint.sh
@@ -0,0 +1,93 @@
+#!/bin/bash
+# set -ex
+
+# PWD=`pwd`
+
+if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
+  if ! [ -e index.php -a -e bin/installto.sh ]; then
+    echo >&2 "roundcubemail not found in $PWD - copying now..."
+    if [ "$(ls -A)" ]; then
+      echo >&2 "WARNING: $PWD is not empty - press Ctrl+C now if this is an error!"
+      ( set -x; ls -A; sleep 10 )
+    fi
+    tar cf - --one-file-system -C /usr/src/roundcubemail . | tar xf -
+    sed -i 's/mod_php5.c/mod_php7.c/' .htaccess
+    echo >&2 "Complete! ROUNDCUBEMAIL has been successfully copied to $PWD"
+  fi
+
+  if [ ! -z "${!POSTGRES_ENV_POSTGRES_*}" ] || [ $ROUNDCUBEMAIL_DB_TYPE == "pgsql" ]; then
+    : "${ROUNDCUBEMAIL_DB_TYPE:=pgsql}"
+    : "${ROUNDCUBEMAIL_DB_HOST:=postgres}"
+    : "${ROUNDCUBEMAIL_DB_USER:=${POSTGRES_ENV_POSTGRES_USER}}"
+    : "${ROUNDCUBEMAIL_DB_PASSWORD:=${POSTGRES_ENV_POSTGRES_PASSWORD}}"
+    : "${ROUNDCUBEMAIL_DB_NAME:=${POSTGRES_ENV_POSTGRES_DB:-roundcubemail}}"
+    : "${ROUNDCUBEMAIL_DSNW:=${ROUNDCUBEMAIL_DB_TYPE}://${ROUNDCUBEMAIL_DB_USER}:${ROUNDCUBEMAIL_DB_PASSWORD}@${ROUNDCUBEMAIL_DB_HOST}/${ROUNDCUBEMAIL_DB_NAME}}"
+
+    /wait-for-it.sh ${ROUNDCUBEMAIL_DB_HOST}:5432 -t 30
+  elif [ ! -z "${!MYSQL_ENV_MYSQL_*}" ] || [ $ROUNDCUBEMAIL_DB_TYPE == "mysql" ]; then
+    : "${ROUNDCUBEMAIL_DB_TYPE:=mysql}"
+    : "${ROUNDCUBEMAIL_DB_HOST:=mysql}"
+    : "${ROUNDCUBEMAIL_DB_USER:=${MYSQL_ENV_MYSQL_USER:-root}}"
+    if [ "$ROUNDCUBEMAIL_DB_USER" = 'root' ]; then
+      : "${ROUNDCUBEMAIL_DB_PASSWORD:=${MYSQL_ENV_MYSQL_ROOT_PASSWORD}}"
+    else
+      : "${ROUNDCUBEMAIL_DB_PASSWORD:=${MYSQL_ENV_MYSQL_PASSWORD}}"
+    fi
+    : "${ROUNDCUBEMAIL_DB_NAME:=${MYSQL_ENV_MYSQL_DATABASE:-roundcubemail}}"
+    : "${ROUNDCUBEMAIL_DSNW:=${ROUNDCUBEMAIL_DB_TYPE}://${ROUNDCUBEMAIL_DB_USER}:${ROUNDCUBEMAIL_DB_PASSWORD}@${ROUNDCUBEMAIL_DB_HOST}/${ROUNDCUBEMAIL_DB_NAME}}"
+
+    /wait-for-it.sh ${ROUNDCUBEMAIL_DB_HOST}:3306 -t 30
+  else
+    # use local SQLite DB in /var/www/html/db
+    : "${ROUNDCUBEMAIL_DB_TYPE:=sqlite}"
+    : "${ROUNDCUBEMAIL_DB_DIR:=$PWD/db}"
+    : "${ROUNDCUBEMAIL_DB_NAME:=sqlite}"
+    : "${ROUNDCUBEMAIL_DSNW:=${ROUNDCUBEMAIL_DB_TYPE}:///$ROUNDCUBEMAIL_DB_DIR/${ROUNDCUBEMAIL_DB_NAME}.db?mode=0646}"
+
+    mkdir -p $ROUNDCUBEMAIL_DB_DIR
+    chown www-data:www-data $ROUNDCUBEMAIL_DB_DIR
+  fi
+
+  : "${ROUNDCUBEMAIL_DEFAULT_HOST:=localhost}"
+  : "${ROUNDCUBEMAIL_DEFAULT_PORT:=143}"
+  : "${ROUNDCUBEMAIL_SMTP_SERVER:=localhost}"
+  : "${ROUNDCUBEMAIL_SMTP_PORT:=587}"
+  : "${ROUNDCUBEMAIL_PLUGINS:=archive,zipdownload}"
+  : "${ROUNDCUBEMAIL_TEMP_DIR:=/var/www/html/temp}"
+
+  if [ ! -e config/config.inc.php ]; then
+    ROUNDCUBEMAIL_PLUGINS_PHP=`echo "${ROUNDCUBEMAIL_PLUGINS}" | sed -E "s/[, ]+/', '/g"`
+    mkdir -p ${ROUNDCUBEMAIL_TEMP_DIR} && chown www-data ${ROUNDCUBEMAIL_TEMP_DIR}
+    touch config/config.inc.php
+
+    echo "Write config to $PWD/config/config.inc.php"
+    echo "<?php
+    \$config['db_dsnw'] = '${ROUNDCUBEMAIL_DSNW}';
+    \$config['db_dsnr'] = '${ROUNDCUBEMAIL_DSNR}';
+    \$config['default_host'] = '${ROUNDCUBEMAIL_DEFAULT_HOST}';
+    \$config['default_port'] = '${ROUNDCUBEMAIL_DEFAULT_PORT}';
+    \$config['smtp_server'] = '${ROUNDCUBEMAIL_SMTP_SERVER}';
+    \$config['smtp_port'] = '${ROUNDCUBEMAIL_SMTP_PORT}';
+    \$config['temp_dir'] = '${ROUNDCUBEMAIL_TEMP_DIR}';
+    \$config['plugins'] = ['${ROUNDCUBEMAIL_PLUGINS_PHP}'];
+    \$config['zipdownload_selection'] = true;
+    \$config['log_driver'] = 'stdout';
+    " > config/config.inc.php
+
+    for fn in `ls /var/roundcube/config/*.php`; do
+      echo "include('$fn');" >> config/config.inc.php
+    done
+
+    # initialize DB if not SQLite
+    echo "${ROUNDCUBEMAIL_DSNW}" | grep -q 'sqlite:' || bin/initdb.sh --dir=$PWD/SQL || bin/updatedb.sh --dir=$PWD/SQL --package=roundcube || echo "Failed to initialize databse. Please run $PWD/bin/initdb.sh manually."
+  else
+    echo "WARNING: $PWD/config/config.inc.php already exists."
+    echo "ROUNDCUBEMAIL_* environment variables have been ignored."
+  fi
+
+  if [ ! -z "${ROUNDCUBEMAIL_UPLOAD_MAX_FILESIZE}" ]; then
+    sed -i -E "s/(upload_max_filesize|post_max_size) +[0-9BKMG]+/\1 ${ROUNDCUBEMAIL_UPLOAD_MAX_FILESIZE}/g" $PWD/.htaccess
+  fi
+fi
+
+exec "$@"