Skip to content

Commit fb517fe

Browse files
WyriHaximusWyriHaximus
committed
Install unzip on dev images
1 parent 083cebc commit fb517fe

File tree

4 files changed

+12
-8
lines changed

4 files changed

+12
-8
lines changed

‎Dockerfile-nts-alpine‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,8 @@ RUN touch /.you-are-in-a-wyrihaximus.net-php-docker-image-dev
8282
# Install docker help scripts
8383
COPY src/php/utils/docker/alpine/dev-mode /usr/local/bin/dev-mode
8484
COPY src/php/utils/docker/alpine/docker-php-dev-mode /usr/local/bin/docker-php-dev-mode
85-
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
85+
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 && \
86+
apk add unzip --no-cache
8687

8788
# Install composer
8889
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
9899
# Install docker help scripts
99100
COPY src/php/utils/docker/alpine/dev-mode /usr/local/bin/dev-mode
100101
COPY src/php/utils/docker/alpine/docker-php-dev-mode /usr/local/bin/docker-php-dev-mode
101-
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
102+
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 && \
103+
apk add unzip --no-cache
102104

103105
# Install composer
104106
COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer

‎Dockerfile-nts-debian‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ COPY src/php/utils/docker/debian/docker-php-dev-mode /usr/local/bin/docker-php-d
9797
RUN if [ $(php -v | grep "alpha\|ALPHA\|beta\|BETA\|rc\|RC" | wc -l) != 0 ] ; then true ; else dev-mode; fi \
9898
&& rm -rf /usr/local/bin/dev-mode \
9999
&& rm -rf /usr/local/bin/docker-php-dev-mode \
100-
&& yes | apt-get install make
100+
&& yes | apt-get install make unzip
101101

102102
# Install composer
103103
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
116116
RUN if [ $(php -v | grep "alpha\|ALPHA\|beta\|BETA\|rc\|RC" | wc -l) != 0 ] ; then true ; else dev-mode; fi \
117117
&& rm -rf /usr/local/bin/dev-mode \
118118
&& rm -rf /usr/local/bin/docker-php-dev-mode \
119-
&& yes | apt-get install make
119+
&& yes | apt-get install make unzip
120120

121121
# Install composer
122122
COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer

‎Dockerfile-zts-alpine‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,8 @@ RUN touch /.you-are-in-a-wyrihaximus.net-php-docker-image-dev
8787

8888
# Install docker help scripts
8989
COPY src/php/utils/docker/alpine/dev-mode /usr/local/bin/dev-mode
90-
RUN if [ $(php -v | grep "PHP 8.1" | wc -l) != 0 ] ; then true ; else dev-mode; fi && rm -rf /usr/local/bin/dev-mode
90+
RUN if [ $(php -v | grep "PHP 8.1" | wc -l) != 0 ] ; then true ; else dev-mode; fi && rm -rf /usr/local/bin/dev-mode && \
91+
apk add unzip --no-cache
9192

9293
# Install composer
9394
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
102103

103104
# Install docker help scripts
104105
COPY src/php/utils/docker/alpine/dev-mode /usr/local/bin/dev-mode
105-
RUN if [ $(php -v | grep "PHP 8.1" | wc -l) != 0 ] ; then true ; else dev-mode; fi && rm -rf /usr/local/bin/dev-mode
106+
RUN if [ $(php -v | grep "PHP 8.1" | wc -l) != 0 ] ; then true ; else dev-mode; fi && rm -rf /usr/local/bin/dev-mode && \
107+
apk add unzip --no-cache
106108

107109
# Install composer
108110
COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer

‎Dockerfile-zts-debian‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ COPY src/php/utils/docker/debian/docker-php-dev-mode /usr/local/bin/docker-php-d
9999
RUN if [ $(php -v | grep "alpha\|ALPHA\|beta\|BETA\|rc\|RC" | wc -l) != 0 ] ; then true ; else dev-mode; fi \
100100
&& rm -rf /usr/local/bin/dev-mode \
101101
&& rm -rf /usr/local/bin/docker-php-dev-mode \
102-
&& yes | apt-get install make
102+
&& yes | apt-get install make unzip
103103

104104
# Install composer
105105
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
118118
RUN if [ $(php -v | grep "alpha\|ALPHA\|beta\|BETA\|rc\|RC" | wc -l) != 0 ] ; then true ; else dev-mode; fi \
119119
&& rm -rf /usr/local/bin/dev-mode \
120120
&& rm -rf /usr/local/bin/docker-php-dev-mode \
121-
&& yes | apt-get install make
121+
&& yes | apt-get install make unzip
122122

123123
# Install composer
124124
COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer

0 commit comments

Comments
 (0)