blackbirdchess/blackbirdchess-docker-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

adjust step order

Browse Source
This commit is contained in:
Shao Yu-Lung (Allen) 2021-04-07 23:21:47 +08:00
parent 032776f575
commit f196023a03
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
laravel-horizon/Dockerfile
View File

@ -92,13 +92,6 @@ RUN if [ ${INSTALL_GD} = true ]; then \
docker-php-ext-install gd \ docker-php-ext-install gd \
;fi ;fi
#Install GMP package:
ARG INSTALL_GMP=false
RUN if [ ${INSTALL_GMP} = true ]; then \
apk add --update --no-cache gmp gmp-dev; \
docker-php-ext-install gmp \
;fi
#Install ImageMagick package: #Install ImageMagick package:
ARG INSTALL_IMAGEMAGICK=false ARG INSTALL_IMAGEMAGICK=false
ARG IMAGEMAGICK_VERSION=latest ARG IMAGEMAGICK_VERSION=latest
@ -107,7 +100,6 @@ RUN set -eux; \
if [ ${INSTALL_IMAGEMAGICK} = true ]; then \ if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
apk add --update --no-cache imagemagick-dev; \ apk add --update --no-cache imagemagick-dev; \
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \ if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \
apk add --update --no-cache git && \
cd /tmp && \ cd /tmp && \
if [ ${IMAGEMAGICK_VERSION} = "latest" ]; then \ if [ ${IMAGEMAGICK_VERSION} = "latest" ]; then \
git clone https://github.com/Imagick/imagick; \ git clone https://github.com/Imagick/imagick; \
@ -127,6 +119,13 @@ RUN set -eux; \
php -m | grep -q 'imagick'; \ php -m | grep -q 'imagick'; \
fi fi
#Install GMP package:
ARG INSTALL_GMP=false
RUN if [ ${INSTALL_GMP} = true ]; then \
apk add --update --no-cache gmp gmp-dev; \
docker-php-ext-install gmp \
;fi
#Install BCMath package: #Install BCMath package:
ARG INSTALL_BCMATH=false ARG INSTALL_BCMATH=false
RUN if [ ${INSTALL_BCMATH} = true ]; then \ RUN if [ ${INSTALL_BCMATH} = true ]; then \

13
php-worker/Dockerfile
View File

@ -36,6 +36,7 @@ RUN apk --update add wget \
libressl-dev \ libressl-dev \
supervisor supervisor
RUN pecl channel-update pecl.php.net; \ RUN pecl channel-update pecl.php.net; \
docker-php-ext-install mysqli mbstring pdo pdo_mysql tokenizer xml pcntl docker-php-ext-install mysqli mbstring pdo pdo_mysql tokenizer xml pcntl
@ -125,6 +126,12 @@ RUN if [ ${INSTALL_GMP} = true ]; then \
&& docker-php-ext-install gmp \ && docker-php-ext-install gmp \
;fi ;fi
#Install BCMath package:
ARG INSTALL_BCMATH=false
RUN if [ ${INSTALL_BCMATH} = true ]; then \
docker-php-ext-install bcmath \
;fi
#Install SOAP package: #Install SOAP package:
ARG INSTALL_SOAP=false ARG INSTALL_SOAP=false
RUN if [ ${INSTALL_SOAP} = true ]; then \ RUN if [ ${INSTALL_SOAP} = true ]; then \
@ -143,12 +150,6 @@ RUN if [ ${INSTALL_MONGO} = true ]; then \
fi; \ fi; \
fi fi
#Install BCMath package:
ARG INSTALL_BCMATH=false
RUN if [ ${INSTALL_BCMATH} = true ]; then \
docker-php-ext-install bcmath \
;fi
########################################################################### ###########################################################################
# PHP OCI8: # PHP OCI8:
########################################################################### ###########################################################################