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

Merge pull request #3123 from erikn69/fix_xlswriter

Browse Source 
Fix tests on XlsWriter ext
This commit is contained in:
Shao Yu-Lung (Allen)
2022-01-13 23:34:28 +08:00
committed by GitHub
parent 37b22ebe01 186928fb07
commit 20d2beee84
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
php-fpm/Dockerfile
View File

@@ -492,7 +492,7 @@ ARG INSTALL_XLSWRITER=false
RUN set -eux; \
if [ ${INSTALL_XLSWRITER} = true ]; then \
# Install Php xlswriter Extension \
if [ $(php -r "echo PHP_MAJOR_VERSION;") > "5" ]; then \
if [ $(php -r "echo PHP_MAJOR_VERSION;") != "5" ]; then \
pecl install xlswriter &&\
docker-php-ext-enable xlswriter &&\
php -m | grep -q 'xlswriter'; \

2
php-worker/Dockerfile
View File

@@ -372,7 +372,7 @@ ARG INSTALL_XLSWRITER=false
RUN set -eux; \
if [ ${INSTALL_XLSWRITER} = true ]; then \
# Install Php xlswriter Extension \
if [ $(php -r "echo PHP_MAJOR_VERSION;") > "5" ]; then \
if [ $(php -r "echo PHP_MAJOR_VERSION;") != "5" ]; then \
pecl install xlswriter && \
docker-php-ext-enable xlswriter && \
php -m | grep -q 'xlswriter'; \

2
workspace/Dockerfile
View File

@@ -567,7 +567,7 @@ ARG INSTALL_XLSWRITER=false
RUN set -eux; \
if [ ${INSTALL_XLSWRITER} = true ]; then \
# Install Php xlswriter Extension
if [ $(php -r "echo PHP_MAJOR_VERSION;") > "5" ]; then \
if [ $(php -r "echo PHP_MAJOR_VERSION;") != "5" ]; then \
echo '' | pecl -q install xlswriter && \
echo "extension=xlswriter.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/xlswriter.ini && \
ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/xlswriter.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/20-xlswriter.ini; \