Skip to content

Commit f4114cb

Browse files
zaporyliezaporylie
committed
Merge branch 'master' into update-readme
2 parents ce8db2e + 6103fbf commit f4114cb

12 files changed

Lines changed: 49 additions & 71 deletions

File tree

‎5.4/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ VOLUME /var/www/html
55
WORKDIR /var/www/html
66

77
RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev \
8-
&& rm -rf /var/lib/apt/lists/* \
98
&& docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
10-
&& docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip
9+
&& docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip \
10+
&& rm -rf /var/lib/apt/lists/*
1111

1212
COPY drupal.ini /usr/local/etc/php/conf.d/

‎5.4/apache/Dockerfile‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@ MAINTAINER drupal-docker
44
VOLUME /var/www/html
55

66
RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev \
7-
&& rm -rf /var/lib/apt/lists/* \
87
&& docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
9-
&& docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip
8+
&& docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip \
9+
&& a2enmod rewrite \
10+
&& rm -rf /var/lib/apt/lists/*
1011

1112
COPY drupal.ini /usr/local/etc/php/conf.d/
12-
13-
RUN a2enmod rewrite

‎5.4/fpm/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ MAINTAINER drupal-docker
44
VOLUME /var/www/html
55

66
RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev \
7-
&& rm -rf /var/lib/apt/lists/* \
87
&& docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
9-
&& docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip
8+
&& docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip \
9+
&& rm -rf /var/lib/apt/lists/*
1010

1111
COPY drupal.ini /usr/local/etc/php/conf.d/

‎5.5/Dockerfile‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,9 @@ VOLUME /var/www/html
55
WORKDIR /var/www/html
66

77
RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev \
8-
&& rm -rf /var/lib/apt/lists/* \
98
&& docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
10-
&& docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip
9+
&& docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip \
10+
&& docker-php-ext-install opcache \
11+
&& rm -rf /var/lib/apt/lists/*
1112

12-
RUN docker-php-ext-install opcache
13-
14-
COPY opcache-recommended.ini /usr/local/etc/php/conf.d/
15-
COPY drupal.ini /usr/local/etc/php/conf.d/
13+
COPY opcache-recommended.ini drupal.ini /usr/local/etc/php/conf.d/

‎5.5/apache/Dockerfile‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,10 @@ MAINTAINER drupal-docker
44
VOLUME /var/www/html
55

66
RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev \
7-
&& rm -rf /var/lib/apt/lists/* \
87
&& docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
9-
&& docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip
8+
&& docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip \
9+
&& docker-php-ext-install opcache \
10+
&& a2enmod rewrite \
11+
&& rm -rf /var/lib/apt/lists/*
1012

11-
RUN docker-php-ext-install opcache
12-
13-
COPY opcache-recommended.ini /usr/local/etc/php/conf.d/
14-
COPY drupal.ini /usr/local/etc/php/conf.d/
15-
16-
RUN a2enmod rewrite
13+
COPY opcache-recommended.ini drupal.ini /usr/local/etc/php/conf.d/

‎5.5/fpm/Dockerfile‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,9 @@ MAINTAINER drupal-docker
44
VOLUME /var/www/html
55

66
RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev \
7-
&& rm -rf /var/lib/apt/lists/* \
87
&& docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
9-
&& docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip
8+
&& docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip \
9+
&& docker-php-ext-install opcache \
10+
&& rm -rf /var/lib/apt/lists/*
1011

11-
RUN docker-php-ext-install opcache
12-
13-
COPY opcache-recommended.ini /usr/local/etc/php/conf.d/
14-
COPY drupal.ini /usr/local/etc/php/conf.d/
12+
COPY opcache-recommended.ini drupal.ini /usr/local/etc/php/conf.d/

‎5.6/Dockerfile‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,9 @@ VOLUME /var/www/html
55
WORKDIR /var/www/html
66

77
RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev \
8-
&& rm -rf /var/lib/apt/lists/* \
98
&& docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
10-
&& docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip
9+
&& docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip \
10+
&& docker-php-ext-install opcache \
11+
&& rm -rf /var/lib/apt/lists/*
1112

12-
RUN docker-php-ext-install opcache
13-
14-
COPY opcache-recommended.ini /usr/local/etc/php/conf.d/
15-
COPY drupal.ini /usr/local/etc/php/conf.d/
13+
COPY opcache-recommended.ini drupal.ini /usr/local/etc/php/conf.d/

‎5.6/apache/Dockerfile‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,10 @@ MAINTAINER drupal-docker
44
VOLUME /var/www/html
55

66
RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev \
7-
&& rm -rf /var/lib/apt/lists/* \
87
&& docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
9-
&& docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip
8+
&& docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip \
9+
&& docker-php-ext-install opcache \
10+
&& a2enmod rewrite \
11+
&& rm -rf /var/lib/apt/lists/*
1012

11-
RUN docker-php-ext-install opcache
12-
13-
COPY opcache-recommended.ini /usr/local/etc/php/conf.d/
14-
COPY drupal.ini /usr/local/etc/php/conf.d/
15-
16-
RUN a2enmod rewrite
13+
COPY opcache-recommended.ini drupal.ini /usr/local/etc/php/conf.d/

‎5.6/fpm/Dockerfile‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,9 @@ MAINTAINER drupal-docker
44
VOLUME /var/www/html
55

66
RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev \
7-
&& rm -rf /var/lib/apt/lists/* \
87
&& docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
9-
&& docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip
8+
&& docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip \
9+
&& docker-php-ext-install opcache \
10+
&& rm -rf /var/lib/apt/lists/*
1011

11-
RUN docker-php-ext-install opcache
12-
13-
COPY opcache-recommended.ini /usr/local/etc/php/conf.d/
14-
COPY drupal.ini /usr/local/etc/php/conf.d/
12+
COPY opcache-recommended.ini drupal.ini /usr/local/etc/php/conf.d/

‎7.0/Dockerfile‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
1-
FROM php:7-cli
1+
FROM php:7.0-cli
22
MAINTAINER drupal-docker
33

44
VOLUME /var/www/html
55
WORKDIR /var/www/html
66

77
RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev \
8-
&& rm -rf /var/lib/apt/lists/* \
98
&& docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
10-
&& docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip
9+
&& docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip \
10+
&& docker-php-ext-install opcache \
11+
&& rm -rf /var/lib/apt/lists/*
1112

12-
RUN docker-php-ext-install opcache
13-
14-
COPY opcache-recommended.ini /usr/local/etc/php/conf.d/
15-
COPY drupal.ini /usr/local/etc/php/conf.d/
13+
COPY opcache-recommended.ini drupal.ini /usr/local/etc/php/conf.d/

0 commit comments

Comments
 (0)