From b0dfedea52019695e51353f38ac129d72e599bd8 Mon Sep 17 00:00:00 2001 From: J0WI Date: Sat, 15 Jun 2019 16:30:54 +0200 Subject: [PATCH] Add Alpine variant --- .travis.yml | 9 +- {php-apache => apache}/Dockerfile | 1 + {php-apache => apache}/docker-compose.yml | 0 {php-apache => apache}/docker-entrypoint.sh | 0 {php-apache => apache}/php.ini | 0 fpm-alpine/Dockerfile | 83 +++++++++++++++ {php-fpm => fpm-alpine}/docker-compose.yml | 0 {php-fpm => fpm-alpine}/docker-entrypoint.sh | 7 +- {php-fpm => fpm-alpine}/php.ini | 0 {php-fpm => fpm}/Dockerfile | 2 + fpm/docker-compose.yml | 102 +++++++++++++++++++ fpm/docker-entrypoint.sh | 100 ++++++++++++++++++ fpm/php.ini | 10 ++ 13 files changed, 308 insertions(+), 6 deletions(-) rename {php-apache => apache}/Dockerfile (99%) rename {php-apache => apache}/docker-compose.yml (100%) rename {php-apache => apache}/docker-entrypoint.sh (100%) rename {php-apache => apache}/php.ini (100%) create mode 100644 fpm-alpine/Dockerfile rename {php-fpm => fpm-alpine}/docker-compose.yml (100%) rename {php-fpm => fpm-alpine}/docker-entrypoint.sh (97%) rename {php-fpm => fpm-alpine}/php.ini (100%) rename {php-fpm => fpm}/Dockerfile (99%) create mode 100644 fpm/docker-compose.yml create mode 100755 fpm/docker-entrypoint.sh create mode 100644 fpm/php.ini diff --git a/.travis.yml b/.travis.yml index ba0580d..e16f052 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ branches: before_script: - env | sort - - dir="php-${VARIANT}" + - dir="${VARIANT}" script: - cd "$dir" @@ -26,6 +26,7 @@ script: notifications: email: false -env: # Environments - - VERSION=1.3.9 VARIANT=fpm - - VERSION=1.3.9 VARIANT=apache +env: + - VERSION=1.3.9 VARIANT=apache + - VERSION=1.3.9 VARIANT=fpm + - VERSION=1.3.9 VARIANT=fpm-alpine diff --git a/php-apache/Dockerfile b/apache/Dockerfile similarity index 99% rename from php-apache/Dockerfile rename to apache/Dockerfile index 3cdfe2c..d557c1c 100644 --- a/php-apache/Dockerfile +++ b/apache/Dockerfile @@ -50,6 +50,7 @@ RUN a2enmod rewrite # expose these volumes VOLUME /var/roundcube/config +VOLUME /var/www/html VOLUME /tmp/roundcube-temp # Define Roundcubemail version diff --git a/php-apache/docker-compose.yml b/apache/docker-compose.yml similarity index 100% rename from php-apache/docker-compose.yml rename to apache/docker-compose.yml diff --git a/php-apache/docker-entrypoint.sh b/apache/docker-entrypoint.sh similarity index 100% rename from php-apache/docker-entrypoint.sh rename to apache/docker-entrypoint.sh diff --git a/php-apache/php.ini b/apache/php.ini similarity index 100% rename from php-apache/php.ini rename to apache/php.ini diff --git a/fpm-alpine/Dockerfile b/fpm-alpine/Dockerfile new file mode 100644 index 0000000..afb4d57 --- /dev/null +++ b/fpm-alpine/Dockerfile @@ -0,0 +1,83 @@ +FROM php:7.2-fpm-alpine +LABEL maintainer="Thomas Bruederli " + +# entrypoint.sh and cron.sh dependencies +RUN set -ex; \ + \ + apk add --no-cache \ + bash \ + coreutils + +RUN set -ex; \ + \ + apk add --no-cache --virtual .build-deps \ + icu-dev \ + libjpeg-turbo-dev \ + libpng-dev \ + openldap-dev \ + postgresql-dev \ + sqlite-dev \ + ; \ + \ + docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \ + docker-php-ext-configure ldap; \ + docker-php-ext-install \ + exif \ + gd \ + intl \ + ldap \ + pdo_mysql \ + pdo_pgsql \ + pdo_sqlite \ + zip \ + ; \ + \ + runDeps="$( \ + scanelf --needed --nobanner --format '%n#p' --recursive /usr/local/lib/php/extensions \ + | tr ',' '\n' \ + | sort -u \ + | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ + )"; \ + apk add --virtual .roundcubemail-phpext-rundeps $runDeps; \ + apk del .build-deps + +# expose these volumes +VOLUME /var/roundcube/config +VOLUME /var/www/html +VOLUME /tmp/roundcube-temp + +# Define Roundcubemail version +ENV ROUNDCUBEMAIL_VERSION 1.3.9 + +# Download package and extract to web volume +RUN set -ex; \ + apk add --no-cache --virtual .fetch-deps \ + gnupg \ + ; \ + \ + curl -o roundcubemail.tar.gz -fSL https://github.com/roundcube/roundcubemail/releases/download/${ROUNDCUBEMAIL_VERSION}/roundcubemail-${ROUNDCUBEMAIL_VERSION}-complete.tar.gz; \ + curl -o roundcubemail.tar.gz.asc -fSL https://github.com/roundcube/roundcubemail/releases/download/${ROUNDCUBEMAIL_VERSION}/roundcubemail-${ROUNDCUBEMAIL_VERSION}-complete.tar.gz.asc; \ + export GNUPGHOME="$(mktemp -d)"; \ + # workaround for "Cannot assign requested address", see e.g. https://github.com/inversepath/usbarmory-debian-base_image/issues/9 + echo "disable-ipv6" > "$GNUPGHOME/dirmngr.conf"; \ + # ha.pool.sks-keyservers.net seems to be unreliable, use pgp.mit.edu as fallback + gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys F3E4C04BB3DB5D4215C45F7F5AB2BAA141C4F7D5 || gpg --batch --keyserver pgp.mit.edu --recv-keys F3E4C04BB3DB5D4215C45F7F5AB2BAA141C4F7D5; \ + gpg --batch --verify roundcubemail.tar.gz.asc roundcubemail.tar.gz; \ + tar -xf roundcubemail.tar.gz -C /usr/src/; \ + gpgconf --kill all; \ + rm -r "$GNUPGHOME" roundcubemail.tar.gz.asc roundcubemail.tar.gz; \ + # 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; \ + apk del .fetch-deps + +# include the wait-for-it.sh script +RUN curl -fL https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh > /wait-for-it.sh && chmod +x /wait-for-it.sh + +# use custom PHP settings +COPY php.ini /usr/local/etc/php/conf.d/roundcube-defaults.ini + +COPY docker-entrypoint.sh / + +ENTRYPOINT ["/docker-entrypoint.sh"] +CMD ["php-fpm"] diff --git a/php-fpm/docker-compose.yml b/fpm-alpine/docker-compose.yml similarity index 100% rename from php-fpm/docker-compose.yml rename to fpm-alpine/docker-compose.yml diff --git a/php-fpm/docker-entrypoint.sh b/fpm-alpine/docker-entrypoint.sh similarity index 97% rename from php-fpm/docker-entrypoint.sh rename to fpm-alpine/docker-entrypoint.sh index 8ff7788..4262293 100755 --- a/php-fpm/docker-entrypoint.sh +++ b/fpm-alpine/docker-entrypoint.sh @@ -54,11 +54,10 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then : "${ROUNDCUBEMAIL_SMTP_SERVER:=localhost}" : "${ROUNDCUBEMAIL_SMTP_PORT:=587}" : "${ROUNDCUBEMAIL_PLUGINS:=archive,zipdownload}" - : "${ROUNDCUBEMAIL_TEMP_DIR:=/var/www/html/temp}" + : "${ROUNDCUBEMAIL_TEMP_DIR:=/tmp/roundcube-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" @@ -88,6 +87,10 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then echo "ROUNDCUBEMAIL_* environment variables have been ignored." fi + if [ ! -z "${ROUNDCUBEMAIL_TEMP_DIR}" ]; then + mkdir -p ${ROUNDCUBEMAIL_TEMP_DIR} && chown www-data ${ROUNDCUBEMAIL_TEMP_DIR} + fi + if [ ! -z "${ROUNDCUBEMAIL_UPLOAD_MAX_FILESIZE}" ]; then echo "upload_max_filesize=${ROUNDCUBEMAIL_UPLOAD_MAX_FILESIZE}" >> /usr/local/etc/php/conf.d/roundcube-override.ini echo "post_max_size=${ROUNDCUBEMAIL_UPLOAD_MAX_FILESIZE}" >> /usr/local/etc/php/conf.d/roundcube-override.ini diff --git a/php-fpm/php.ini b/fpm-alpine/php.ini similarity index 100% rename from php-fpm/php.ini rename to fpm-alpine/php.ini diff --git a/php-fpm/Dockerfile b/fpm/Dockerfile similarity index 99% rename from php-fpm/Dockerfile rename to fpm/Dockerfile index fa12504..0165342 100644 --- a/php-fpm/Dockerfile +++ b/fpm/Dockerfile @@ -45,9 +45,11 @@ RUN set -ex; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ rm -rf /var/lib/apt/lists/* + # expose these volumes VOLUME /var/roundcube/config VOLUME /var/www/html +VOLUME /tmp/roundcube-temp # Define Roundcubemail version ENV ROUNDCUBEMAIL_VERSION 1.3.9 diff --git a/fpm/docker-compose.yml b/fpm/docker-compose.yml new file mode 100644 index 0000000..dac7526 --- /dev/null +++ b/fpm/docker-compose.yml @@ -0,0 +1,102 @@ +version: "2" + +services: + roundcube: + build: ./ + container_name: roundcube + #restart: always + depends_on: + - roundcubedb + links: + - roundcubedb + ports: + - 9000:9000 + volumes: + - /srv/roundcube/html:/var/www/html + environment: + - ROUNDCUBEMAIL_DB_TYPE=pgsql + - ROUNDCUBEMAIL_DB_HOST=roundcubedb # same as pgsql container name + - ROUNDCUBEMAIL_DB_NAME=roundcube # same as pgsql POSTGRES_DB env name + - ROUNDCUBEMAIL_DB_USER=roundcube # same as pgsql POSTGRES_USER env name + - ROUNDCUBEMAIL_DB_PASSWORD=roundcube # same as pgsql POSTGRES_PASSWORD env name + + roundcubedb: + image: postgres:latest + container_name: roundcubedb + restart: always + ports: + - 5432:5432 + volumes: + - /srv/roundcube/db:/var/lib/postgresql/data + environment: + - POSTGRES_DB=roundcube + - POSTGRES_USER=roundcube + - POSTGRES_PASSWORD=roundcube + + roundcubenginx: + image: nginx:latest + container_name: roundcubenginx + restart: always + ports: + - 80:80 + # If you need SSL connection + # - '443:443' + depends_on: + - roundcube + links: + - roundcube + volumes: + - /srv/roundcube/html:/var/www/html + # TODO Provide a custom nginx conf + #- ./nginx.conf:/etc/nginx/nginx.conf:ro + # If you need SSL connection, you can provide your own certificates + # - ./certs:/etc/letsencrypt + # - ./certs-data:/data/letsencrypt + environment: + - NGINX_HOST=localhost # set your local domain or your live domain + # - NGINX_CGI=roundcube:9000 # same as roundcube container name + + # Sample mail server to use with RoundCube: https://github.com/tomav/docker-mailserver +# mailserver: +# image: tvial/docker-mailserver:latest +# hostname: mail +# domainname: +# container_name: mail +# restart: always +# ports: +# # receiving email from other mailservers +# - "25:25" +# # SSL & TLS Client email submission (SMTP) +# - "465:465" +# - "587:587" +# # StartTLS & TLS/SSL IMAP client +# - "143:143" +# - "993:993" +# # POP3 & TLS/SSL POP3 client +# - "110:110" +# - "995:995" +# # Manage Sieve port +# - "4190:4190" +# environment: +# - DMS_DEBUG=0 +# - ONE_DIR=1 +# - ENABLE_CLAMAV=1 +# - ENABLE_FAIL2BAN=1 +# - ENABLE_POSTGREY=1 +# - ENABLE_MANAGESIEVE=1 +# # If you need SSL connection, you can provide your own certificates +# #- SSL_TYPE=manual +# #- SSL_CERT_PATH=/etc/letsencrypt/fullchain.pem +# #- SSL_KEY_PATH=/etc/letsencrypt/privkey.pem +# cap_add: +# - NET_ADMIN +# - SYS_PTRACE +# volumes: +# - /srv/mail/data:/var/mail +# - /srv/mail/state:/var/mail-state +# # For proper delivery, generate DKIM keys in /srv/mail/setup +# - /srv/mail/setup:/tmp/docker-mailserver +# - /etc/localtime:/etc/localtime:ro +# - /etc/timezone:/etc/timezone:ro +# # If you need SSL connection, you can provide your own certificates +# # - ./certs:/etc/letsencrypt diff --git a/fpm/docker-entrypoint.sh b/fpm/docker-entrypoint.sh new file mode 100755 index 0000000..4262293 --- /dev/null +++ b/fpm/docker-entrypoint.sh @@ -0,0 +1,100 @@ +#!/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 - + 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_PORT:=5432}" + : "${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}:${ROUNDCUBEMAIL_DB_PORT} -t 30 + elif [ ! -z "${!MYSQL_ENV_MYSQL_*}" ] || [ "$ROUNDCUBEMAIL_DB_TYPE" == "mysql" ]; then + : "${ROUNDCUBEMAIL_DB_TYPE:=mysql}" + : "${ROUNDCUBEMAIL_DB_HOST:=mysql}" + : "${ROUNDCUBEMAIL_DB_PORT:=3306}" + : "${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}:${ROUNDCUBEMAIL_DB_PORT} -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:=/tmp/roundcube-temp}" + + if [ ! -e config/config.inc.php ]; then + ROUNDCUBEMAIL_PLUGINS_PHP=`echo "${ROUNDCUBEMAIL_PLUGINS}" | sed -E "s/[, ]+/', '/g"` + touch config/config.inc.php + + echo "Write config to $PWD/config/config.inc.php" + echo " config/config.inc.php + + for fn in `ls /var/roundcube/config/*.php 2>/dev/null || true`; 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_TEMP_DIR}" ]; then + mkdir -p ${ROUNDCUBEMAIL_TEMP_DIR} && chown www-data ${ROUNDCUBEMAIL_TEMP_DIR} + fi + + if [ ! -z "${ROUNDCUBEMAIL_UPLOAD_MAX_FILESIZE}" ]; then + echo "upload_max_filesize=${ROUNDCUBEMAIL_UPLOAD_MAX_FILESIZE}" >> /usr/local/etc/php/conf.d/roundcube-override.ini + echo "post_max_size=${ROUNDCUBEMAIL_UPLOAD_MAX_FILESIZE}" >> /usr/local/etc/php/conf.d/roundcube-override.ini + fi +fi + +exec "$@" diff --git a/fpm/php.ini b/fpm/php.ini new file mode 100644 index 0000000..7b2147d --- /dev/null +++ b/fpm/php.ini @@ -0,0 +1,10 @@ +memory_limit=64M +display_errors=Off +log_errors=On +upload_max_filesize=5M +post_max_size=6M +zlib.output_compression=Off +session.auto_start=Off +session.gc_maxlifetime=21600 +session.gc_divisor=500 +session.gc_probability=1