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

Merge pull request #3186 from erikn69/fix_zmq 

Fix php-zmq link
This commit is contained in:
Shao Yu-Lung (Allen) 2022-03-29 13:15:12 +08:00 committed by GitHub
parent cc7ceb0990 ae4e231988
commit dfbd87bb09
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
php-fpm/Dockerfile
View File

@ -1225,7 +1225,7 @@ ARG INSTALL_ZMQ=false
RUN if [ ${INSTALL_ZMQ} = true ]; then \ RUN if [ ${INSTALL_ZMQ} = true ]; then \
apt-get install --yes git libzmq3-dev \ apt-get install --yes git libzmq3-dev \
&& git clone git://github.com/mkoppanen/php-zmq.git \ && git clone https://github.com/zeromq/php-zmq.git \
&& cd php-zmq \ && cd php-zmq \
&& phpize \ && phpize \
&& ./configure \ && ./configure \

2
php-worker/Dockerfile
View File

@ -5,7 +5,7 @@
# #
ARG LARADOCK_PHP_VERSION ARG LARADOCK_PHP_VERSION
FROM php:${LARADOCK_PHP_VERSION}-alpine3.15 FROM php:${LARADOCK_PHP_VERSION}-alpine
LABEL maintainer="Mahmoud Zalt <mahmoud@zalt.me>" LABEL maintainer="Mahmoud Zalt <mahmoud@zalt.me>"

12
workspace/Dockerfile
View File

@ -331,6 +331,7 @@ ARG INSTALL_XDEBUG=false
RUN if [ ${INSTALL_XDEBUG} = true ]; then \ RUN if [ ${INSTALL_XDEBUG} = true ]; then \
# Install the xdebug extension # Install the xdebug extension
# https://xdebug.org/docs/compat # https://xdebug.org/docs/compat
apt-get install -yqq pkg-config php-xml php${LARADOCK_PHP_VERSION}-xml && \
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ] || { [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && { [ $(php -r "echo PHP_MINOR_VERSION;") = "4" ] || [ $(php -r "echo PHP_MINOR_VERSION;") = "3" ] ;} ;}; then \ if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ] || { [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && { [ $(php -r "echo PHP_MINOR_VERSION;") = "4" ] || [ $(php -r "echo PHP_MINOR_VERSION;") = "3" ] ;} ;}; then \
pecl install xdebug-3.1.2; \ pecl install xdebug-3.1.2; \
else \ else \
@ -443,6 +444,7 @@ ARG INSTALL_MONGO=false
RUN if [ ${INSTALL_MONGO} = true ]; then \ RUN if [ ${INSTALL_MONGO} = true ]; then \
# Install the mongodb extension # Install the mongodb extension
apt-get install -yqq pkg-config && \
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \ if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
pecl install mongo; \ pecl install mongo; \
echo "extension=mongo.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/mongo.ini; \ echo "extension=mongo.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/mongo.ini; \
@ -543,11 +545,11 @@ ARG INSTALL_SWOOLE=false
RUN set -eux; \ RUN set -eux; \
if [ ${INSTALL_SWOOLE} = true ]; then \ if [ ${INSTALL_SWOOLE} = true ]; then \
# Install Php Swoole Extension # Install Php Swoole Extension
if [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "50600" ]; then \ if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
echo '' | pecl -q install swoole-2.0.10; \ echo '' | pecl -q install swoole-2.0.10; \
elif [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "70000" ]; then \ elif [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && [ $(php -r "echo PHP_MINOR_VERSION;") = "0" ]; then \
echo '' | pecl -q install swoole-4.3.5; \ echo '' | pecl -q install swoole-4.3.5; \
elif [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "70100" ]; then \ elif [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && [ $(php -r "echo PHP_MINOR_VERSION;") = "1" ]; then \
echo '' | pecl -q install swoole-4.5.11; \ echo '' | pecl -q install swoole-4.5.11; \
else \ else \
echo '' | pecl -q install swoole; \ echo '' | pecl -q install swoole; \
@ -570,7 +572,7 @@ RUN set -eux; \
if [ $(php -r "echo PHP_MAJOR_VERSION;") != "5" ]; then \ if [ $(php -r "echo PHP_MAJOR_VERSION;") != "5" ]; then \
echo '' | pecl -q install xlswriter && \ echo '' | pecl -q install xlswriter && \
echo "extension=xlswriter.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/xlswriter.ini && \ 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; \ ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/xlswriter.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/20-xlswriter.ini && \
php -m | grep -q 'xlswriter'; \ php -m | grep -q 'xlswriter'; \
else \ else \
echo "PHP Extension for xlswriter is not supported for PHP 5.0"; \ echo "PHP Extension for xlswriter is not supported for PHP 5.0"; \
@ -1721,7 +1723,7 @@ ARG INSTALL_ZMQ=false
RUN if [ ${INSTALL_ZMQ} = true ]; then \ RUN if [ ${INSTALL_ZMQ} = true ]; then \
apt-get install --yes git libzmq3-dev \ apt-get install --yes git libzmq3-dev \
&& git clone git://github.com/mkoppanen/php-zmq.git \ && git clone https://github.com/zeromq/php-zmq.git \
&& cd php-zmq \ && cd php-zmq \
&& phpize \ && phpize \
&& ./configure \ && ./configure \