Change code style to the common format used by upstream images

diff --git a/php-apache/Dockerfile b/php-apache/Dockerfile
index 115d87a016963231d918faa4f9130d8e9d5b3975..29a7ee157c35800279613768e3f95cb1ca757b77 100644 (file)
--- a/php-apache/Dockerfile
+++ b/php-apache/Dockerfile
@@ -1,20 +1,36 @@
 FROM php:7.1-apache
 LABEL 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
+RUN set -ex; \
+       apt-get update; \
+       \
+       apt-get install -y --no-install-recommends \
+               libfreetype6-dev \
+               libicu-dev \
+               libjpeg62-turbo-dev \
+               libldap2-dev \
+               libpng-dev \
+               libpq-dev \
+               libsqlite3-dev \
+               zlib1g-dev \
+       ; \
+       \
+       debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
+       docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
+       docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
+       docker-php-ext-install \
+               exif \
+               gd \
+               intl \
+               ldap \
+               pdo \
+               pdo_mysql \
+               pdo_pgsql \
+               pdo_sqlite \
+               zip \
+       ; \
+       \
+       rm -rf /var/lib/apt/lists/*
 
 # enable mod_rewrite
 RUN a2enmod rewrite
@@ -27,17 +43,18 @@ VOLUME /tmp/roundcube-temp
 ENV ROUNDCUBEMAIL_VERSION 1.3.6
 
 # 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
+RUN set -ex; \
+       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
@@ -46,4 +63,3 @@ COPY docker-entrypoint.sh /
 
 ENTRYPOINT ["/docker-entrypoint.sh"]
 CMD ["apache2-foreground"]
-

diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
index 79c226c59cdb1192d4e67f178af055063e90bd7d..f68cb9e837d54af7074c29c2c83dfb82440e9bdc 100644 (file)
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -1,20 +1,36 @@
 FROM php:7.1-fpm
 LABEL 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
+RUN set -ex; \
+       apt-get update; \
+       \
+       apt-get install -y --no-install-recommends \
+               libfreetype6-dev \
+               libicu-dev \
+               libjpeg62-turbo-dev \
+               libldap2-dev \
+               libpng-dev \
+               libpq-dev \
+               libsqlite3-dev \
+               zlib1g-dev \
+       ; \
+       \
+       debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
+       docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
+       docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
+       docker-php-ext-install \
+               exif \
+               gd \
+               intl \
+               ldap \
+               pdo \
+               pdo_mysql \
+               pdo_pgsql \
+               pdo_sqlite \
+               zip \
+       ; \
+       \
+       rm -rf /var/lib/apt/lists/*
 
 # expose these volumes
 VOLUME /var/roundcube/config
@@ -24,17 +40,18 @@ VOLUME /var/www/html
 ENV ROUNDCUBEMAIL_VERSION 1.3.6
 
 # 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
+RUN set -ex; \
+       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
@@ -43,4 +60,3 @@ COPY docker-entrypoint.sh /
 
 ENTRYPOINT ["/docker-entrypoint.sh"]
 CMD ["php-fpm"]
-