From 5b5ac15cf89ca472f0680c73ee4d363a16b09acf Mon Sep 17 00:00:00 2001 From: Cees-Jan Kiewiet Date: Fri, 27 Nov 2020 21:36:47 +0100 Subject: [PATCH] Clean up Debian images --- .hadolint.yaml | 3 ++- Dockerfile-nts-debian | 6 ++++-- Dockerfile-zts-debian | 6 ++++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.hadolint.yaml b/.hadolint.yaml index 73e7a26a..4b074edd 100644 --- a/.hadolint.yaml +++ b/.hadolint.yaml @@ -14,4 +14,5 @@ ignored: - DL3008 - DL3009 - DL3014 - - DL3015 \ No newline at end of file + - DL3015 + - DL3027 \ No newline at end of file diff --git a/Dockerfile-nts-debian b/Dockerfile-nts-debian index aa97db71..8e7ba387 100644 --- a/Dockerfile-nts-debian +++ b/Dockerfile-nts-debian @@ -74,9 +74,11 @@ RUN EXTENSION_DIR=`php-config --extension-dir 2>/dev/null` && \ && docker-php-ext-enable uv \ && docker-php-ext-enable vips \ && wget -O - https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh > /bin/wait-for \ - && yes | apt-get purge wget $PHPIZE_DEPS \ && chmod +x /bin/wait-for \ - && rm -rf /var/cache/apk/* \ + && yes | apt-get purge wget $PHPIZE_DEPS \ + && yes | apt autoremove \ + && yes | apt-get install libvips-dev \ + && rm -rf /var/cache/apt/* \ && rm -rf /tmp/* # Install shush diff --git a/Dockerfile-zts-debian b/Dockerfile-zts-debian index 37f52b05..9587a5c1 100644 --- a/Dockerfile-zts-debian +++ b/Dockerfile-zts-debian @@ -90,9 +90,11 @@ RUN EXTENSION_DIR=`php-config --extension-dir 2>/dev/null` && \ && docker-php-ext-enable uv \ && docker-php-ext-enable vips \ && wget -O - https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh > /bin/wait-for \ - && yes | apt-get purge wget $PHPIZE_DEPS \ && chmod +x /bin/wait-for \ - && rm -rf /var/cache/apk/* \ + && yes | apt-get purge wget $PHPIZE_DEPS \ + && yes | apt autoremove \ + && yes | apt-get install libvips-dev \ + && rm -rf /var/cache/apt/* \ && rm -rf /tmp/* # Install shush