Skip to content

Commit b39f8a4

Browse files
authored
Merge pull request #39 from drupal-docker/issue/38
Fix issue #38
2 parents 2b6107d + fe93e99 commit b39f8a4

12 files changed

Lines changed: 27 additions & 36 deletions

File tree

5.4/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ WORKDIR /var/www/html
77
RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev sudo git \
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 \
10-
&& pecl install redis \
10+
&& pecl install redis-2.2.8 \
1111
&& docker-php-ext-enable redis \
1212
&& curl -sS https://getcomposer.org/installer | php \
1313
&& mv composer.phar /usr/local/bin/composer \

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: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,15 @@ 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
8-
RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev sudo unzip git \
9-
&& unzip /tmp/php7.zip -d /usr/src/php/ext \
10-
&& mv /usr/src/php/ext/phpredis-php7 /usr/src/php/ext/redis \
7+
RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev sudo git \
118
&& docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
12-
&& docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip redis \
9+
&& docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip \
1310
&& docker-php-ext-install opcache \
11+
&& pecl install redis-3.0.0 \
12+
&& docker-php-ext-enable redis \
1413
&& curl -sS https://getcomposer.org/installer | php \
1514
&& mv composer.phar /usr/local/bin/composer \
1615
&& echo "export PATH=~/.composer/vendor/bin:\$PATH" >> ~/.bash_profile \
17-
&& rm -fr /tmp/php7.zip \
18-
&& apt-get -y purge unzip \
1916
&& rm -rf /var/lib/apt/lists/*
2017

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

0 commit comments

Comments
 (0)