From b80f38342f9a4dd1d5732a6d3fe7ec480bcc5f7f Mon Sep 17 00:00:00 2001 From: zaporylie Date: Mon, 22 Feb 2016 18:57:04 +0100 Subject: [PATCH] Aggregate commands to reduce image size --- 5.4/Dockerfile | 4 ++-- 5.4/apache/Dockerfile | 7 +++---- 5.4/fpm/Dockerfile | 4 ++-- 5.5/Dockerfile | 10 ++++------ 5.5/apache/Dockerfile | 13 +++++-------- 5.5/fpm/Dockerfile | 10 ++++------ 5.6/Dockerfile | 10 ++++------ 5.6/apache/Dockerfile | 13 +++++-------- 5.6/fpm/Dockerfile | 10 ++++------ 7.0/Dockerfile | 12 +++++------- 7.0/apache/Dockerfile | 15 ++++++--------- 7.0/fpm/Dockerfile | 12 +++++------- 12 files changed, 49 insertions(+), 71 deletions(-) diff --git a/5.4/Dockerfile b/5.4/Dockerfile index b54f760..19acf3f 100644 --- a/5.4/Dockerfile +++ b/5.4/Dockerfile @@ -5,8 +5,8 @@ VOLUME /var/www/html WORKDIR /var/www/html RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev \ - && rm -rf /var/lib/apt/lists/* \ && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ - && docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip + && docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip \ + && rm -rf /var/lib/apt/lists/* COPY drupal.ini /usr/local/etc/php/conf.d/ diff --git a/5.4/apache/Dockerfile b/5.4/apache/Dockerfile index b551040..8bc3661 100644 --- a/5.4/apache/Dockerfile +++ b/5.4/apache/Dockerfile @@ -4,10 +4,9 @@ MAINTAINER drupal-docker VOLUME /var/www/html RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev \ - && rm -rf /var/lib/apt/lists/* \ && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ - && docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip + && docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip \ + && a2enmod rewrite \ + && rm -rf /var/lib/apt/lists/* COPY drupal.ini /usr/local/etc/php/conf.d/ - -RUN a2enmod rewrite diff --git a/5.4/fpm/Dockerfile b/5.4/fpm/Dockerfile index 82cd713..fa6dbaa 100644 --- a/5.4/fpm/Dockerfile +++ b/5.4/fpm/Dockerfile @@ -4,8 +4,8 @@ MAINTAINER drupal-docker VOLUME /var/www/html RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev \ - && rm -rf /var/lib/apt/lists/* \ && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ - && docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip + && docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip \ + && rm -rf /var/lib/apt/lists/* COPY drupal.ini /usr/local/etc/php/conf.d/ diff --git a/5.5/Dockerfile b/5.5/Dockerfile index 5d0a6f3..5468431 100644 --- a/5.5/Dockerfile +++ b/5.5/Dockerfile @@ -5,11 +5,9 @@ VOLUME /var/www/html WORKDIR /var/www/html RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev \ - && rm -rf /var/lib/apt/lists/* \ && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ - && docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip + && docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip \ + && docker-php-ext-install opcache \ + && rm -rf /var/lib/apt/lists/* -RUN docker-php-ext-install opcache - -COPY opcache-recommended.ini /usr/local/etc/php/conf.d/ -COPY drupal.ini /usr/local/etc/php/conf.d/ +COPY opcache-recommended.ini drupal.ini /usr/local/etc/php/conf.d/ diff --git a/5.5/apache/Dockerfile b/5.5/apache/Dockerfile index c010f4f..a3127f1 100644 --- a/5.5/apache/Dockerfile +++ b/5.5/apache/Dockerfile @@ -4,13 +4,10 @@ MAINTAINER drupal-docker VOLUME /var/www/html RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev \ - && rm -rf /var/lib/apt/lists/* \ && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ - && docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip + && docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip \ + && docker-php-ext-install opcache \ + && a2enmod rewrite \ + && rm -rf /var/lib/apt/lists/* -RUN docker-php-ext-install opcache - -COPY opcache-recommended.ini /usr/local/etc/php/conf.d/ -COPY drupal.ini /usr/local/etc/php/conf.d/ - -RUN a2enmod rewrite +COPY opcache-recommended.ini drupal.ini /usr/local/etc/php/conf.d/ diff --git a/5.5/fpm/Dockerfile b/5.5/fpm/Dockerfile index 19152fb..c922ce8 100644 --- a/5.5/fpm/Dockerfile +++ b/5.5/fpm/Dockerfile @@ -4,11 +4,9 @@ MAINTAINER drupal-docker VOLUME /var/www/html RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev \ - && rm -rf /var/lib/apt/lists/* \ && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ - && docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip + && docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip \ + && docker-php-ext-install opcache \ + && rm -rf /var/lib/apt/lists/* -RUN docker-php-ext-install opcache - -COPY opcache-recommended.ini /usr/local/etc/php/conf.d/ -COPY drupal.ini /usr/local/etc/php/conf.d/ +COPY opcache-recommended.ini drupal.ini /usr/local/etc/php/conf.d/ diff --git a/5.6/Dockerfile b/5.6/Dockerfile index 8409082..ee5813c 100644 --- a/5.6/Dockerfile +++ b/5.6/Dockerfile @@ -5,11 +5,9 @@ VOLUME /var/www/html WORKDIR /var/www/html RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev \ - && rm -rf /var/lib/apt/lists/* \ && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ - && docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip + && docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip \ + && docker-php-ext-install opcache \ + && rm -rf /var/lib/apt/lists/* -RUN docker-php-ext-install opcache - -COPY opcache-recommended.ini /usr/local/etc/php/conf.d/ -COPY drupal.ini /usr/local/etc/php/conf.d/ +COPY opcache-recommended.ini drupal.ini /usr/local/etc/php/conf.d/ diff --git a/5.6/apache/Dockerfile b/5.6/apache/Dockerfile index 2d75b95..c41adf4 100644 --- a/5.6/apache/Dockerfile +++ b/5.6/apache/Dockerfile @@ -4,13 +4,10 @@ MAINTAINER drupal-docker VOLUME /var/www/html RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev \ - && rm -rf /var/lib/apt/lists/* \ && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ - && docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip + && docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip \ + && docker-php-ext-install opcache \ + && a2enmod rewrite \ + && rm -rf /var/lib/apt/lists/* -RUN docker-php-ext-install opcache - -COPY opcache-recommended.ini /usr/local/etc/php/conf.d/ -COPY drupal.ini /usr/local/etc/php/conf.d/ - -RUN a2enmod rewrite +COPY opcache-recommended.ini drupal.ini /usr/local/etc/php/conf.d/ diff --git a/5.6/fpm/Dockerfile b/5.6/fpm/Dockerfile index 71e77e7..187b9a4 100644 --- a/5.6/fpm/Dockerfile +++ b/5.6/fpm/Dockerfile @@ -4,11 +4,9 @@ MAINTAINER drupal-docker VOLUME /var/www/html RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev \ - && rm -rf /var/lib/apt/lists/* \ && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ - && docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip + && docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip \ + && docker-php-ext-install opcache \ + && rm -rf /var/lib/apt/lists/* -RUN docker-php-ext-install opcache - -COPY opcache-recommended.ini /usr/local/etc/php/conf.d/ -COPY drupal.ini /usr/local/etc/php/conf.d/ +COPY opcache-recommended.ini drupal.ini /usr/local/etc/php/conf.d/ diff --git a/7.0/Dockerfile b/7.0/Dockerfile index 067e2b6..4b54fe0 100644 --- a/7.0/Dockerfile +++ b/7.0/Dockerfile @@ -1,15 +1,13 @@ -FROM php:7-cli +FROM php:7.0-cli MAINTAINER drupal-docker VOLUME /var/www/html WORKDIR /var/www/html RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev \ - && rm -rf /var/lib/apt/lists/* \ && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ - && docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip + && docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip \ + && docker-php-ext-install opcache \ + && rm -rf /var/lib/apt/lists/* -RUN docker-php-ext-install opcache - -COPY opcache-recommended.ini /usr/local/etc/php/conf.d/ -COPY drupal.ini /usr/local/etc/php/conf.d/ +COPY opcache-recommended.ini drupal.ini /usr/local/etc/php/conf.d/ diff --git a/7.0/apache/Dockerfile b/7.0/apache/Dockerfile index e9d707b..f273da0 100644 --- a/7.0/apache/Dockerfile +++ b/7.0/apache/Dockerfile @@ -1,16 +1,13 @@ -FROM php:7-apache +FROM php:7.0-apache MAINTAINER drupal-docker VOLUME /var/www/html RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev \ - && rm -rf /var/lib/apt/lists/* \ && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ - && docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip + && docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip \ + && docker-php-ext-install opcache \ + && a2enmod rewrite \ + && rm -rf /var/lib/apt/lists/* -RUN docker-php-ext-install opcache - -COPY opcache-recommended.ini /usr/local/etc/php/conf.d/ -COPY drupal.ini /usr/local/etc/php/conf.d/ - -RUN a2enmod rewrite +COPY opcache-recommended.ini drupal.ini /usr/local/etc/php/conf.d/ diff --git a/7.0/fpm/Dockerfile b/7.0/fpm/Dockerfile index db32f5c..5814f88 100644 --- a/7.0/fpm/Dockerfile +++ b/7.0/fpm/Dockerfile @@ -1,14 +1,12 @@ -FROM php:7-fpm +FROM php:7.0-fpm MAINTAINER drupal-docker VOLUME /var/www/html RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev \ - && rm -rf /var/lib/apt/lists/* \ && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ - && docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip + && docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip \ + && docker-php-ext-install opcache \ + && rm -rf /var/lib/apt/lists/* -RUN docker-php-ext-install opcache - -COPY opcache-recommended.ini /usr/local/etc/php/conf.d/ -COPY drupal.ini /usr/local/etc/php/conf.d/ +COPY opcache-recommended.ini drupal.ini /usr/local/etc/php/conf.d/