Skip to content

Commit d9f6ba6

Browse files
committed
Use pecl to manage redis ext for all images
1 parent 3098557 commit d9f6ba6

11 files changed

Lines changed: 21 additions & 28 deletions

File tree

5.4/apache/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ VOLUME /var/www/html
66
RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev \
77
&& docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
88
&& docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip \
9-
&& pecl install redis \
10-
&& docker-php-ext-enable redis \
9+
&& pecl install redis-2.2.8 \
10+
&& docker-php-ext-enable redis \
1111
&& a2enmod rewrite \
1212
&& rm -rf /var/lib/apt/lists/*
1313

5.4/fpm/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ VOLUME /var/www/html
66
RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev \
77
&& docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
88
&& docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip \
9-
&& pecl install redis \
10-
&& docker-php-ext-enable redis \
9+
&& pecl install redis-2.2.8 \
10+
&& docker-php-ext-enable redis \
1111
&& rm -rf /var/lib/apt/lists/*
1212

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

5.5/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev sudo
88
&& docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
99
&& docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip \
1010
&& docker-php-ext-install opcache \
11-
&& pecl install redis \
11+
&& pecl install redis-2.2.8 \
1212
&& docker-php-ext-enable redis \
1313
&& curl -sS https://getcomposer.org/installer | php \
1414
&& mv composer.phar /usr/local/bin/composer \

5.5/apache/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev \
77
&& docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
88
&& docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip \
99
&& docker-php-ext-install opcache \
10-
&& pecl install redis \
11-
&& docker-php-ext-enable redis \
10+
&& pecl install redis-2.2.8 \
11+
&& docker-php-ext-enable redis \
1212
&& a2enmod rewrite \
1313
&& rm -rf /var/lib/apt/lists/*
1414

5.5/fpm/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev \
77
&& docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
88
&& docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip \
99
&& docker-php-ext-install opcache \
10-
&& pecl install redis \
11-
&& docker-php-ext-enable redis \
10+
&& pecl install redis-2.2.8 \
11+
&& docker-php-ext-enable redis \
1212
&& rm -rf /var/lib/apt/lists/*
1313

1414
COPY opcache-recommended.ini drupal.ini /usr/local/etc/php/conf.d/

5.6/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev sudo
88
&& docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
99
&& docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip \
1010
&& docker-php-ext-install opcache \
11-
&& pecl install redis \
11+
&& pecl install redis-2.2.8 \
1212
&& docker-php-ext-enable redis \
1313
&& curl -sS https://getcomposer.org/installer | php \
1414
&& mv composer.phar /usr/local/bin/composer \

5.6/apache/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev \
77
&& docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
88
&& docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip \
99
&& docker-php-ext-install opcache \
10-
&& pecl install redis \
11-
&& docker-php-ext-enable redis \
10+
&& pecl install redis-2.2.8 \
11+
&& docker-php-ext-enable redis \
1212
&& a2enmod rewrite \
1313
&& rm -rf /var/lib/apt/lists/*
1414

5.6/fpm/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev \
77
&& docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
88
&& docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip \
99
&& docker-php-ext-install opcache \
10-
&& pecl install redis \
11-
&& docker-php-ext-enable redis \
10+
&& pecl install redis-2.2.8 \
11+
&& docker-php-ext-enable redis \
1212
&& rm -rf /var/lib/apt/lists/*
1313

1414
COPY opcache-recommended.ini drupal.ini /usr/local/etc/php/conf.d/

7.0/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,11 @@ MAINTAINER drupal-docker
44
VOLUME /var/www/html
55
WORKDIR /var/www/html
66

7-
ADD https://github.com/phpredis/phpredis/archive/php7.zip /tmp/php7.zip
87
RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev sudo git \
9-
&& pecl install redis-3.0.0 \
108
&& docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
119
&& docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip \
1210
&& docker-php-ext-install opcache \
11+
&& pecl install redis-3.0.0 \
1312
&& docker-php-ext-enable redis \
1413
&& curl -sS https://getcomposer.org/installer | php \
1514
&& mv composer.phar /usr/local/bin/composer \

7.0/apache/Dockerfile

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,12 @@ MAINTAINER drupal-docker
33

44
VOLUME /var/www/html
55

6-
ADD https://github.com/phpredis/phpredis/archive/php7.zip /tmp/php7.zip
7-
RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev unzip \
8-
&& unzip /tmp/php7.zip -d /usr/src/php/ext \
9-
&& mv /usr/src/php/ext/phpredis-php7 /usr/src/php/ext/redis \
6+
RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev \
107
&& docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
118
&& docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip redis \
129
&& docker-php-ext-install opcache \
13-
&& rm -fr /tmp/php7.zip \
14-
&& apt-get -y purge unzip \
10+
&& pecl install redis-3.0.0 \
11+
&& docker-php-ext-enable redis \
1512
&& a2enmod rewrite \
1613
&& rm -rf /var/lib/apt/lists/*
1714

0 commit comments

Comments
 (0)