fix xmlrpc alpine 8 and xdebug via pickle

xarmian · Aug 14, 2020 · 1de480a · 1de480a
1 parent 2656793
commit 1de480a
Show file tree

Hide file tree

Showing 16 changed files with 41 additions and 26 deletions.
diff --git a/docker/php-apache-dev/5.6/Dockerfile b/docker/php-apache-dev/5.6/Dockerfile
@@ -23,7 +23,6 @@ RUN set -x \
         blackfire-php \
         blackfire-agent \
     && pecl install xdebug-2.5.5 \
-
     && docker-php-ext-enable xdebug \
     # Enable php development services
     && docker-service enable syslog \

diff --git a/docker/php-apache-dev/8.0-alpine/Dockerfile b/docker/php-apache-dev/8.0-alpine/Dockerfile
@@ -27,7 +27,7 @@ RUN set -x \
         make \
         autoconf \
         g++ \
-    && pecl install xdebug \
+    && pickle install xdebug \
     && apk del -f --purge \
         autoconf \
         g++ \

diff --git a/docker/php-apache-dev/8.0/Dockerfile b/docker/php-apache-dev/8.0/Dockerfile
@@ -22,7 +22,7 @@ RUN set -x \
     && apt-install \
         blackfire-php \
         blackfire-agent \
-    && pecl install xdebug \
+    && pickle install xdebug \
     && docker-php-ext-enable xdebug \
     # Enable php development services
     && docker-service enable syslog \

diff --git a/docker/php-dev/5.6/Dockerfile b/docker/php-dev/5.6/Dockerfile
@@ -15,7 +15,6 @@ RUN set -x \
         blackfire-php \
         blackfire-agent \
     && pecl install xdebug-2.5.5 \
-
     && docker-php-ext-enable xdebug \
     # Enable php development services
     && docker-service enable syslog \

diff --git a/docker/php-dev/8.0-alpine/Dockerfile b/docker/php-dev/8.0-alpine/Dockerfile
@@ -19,7 +19,7 @@ RUN set -x \
         make \
         autoconf \
         g++ \
-    && pecl install xdebug \
+    && pickle install xdebug \
     && apk del -f --purge \
         autoconf \
         g++ \

diff --git a/docker/php-dev/8.0/Dockerfile b/docker/php-dev/8.0/Dockerfile
@@ -14,7 +14,7 @@ RUN set -x \
     && apt-install \
         blackfire-php \
         blackfire-agent \
-    && pecl install xdebug \
+    && pickle install xdebug \
     && docker-php-ext-enable xdebug \
     # Enable php development services
     && docker-service enable syslog \

diff --git a/docker/php-nginx-dev/5.6/Dockerfile b/docker/php-nginx-dev/5.6/Dockerfile
@@ -23,7 +23,6 @@ RUN set -x \
         blackfire-php \
         blackfire-agent \
     && pecl install xdebug-2.5.5 \
-
     && docker-php-ext-enable xdebug \
     # Enable php development services
     && docker-service enable syslog \

diff --git a/docker/php-nginx-dev/8.0-alpine/Dockerfile b/docker/php-nginx-dev/8.0-alpine/Dockerfile
@@ -27,7 +27,7 @@ RUN set -x \
         make \
         autoconf \
         g++ \
-    && pecl install xdebug \
+    && pickle install xdebug \
     && apk del -f --purge \
         autoconf \
         g++ \

diff --git a/docker/php-nginx-dev/8.0/Dockerfile b/docker/php-nginx-dev/8.0/Dockerfile
@@ -22,7 +22,7 @@ RUN set -x \
     && apt-install \
         blackfire-php \
         blackfire-agent \
-    && pecl install xdebug \
+    && pickle install xdebug \
     && docker-php-ext-enable xdebug \
     # Enable php development services
     && docker-service enable syslog \

diff --git a/docker/php-official/5.6/Dockerfile b/docker/php-official/5.6/Dockerfile
@@ -202,7 +202,6 @@ RUN set -x \
     && echo extension=imagick.so > /usr/local/etc/php/conf.d/imagick.ini \
     && echo extension=mongodb.so > /usr/local/etc/php/conf.d/mongodb.ini \
     && echo extension=memcached.so > /usr/local/etc/php/conf.d/memcached.ini \
-
     # Uninstall dev and header packages
     && apt-get purge -y -f --force-yes \
         libc-client-dev \

diff --git a/docker/php-official/7.1-alpine/Dockerfile b/docker/php-official/7.1-alpine/Dockerfile
@@ -196,10 +196,10 @@ RUN set -x \
         gettext \
         opcache \
     # Install extensions for PHP 7.x
-    && pecl install apcu \
     && printf "no --disable-memcached-sasl\n" | pecl install memcached-3.0.4 \
     && docker-php-ext-enable memcached \
     # Install vips (only works with PHP >= 7.0)
+    && pecl install apcu \
     && printf "\n" | pecl install vips \
     && pecl install redis \
     && pecl install mongodb \

diff --git a/docker/php-official/7.2-alpine/Dockerfile b/docker/php-official/7.2-alpine/Dockerfile
@@ -196,14 +196,14 @@ RUN set -x \
         gettext \
         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 \
     # Install vips (only works with PHP >= 7.0)
+    && pecl install apcu \
     && printf "\n" | pecl install vips \
     && pecl install redis \
     && pecl install mongodb \

diff --git a/docker/php-official/7.3-alpine/Dockerfile b/docker/php-official/7.3-alpine/Dockerfile
@@ -196,14 +196,14 @@ RUN set -x \
         gettext \
         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 \
     # Install vips (only works with PHP >= 7.0)
+    && pecl install apcu \
     && printf "\n" | pecl install vips \
     && pecl install redis \
     && pecl install mongodb \

diff --git a/docker/php-official/7.4-alpine/Dockerfile b/docker/php-official/7.4-alpine/Dockerfile
@@ -196,14 +196,14 @@ RUN set -x \
         gettext \
         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 \
     # Install vips (only works with PHP >= 7.0)
+    && pecl install apcu \
     && printf "\n" | pecl install vips \
     && pecl install redis \
     && pecl install mongodb \

diff --git a/docker/php-official/8.0-alpine/Dockerfile b/docker/php-official/8.0-alpine/Dockerfile
@@ -195,20 +195,22 @@ RUN set -x \
         gettext \
         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 \
-    # Install vips (only works with PHP >= 7.0)
-    && printf "\n" | pecl install vips \
-    && pecl install redis \
-    && pecl install mongodb \
-    && pecl install imagick \
-    && pecl install amqp \
-    && pecl install yaml \
+    && wget https://github.com/FriendsOfPHP/pickle/releases/download/v0.6.0/pickle.phar \
+    && mv pickle.phar /usr/local/bin/pickle \
+    && chmod +x /usr/local/bin/pickle \
+    && pickle install memcached \
+    && pickle install apcu \
+    && pickle install vips \
+    && pickle install redis \
+    && pickle install mongodb \
+    && pickle install imagick \
+    && pickle install amqp \
     && docker-php-ext-enable \
         apcu \
         redis \

diff --git a/template/Dockerfile/images/php.jinja2 b/template/Dockerfile/images/php.jinja2
@@ -115,7 +115,7 @@
     && echo extension=imagick.so > /usr/local/etc/php/conf.d/imagick.ini \
     && echo extension=mongodb.so > /usr/local/etc/php/conf.d/mongodb.ini \
     && echo extension=memcached.so > /usr/local/etc/php/conf.d/memcached.ini \
-{% elif version == '8.0' %}
+{%- elif version == '8.0' %}
     && wget https://github.com/FriendsOfPHP/pickle/releases/download/v0.6.0/pickle.phar \
     && mv pickle.phar /usr/local/bin/pickle \
     && chmod +x /usr/local/bin/pickle \
@@ -282,7 +282,6 @@
         gettext \
         opcache \
     # 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`" \
@@ -294,13 +293,27 @@
     && printf "no --disable-memcached-sasl\n" | pecl install memcached-3.0.4 \
     && docker-php-ext-enable memcached \
     {%- endif %}
+{%- if version == '8.0' %}
+    && wget https://github.com/FriendsOfPHP/pickle/releases/download/v0.6.0/pickle.phar \
+    && mv pickle.phar /usr/local/bin/pickle \
+    && chmod +x /usr/local/bin/pickle \
+    && pickle install memcached \
+    && pickle install apcu \
+    && pickle install vips \
+    && pickle install redis \
+    && pickle install mongodb \
+    && pickle install imagick \
+    && pickle install amqp \
+{%- else %}
     # Install vips (only works with PHP >= 7.0)
+    && pecl install apcu \
     && printf "\n" | pecl install vips \
     && pecl install redis \
     && pecl install mongodb \
     && pecl install imagick \
     && pecl install amqp \
     && pecl install yaml \
+{%- endif %}
     && docker-php-ext-enable \
         apcu \
         redis \
@@ -350,7 +363,9 @@
         blackfire-agent \
 {%- if version|int == 5 %}
     && pecl install xdebug-2.5.5 \
-{% elif version == '7.0' %}
+{%- elif version == '8.0' %}
+    && pickle install xdebug \
+{%- elif version == '7.0' %}
     && pecl install xdebug-2.8.1 \
 {%- else %}
     && pecl install xdebug \
@@ -373,8 +388,10 @@
         g++ \
 {%- if version|int == 5 %}
     && pecl install xdebug-2.5.5 \
-{% elif version == '7.0' %}
+{%- elif version == '7.0' %}
     && pecl install xdebug-2.8.1 \
+{%- elif version == '8.0' %}
+    && pickle install xdebug \
 {%- else %}
     && pecl install xdebug \
 {%- endif %}