octoleo/docker-rosariosis
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added directory check before removing it.

Browse Source
This commit is contained in:
Llewellyn van der Merwe 2022-09-11 18:52:47 +02:00
parent 66cee22289
commit 5d682fa37c
Signed by: Llewellyn
GPG Key ID: A9201372263741E7
5 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
10.2/php7.4/apache/Dockerfile
View File

@ -69,7 +69,6 @@ RUN set -ex; \
gettext \ gettext \
zip \ zip \
; \ ; \
rm -r /tmp/pear; \
\ \
# some misbehaving extensions end up outputting to stdout # some misbehaving extensions end up outputting to stdout
out="$(php -r 'exit(0);')"; \ out="$(php -r 'exit(0);')"; \
@ -87,7 +86,7 @@ RUN set -ex; \
apcu \ apcu \
memcached \ 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 # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
apt-mark auto '.*' > /dev/null; \ apt-mark auto '.*' > /dev/null; \

3
10.2/php7.4/fpm/Dockerfile
View File

@ -69,7 +69,6 @@ RUN set -ex; \
gettext \ gettext \
zip \ zip \
; \ ; \
rm -r /tmp/pear; \
\ \
# some misbehaving extensions end up outputting to stdout # some misbehaving extensions end up outputting to stdout
out="$(php -r 'exit(0);')"; \ out="$(php -r 'exit(0);')"; \
@ -87,7 +86,7 @@ RUN set -ex; \
apcu \ apcu \
memcached \ 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 # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
apt-mark auto '.*' > /dev/null; \ apt-mark auto '.*' > /dev/null; \

3
10.2/php8.0/apache/Dockerfile
View File

@ -68,7 +68,6 @@ RUN set -ex; \
gettext \ gettext \
zip \ zip \
; \ ; \
rm -r /tmp/pear; \
\ \
# some misbehaving extensions end up outputting to stdout # some misbehaving extensions end up outputting to stdout
out="$(php -r 'exit(0);')"; \ out="$(php -r 'exit(0);')"; \
@ -88,7 +87,7 @@ RUN set -ex; \
memcached \ memcached \
xmlrpc \ 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 # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
apt-mark auto '.*' > /dev/null; \ apt-mark auto '.*' > /dev/null; \

3
10.2/php8.0/fpm/Dockerfile
View File

@ -68,7 +68,6 @@ RUN set -ex; \
gettext \ gettext \
zip \ zip \
; \ ; \
rm -r /tmp/pear; \
\ \
# some misbehaving extensions end up outputting to stdout # some misbehaving extensions end up outputting to stdout
out="$(php -r 'exit(0);')"; \ out="$(php -r 'exit(0);')"; \
@ -88,7 +87,7 @@ RUN set -ex; \
memcached \ memcached \
xmlrpc \ 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 # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
apt-mark auto '.*' > /dev/null; \ apt-mark auto '.*' > /dev/null; \

5
Dockerfile.template
View File

@ -108,7 +108,6 @@ RUN set -ex; \
gettext \ gettext \
zip \ zip \
; \ ; \
rm -r /tmp/pear; \
\ \
# some misbehaving extensions end up outputting to stdout # some misbehaving extensions end up outputting to stdout
out="$(php -r 'exit(0);')"; \ out="$(php -r 'exit(0);')"; \
@ -134,7 +133,7 @@ RUN set -ex; \
xmlrpc \ xmlrpc \
{{ ) else "" end -}} {{ ) else "" end -}}
; \ ; \
rm -r /tmp/pear; \ [ -d /tmp/pear ] && rm -r /tmp/pear; \
\ \
runDeps="$( \ runDeps="$( \
scanelf --needed --nobanner --format '%n#p' --recursive "$extDir" \ scanelf --needed --nobanner --format '%n#p' --recursive "$extDir" \
@ -159,7 +158,7 @@ RUN set -ex; \
xmlrpc \ xmlrpc \
{{ ) else "" end -}} {{ ) 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 # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
apt-mark auto '.*' > /dev/null; \ apt-mark auto '.*' > /dev/null; \