ykxiao
/
laradock
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: php-worker extension install

This commit is contained in:
Shao Yu-Lung (Allen) 2021-04-06 20:52:26 +08:00
parent 5a2de45a6f
commit b03547dbbe
2 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/main-ci.yml vendored
View File

@ -23,9 +23,9 @@ jobs:
PHP_VERSION: ${{ matrix.php_version }} PHP_VERSION: ${{ matrix.php_version }}
run: | run: |
cp env-example .env cp env-example .env
sed -i -- '99,278s/=false/=true/g' .env sed -i -- '99,313s/=false/=true/g' .env
sed -i -- 's/GNUPG=false/GNUPG=true/g' .env
sed -i -- 's/CHANGE_SOURCE=true/CHANGE_SOURCE=false/g' .env sed -i -- 's/CHANGE_SOURCE=true/CHANGE_SOURCE=false/g' .env
sed -i -- 's/GNUPG=false/GNUPG=true/g' .env
sed -i -- 's/PHPDBG=true/PHPDBG=false/g' .env sed -i -- 's/PHPDBG=true/PHPDBG=false/g' .env
sed -i -- 's/CASSANDRA=true/CASSANDRA=false/g' .env sed -i -- 's/CASSANDRA=true/CASSANDRA=false/g' .env
sed -i -- 's/GEARMAN=true/GEARMAN=false/g' .env sed -i -- 's/GEARMAN=true/GEARMAN=false/g' .env

37
php-worker/Dockerfile
View File

@ -79,9 +79,13 @@ RUN set -eux; if [ ${INSTALL_GNUPG} = true ]; then \
#Install GD package: #Install GD package:
ARG INSTALL_GD=false ARG INSTALL_GD=false
RUN if [ ${INSTALL_GD} = true ]; then \ RUN if [ ${INSTALL_GD} = true ]; then \
apk add --update --no-cache freetype-dev libjpeg-turbo-dev jpeg-dev libpng-dev; \ apk add --update --no-cache freetype-dev libjpeg-turbo-dev jpeg-dev libpng-dev; \
docker-php-ext-configure gd --with-freetype-dir=/usr/lib/ --with-jpeg-dir=/usr/lib/ --with-png-dir=/usr/lib/ && \ if [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && [ $(php -r "echo PHP_MINOR_VERSION;") = "4" ]; then \
docker-php-ext-install gd \ docker-php-ext-configure gd --with-freetype --with-jpeg --with-png; \
else \
docker-php-ext-configure gd --with-freetype-dir=/usr/lib/ --with-jpeg-dir=/usr/lib/ --with-png-dir=/usr/lib/; \
fi; \
docker-php-ext-install gd \
;fi ;fi
#Install ImageMagick: #Install ImageMagick:
@ -324,9 +328,13 @@ RUN if [ $INSTALL_GHOSTSCRIPT = true ]; then \
ARG INSTALL_REDIS=false ARG INSTALL_REDIS=false
RUN if [ ${INSTALL_REDIS} = true ]; then \ RUN if [ ${INSTALL_REDIS} = true ]; then \
# Install Redis Extension # Install Redis Extension
printf "\n" | pecl install -o -f redis \ if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
&& rm -rf /tmp/pear \ printf "\n" | pecl install -o -f redis-4.3.0; \
&& docker-php-ext-enable redis \ else \
printf "\n" | pecl install -o -f redis; \
fi; \
rm -rf /tmp/pear; \
docker-php-ext-enable redis \
;fi ;fi
########################################################################### ###########################################################################
@ -360,8 +368,11 @@ RUN if [ ${INSTALL_TAINT} = true ]; then \
# Install Php TAINT Extension # Install Php TAINT Extension
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ]; then \ if [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ]; then \
pecl install taint; \ pecl install taint; \
fi && \ docker-php-ext-enable taint; \
docker-php-ext-enable taint \ php -m | grep -q 'taint'; \
else \
echo 'taint not Support'; \
fi \
;fi ;fi
########################################################################### ###########################################################################
@ -383,8 +394,14 @@ RUN if [ ${INSTALL_IMAP} = true ]; then \
ARG INSTALL_XMLRPC=false ARG INSTALL_XMLRPC=false
RUN if [ ${INSTALL_XMLRPC} = true ]; then \ RUN if [ ${INSTALL_XMLRPC} = true ]; then \
docker-php-ext-install xmlrpc \ if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \
;fi pecl install xmlrpc-1.0.0RC2; \
docker-php-ext-enable xmlrpc; \
else \
docker-php-ext-install xmlrpc; \
fi; \
php -m | grep -r 'xmlrpc'; \
fi
# #
#-------------------------------------------------------------------------- #--------------------------------------------------------------------------