diff --git a/10.2/php7.4/apache/Dockerfile b/10.2/php7.4/apache/Dockerfile index f037bdc..11f766f 100644 --- a/10.2/php7.4/apache/Dockerfile +++ b/10.2/php7.4/apache/Dockerfile @@ -69,7 +69,6 @@ RUN set -ex; \ gettext \ zip \ ; \ - rm -r /tmp/pear; \ \ # some misbehaving extensions end up outputting to stdout out="$(php -r 'exit(0);')"; \ @@ -87,7 +86,7 @@ RUN set -ex; \ apcu \ memcached \ ; \ - rm -r /tmp/pear; \ + [ -d /tmp/pear ] && rm -r /tmp/pear; \ \ # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies apt-mark auto '.*' > /dev/null; \ diff --git a/10.2/php7.4/fpm/Dockerfile b/10.2/php7.4/fpm/Dockerfile index eb99929..79079cd 100644 --- a/10.2/php7.4/fpm/Dockerfile +++ b/10.2/php7.4/fpm/Dockerfile @@ -69,7 +69,6 @@ RUN set -ex; \ gettext \ zip \ ; \ - rm -r /tmp/pear; \ \ # some misbehaving extensions end up outputting to stdout out="$(php -r 'exit(0);')"; \ @@ -87,7 +86,7 @@ RUN set -ex; \ apcu \ memcached \ ; \ - rm -r /tmp/pear; \ + [ -d /tmp/pear ] && rm -r /tmp/pear; \ \ # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies apt-mark auto '.*' > /dev/null; \ diff --git a/10.2/php8.0/apache/Dockerfile b/10.2/php8.0/apache/Dockerfile index 641a4d5..092cfd9 100644 --- a/10.2/php8.0/apache/Dockerfile +++ b/10.2/php8.0/apache/Dockerfile @@ -68,7 +68,6 @@ RUN set -ex; \ gettext \ zip \ ; \ - rm -r /tmp/pear; \ \ # some misbehaving extensions end up outputting to stdout out="$(php -r 'exit(0);')"; \ @@ -88,7 +87,7 @@ RUN set -ex; \ memcached \ xmlrpc \ ; \ - rm -r /tmp/pear; \ + [ -d /tmp/pear ] && rm -r /tmp/pear; \ \ # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies apt-mark auto '.*' > /dev/null; \ diff --git a/10.2/php8.0/fpm/Dockerfile b/10.2/php8.0/fpm/Dockerfile index d041e78..ce7822b 100644 --- a/10.2/php8.0/fpm/Dockerfile +++ b/10.2/php8.0/fpm/Dockerfile @@ -68,7 +68,6 @@ RUN set -ex; \ gettext \ zip \ ; \ - rm -r /tmp/pear; \ \ # some misbehaving extensions end up outputting to stdout out="$(php -r 'exit(0);')"; \ @@ -88,7 +87,7 @@ RUN set -ex; \ memcached \ xmlrpc \ ; \ - rm -r /tmp/pear; \ + [ -d /tmp/pear ] && rm -r /tmp/pear; \ \ # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies apt-mark auto '.*' > /dev/null; \ diff --git a/Dockerfile.template b/Dockerfile.template index a639dc0..e145021 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -108,7 +108,6 @@ RUN set -ex; \ gettext \ zip \ ; \ - rm -r /tmp/pear; \ \ # some misbehaving extensions end up outputting to stdout out="$(php -r 'exit(0);')"; \ @@ -134,7 +133,7 @@ RUN set -ex; \ xmlrpc \ {{ ) else "" end -}} ; \ - rm -r /tmp/pear; \ + [ -d /tmp/pear ] && rm -r /tmp/pear; \ \ runDeps="$( \ scanelf --needed --nobanner --format '%n#p' --recursive "$extDir" \ @@ -159,7 +158,7 @@ RUN set -ex; \ xmlrpc \ {{ ) else "" end -}} ; \ - rm -r /tmp/pear; \ + [ -d /tmp/pear ] && rm -r /tmp/pear; \ \ # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies apt-mark auto '.*' > /dev/null; \