Install unzip on dev images

WyriHaximusNet · Sep 30, 2021 · 05471c7 · 05471c7
1 parent 083cebc
commit 05471c7
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/Dockerfile-nts-alpine b/Dockerfile-nts-alpine
@@ -82,7 +82,8 @@ RUN touch /.you-are-in-a-wyrihaximus.net-php-docker-image-dev
 # Install docker help scripts
 COPY src/php/utils/docker/alpine/dev-mode /usr/local/bin/dev-mode
 COPY src/php/utils/docker/alpine/docker-php-dev-mode /usr/local/bin/docker-php-dev-mode
-RUN if [ $(php -v | grep "PHP 8.1" | wc -l) != 0 ] ; then true ; else dev-mode; fi && rm -rf /usr/local/bin/dev-mode && rm -rf /usr/local/bin/docker-php-dev-mode
+RUN if [ $(php -v | grep "PHP 8.1" | wc -l) != 0 ] ; then true ; else dev-mode; fi && rm -rf /usr/local/bin/dev-mode && rm -rf /usr/local/bin/docker-php-dev-mode && \
+    apk add unzip --no-cache
 
 # Install composer
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer
@@ -98,7 +99,8 @@ RUN touch /.you-are-in-a-wyrihaximus.net-php-docker-image-dev
 # Install docker help scripts
 COPY src/php/utils/docker/alpine/dev-mode /usr/local/bin/dev-mode
 COPY src/php/utils/docker/alpine/docker-php-dev-mode /usr/local/bin/docker-php-dev-mode
-RUN if [ $(php -v | grep "PHP 8.1" | wc -l) != 0 ] ; then true ; else dev-mode; fi && rm -rf /usr/local/bin/dev-mode && rm -rf /usr/local/bin/docker-php-dev-mode
+RUN if [ $(php -v | grep "PHP 8.1" | wc -l) != 0 ] ; then true ; else dev-mode; fi && rm -rf /usr/local/bin/dev-mode && rm -rf /usr/local/bin/docker-php-dev-mode && \
+    apk add unzip --no-cache
 
 # Install composer
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer

diff --git a/Dockerfile-nts-debian b/Dockerfile-nts-debian
@@ -97,7 +97,7 @@ COPY src/php/utils/docker/debian/docker-php-dev-mode /usr/local/bin/docker-php-d
 RUN if [ $(php -v | grep "alpha\|ALPHA\|beta\|BETA\|rc\|RC" | wc -l) != 0 ] ; then true ; else dev-mode; fi \
     && rm -rf /usr/local/bin/dev-mode \
     && rm -rf /usr/local/bin/docker-php-dev-mode \
-    && yes | apt-get install make
+    && yes | apt-get install make unzip
 
 # Install composer
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer
@@ -116,7 +116,7 @@ COPY src/php/utils/docker/debian/docker-php-dev-mode /usr/local/bin/docker-php-d
 RUN if [ $(php -v | grep "alpha\|ALPHA\|beta\|BETA\|rc\|RC" | wc -l) != 0 ] ; then true ; else dev-mode; fi \
     && rm -rf /usr/local/bin/dev-mode \
     && rm -rf /usr/local/bin/docker-php-dev-mode \
-    && yes | apt-get install make
+    && yes | apt-get install make unzip
 
 # Install composer
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer

diff --git a/Dockerfile-zts-alpine b/Dockerfile-zts-alpine
@@ -87,7 +87,8 @@ RUN touch /.you-are-in-a-wyrihaximus.net-php-docker-image-dev
 
 # Install docker help scripts
 COPY src/php/utils/docker/alpine/dev-mode /usr/local/bin/dev-mode
-RUN if [ $(php -v | grep "PHP 8.1" | wc -l) != 0 ] ; then true ; else dev-mode; fi && rm -rf /usr/local/bin/dev-mode
+RUN if [ $(php -v | grep "PHP 8.1" | wc -l) != 0 ] ; then true ; else dev-mode; fi && rm -rf /usr/local/bin/dev-mode && \
+    apk add unzip --no-cache
 
 # Install composer
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer
@@ -102,7 +103,8 @@ RUN touch /.you-are-in-a-wyrihaximus.net-php-docker-image-dev
 
 # Install docker help scripts
 COPY src/php/utils/docker/alpine/dev-mode /usr/local/bin/dev-mode
-RUN if [ $(php -v | grep "PHP 8.1" | wc -l) != 0 ] ; then true ; else dev-mode; fi && rm -rf /usr/local/bin/dev-mode
+RUN if [ $(php -v | grep "PHP 8.1" | wc -l) != 0 ] ; then true ; else dev-mode; fi && rm -rf /usr/local/bin/dev-mode && \
+    apk add unzip --no-cache
 
 # Install composer
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer

diff --git a/Dockerfile-zts-debian b/Dockerfile-zts-debian
@@ -99,7 +99,7 @@ COPY src/php/utils/docker/debian/docker-php-dev-mode /usr/local/bin/docker-php-d
 RUN if [ $(php -v | grep "alpha\|ALPHA\|beta\|BETA\|rc\|RC" | wc -l) != 0 ] ; then true ; else dev-mode; fi \
     && rm -rf /usr/local/bin/dev-mode \
     && rm -rf /usr/local/bin/docker-php-dev-mode \
-    && yes | apt-get install make
+    && yes | apt-get install make unzip
 
 # Install composer
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer
@@ -118,7 +118,7 @@ COPY src/php/utils/docker/debian/docker-php-dev-mode /usr/local/bin/docker-php-d
 RUN if [ $(php -v | grep "alpha\|ALPHA\|beta\|BETA\|rc\|RC" | wc -l) != 0 ] ; then true ; else dev-mode; fi \
     && rm -rf /usr/local/bin/dev-mode \
     && rm -rf /usr/local/bin/docker-php-dev-mode \
-    && yes | apt-get install make
+    && yes | apt-get install make unzip
 
 # Install composer
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer