fix memcached

webdevops · Dec 4, 2020 · d27254c · d27254c
1 parent d29fb10
commit d27254c
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 25 deletions.
diff --git a/docker/php-official/7.0/Dockerfile b/docker/php-official/7.0/Dockerfile
@@ -194,7 +194,7 @@ RUN set -x \
         opcache \
     # Install extensions for PHP 7.x
     && pecl install apcu \
-    && printf "no --disable-memcached-sasl\n" | pecl install memcached-3.0.4 \
+    && printf "no --disable-memcached-sasl\n" | pecl install memcached \
     && echo extension=memcached.so > /usr/local/etc/php/conf.d/memcached.ini \
     # Install vips (only works with PHP >= 7.0)
     && printf "\n" | pecl install vips \

diff --git a/docker/php-official/7.1/Dockerfile b/docker/php-official/7.1/Dockerfile
@@ -194,7 +194,7 @@ RUN set -x \
         opcache \
     # Install extensions for PHP 7.x
     && pecl install apcu \
-    && printf "no --disable-memcached-sasl\n" | pecl install memcached-3.0.4 \
+    && printf "no --disable-memcached-sasl\n" | pecl install memcached \
     && echo extension=memcached.so > /usr/local/etc/php/conf.d/memcached.ini \
     # Install vips (only works with PHP >= 7.0)
     && printf "\n" | pecl install vips \

diff --git a/docker/php-official/7.2/Dockerfile b/docker/php-official/7.2/Dockerfile
@@ -193,7 +193,7 @@ RUN set -x \
         opcache \
     # Install extensions for PHP 7.x
     && pecl install apcu \
-    && printf "no --disable-memcached-sasl\n" | pecl install memcached-3.0.4 \
+    && printf "no --disable-memcached-sasl\n" | pecl install memcached \
     && echo extension=memcached.so > /usr/local/etc/php/conf.d/memcached.ini \
     # Install vips (only works with PHP >= 7.0)
     && printf "\n" | pecl install vips \

diff --git a/docker/php-official/7.3/Dockerfile b/docker/php-official/7.3/Dockerfile
@@ -193,12 +193,8 @@ RUN set -x \
         opcache \
     # Install extensions for PHP 7.x
     && pecl install apcu \
-    # Memcached for 7.3 can currently only be built from master
-    && MEMCACHED="`mktemp -d`" \
-    && curl -skL https://github.com/php-memcached-dev/php-memcached/archive/master.tar.gz | tar zxf - --strip-components 1 -C $MEMCACHED \
-    && docker-php-ext-configure $MEMCACHED \
-    && docker-php-ext-install $MEMCACHED \
-    && rm -rf $MEMCACHED \
+    && printf "no --disable-memcached-sasl\n" | pecl install memcached \
+    && echo extension=memcached.so > /usr/local/etc/php/conf.d/memcached.ini \
     # Install vips (only works with PHP >= 7.0)
     && printf "\n" | pecl install vips \
     && echo extension=vips.so > /usr/local/etc/php/conf.d/vips.ini \

diff --git a/docker/php-official/7.4/Dockerfile b/docker/php-official/7.4/Dockerfile
@@ -192,12 +192,8 @@ RUN set -x \
         opcache \
     # Install extensions for PHP 7.x
     && pecl install apcu \
-    # Memcached for 7.3 can currently only be built from master
-    && MEMCACHED="`mktemp -d`" \
-    && curl -skL https://github.com/php-memcached-dev/php-memcached/archive/master.tar.gz | tar zxf - --strip-components 1 -C $MEMCACHED \
-    && docker-php-ext-configure $MEMCACHED \
-    && docker-php-ext-install $MEMCACHED \
-    && rm -rf $MEMCACHED \
+    && printf "no --disable-memcached-sasl\n" | pecl install memcached \
+    && echo extension=memcached.so > /usr/local/etc/php/conf.d/memcached.ini \
     # Install vips (only works with PHP >= 7.0)
     && printf "\n" | pecl install vips \
     && echo extension=vips.so > /usr/local/etc/php/conf.d/vips.ini \

diff --git a/template/Dockerfile/images/php.jinja2 b/template/Dockerfile/images/php.jinja2
@@ -129,17 +129,8 @@
 {%- else %}
     # Install extensions for PHP 7.x
     && pecl install apcu \
-    {%- if version == '7.3' or version == '7.4' or version == '8.0' %}
-    # Memcached for 7.3 can currently only be built from master
-    && MEMCACHED="`mktemp -d`" \
-    && curl -skL https://github.com/php-memcached-dev/php-memcached/archive/master.tar.gz | tar zxf - --strip-components 1 -C $MEMCACHED \
-    && docker-php-ext-configure $MEMCACHED \
-    && docker-php-ext-install $MEMCACHED \
-    && rm -rf $MEMCACHED \
-    {%- else %}
-    && printf "no --disable-memcached-sasl\n" | pecl install memcached-3.0.4 \
+    && printf "no --disable-memcached-sasl\n" | pecl install memcached \
     && echo extension=memcached.so > /usr/local/etc/php/conf.d/memcached.ini \
-    {%- endif %}
     # Install vips (only works with PHP >= 7.0)
     && printf "\n" | pecl install vips \
     && echo extension=vips.so > /usr/local/etc/php/conf.d/vips.ini \