From 56edaf9c12a3bbfb06052d8a7ad26c81203de1f4 Mon Sep 17 00:00:00 2001 From: Niclas Mietz Date: Thu, 25 Aug 2016 16:45:24 +0200 Subject: [PATCH] Use fewer layers vor environment variables --- Dockerfile | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 644ee53..259d9be 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,20 +1,18 @@ FROM php:5.6-apache MAINTAINER Jonas Thiel -ENV ROUNDCUBE_VERSION 1.2.1 -ENV RELEASE_DATE 2016-08-25 - -ENV ROUNDCUBE_DIR /var/www/html -ENV ROUNDCUBE_PACKAGE roundcubemail-$ROUNDCUBE_VERSION -ENV ROUNDCUBE_VARIANT $ROUNDCUBE_PACKAGE-complete -ENV ROUNDCUBE_DOWNLOAD https://github.com/roundcube/roundcubemail/releases/download/$ROUNDCUBE_VERSION/$ROUNDCUBE_VARIANT.tar.gz - -ENV TIMEZONE Europe/Berlin +ENV ROUNDCUBE_VERSION=1.2.1 \ + RELEASE_DATE=2016-08-25 \ + ROUNDCUBE_DIR=/var/www/html \ + ROUNDCUBE_PACKAGE=roundcubemail-$ROUNDCUBE_VERSION \ + ROUNDCUBE_VARIANT=$ROUNDCUBE_PACKAGE-complete \ + ROUNDCUBE_DOWNLOAD=https://github.com/roundcube/roundcubemail/releases/download/$ROUNDCUBE_VERSION/$ROUNDCUBE_VARIANT.tar.gz \ + TIMEZONE=Europe/Berlin RUN a2enmod rewrite expires headers -ENV REQUIRED_PACKAGES mysql-client libicu-dev libldap2-dev -ENV REQUIRED_PEAR mail_mime mail_mimedecode net_smtp net_idna2-beta auth_sasl net_sieve crypt_gpg +ENV REQUIRED_PACKAGES="mysql-client libicu-dev libldap2-dev" \ + REQUIRED_PEAR="mail_mime mail_mimedecode net_smtp net_idna2-beta auth_sasl net_sieve crypt_gpg" RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y -q --no-install-recommends \ $REQUIRED_PACKAGES \