Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Install unzip on dev images #175

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions Dockerfile-nts-alpine
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile-nts-debian
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
6 changes: 4 additions & 2 deletions Dockerfile-zts-alpine
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile-zts-debian
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down