Clean up Debian images

WyriHaximusNet · Nov 27, 2020 · 5b5ac15 · 5b5ac15
1 parent c537d64
commit 5b5ac15
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/.hadolint.yaml b/.hadolint.yaml
@@ -14,4 +14,5 @@ ignored:
   - DL3008
   - DL3009
   - DL3014
-  - DL3015
+  - DL3015
+  - DL3027
diff --git 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
@@ -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
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,4 +14,5 @@ ignored: @@
       - DL3008
       - DL3009
       - DL3014
-      - DL3015
+      - DL3015
+      - DL3027