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

fix(YAML extension): get built YAML extension for all versions in all services 

We need to build yaml extension for `workspace`, `php-fpm` and `laravel-horizon` images.
Turn on YAML for GitHub Actions.
This commit is contained in:
Pavel Savushkin 2021-03-21 18:10:08 +02:00
parent 97bd2c978b
commit 4270f1db71
No known key found for this signature in database
GPG Key ID: BD2EDA3E125300DD
3 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
name: CI
on:
on:
push:
branches: '**'
tags: '**'
@ -32,7 +32,6 @@ jobs:
sed -i -- 's/PHALCON=true/PHALCON=false/g' .env
sed -i -- 's/RDKAFKA=true/RDKAFKA=false/g' .env
sed -i -- 's/MAILPARSE=true/MAILPARSE=false/g' .env
sed -i -- 's/YAML=true/YAML=false/g' .env
sed -i -- 's/MSSQL=true/MSSQL=false/g' .env
sed -i -- 's/AMQP=true/AMQP=false/g' .env
sed -i -- 's/MEMCACHED=true/MEMCACHED=false/g' .env

12
php-fpm/Dockerfile
View File

@ -840,11 +840,13 @@ ARG INSTALL_YAML=false
RUN if [ ${INSTALL_YAML} = true ]; then \
apt-get install libyaml-dev -y ; \
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
pecl install -a yaml-1.3.2; \
else \
pecl install yaml; \
fi && \
docker-php-ext-enable yaml \
echo '' | pecl install -a yaml-1.3.2; \
elif [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && [ $(php -r "echo PHP_MINOR_VERSION;") = "0" ]; then \
echo '' | pecl install yaml-2.0.4; \
else
echo '' | pecl install yaml; \
fi \
&& docker-php-ext-enable yaml; \
;fi
###########################################################################

16
workspace/Dockerfile
View File

@ -1388,12 +1388,14 @@ ARG INSTALL_YAML=false
RUN if [ ${INSTALL_YAML} = true ]; then \
apt-get install libyaml-dev -y ; \
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
pecl install -a yaml-1.3.2; \
else \
pecl install yaml; \
fi && \
echo "extension=yaml.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/yaml.ini && \
ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/yaml.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/35-yaml.ini \
echo '' | pecl install -a yaml-1.3.2; \
elif [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && [ $(php -r "echo PHP_MINOR_VERSION;") = "0" ]; then \
echo '' | pecl install yaml-2.0.4; \
else
echo '' | pecl install yaml; \
fi \
&& echo "extension=yaml.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/yaml.ini \
&& ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/yaml.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/35-yaml.ini; \
;fi
###########################################################################
@ -1632,8 +1634,6 @@ RUN if [ ${SHELL_OH_MY_ZSH} = true ]; then \
echo "" >> ~/.zshrc \
;fi
USER root
#
#--------------------------------------------------------------------------
# Final Touch