Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions 5.4/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/
7 changes: 3 additions & 4 deletions 5.4/apache/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions 5.4/fpm/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/
10 changes: 4 additions & 6 deletions 5.5/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/
13 changes: 5 additions & 8 deletions 5.5/apache/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/
10 changes: 4 additions & 6 deletions 5.5/fpm/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/
10 changes: 4 additions & 6 deletions 5.6/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/
13 changes: 5 additions & 8 deletions 5.6/apache/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/
10 changes: 4 additions & 6 deletions 5.6/fpm/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/
12 changes: 5 additions & 7 deletions 7.0/Dockerfile
Original file line number Diff line number Diff line change
@@ -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/
15 changes: 6 additions & 9 deletions 7.0/apache/Dockerfile
Original file line number Diff line number Diff line change
@@ -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/
12 changes: 5 additions & 7 deletions 7.0/fpm/Dockerfile
Original file line number Diff line number Diff line change
@@ -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/