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

Fix tests(xdebug, mongodb)

This commit is contained in:
Erik Niebla 2021-12-20 10:48:36 -05:00
parent 9f0657e2b0
commit 4171871ab2
4 changed files with 13 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
laravel-horizon/Dockerfile
View File

@ -64,11 +64,7 @@ ARG INSTALL_GNUPG=false
RUN set -eux; if [ ${INSTALL_GNUPG} = true ]; then \ RUN set -eux; if [ ${INSTALL_GNUPG} = true ]; then \
apk add --no-cache --no-progress --virtual BUILD_DEPS_PHP_GNUPG gpgme-dev; \ apk add --no-cache --no-progress --virtual BUILD_DEPS_PHP_GNUPG gpgme-dev; \
apk add --no-cache --no-progress gpgme; \ apk add --no-cache --no-progress gpgme; \
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \
pecl install gnupg-1.5.0RC2; \
else \
pecl install gnupg; \ pecl install gnupg; \
fi; \
docker-php-ext-enable gnupg; \ docker-php-ext-enable gnupg; \
fi fi

10
php-fpm/Dockerfile
View File

@ -117,11 +117,7 @@ ARG INSTALL_GNUPG=false
RUN if [ ${INSTALL_GNUPG} = true ]; then \ RUN if [ ${INSTALL_GNUPG} = true ]; then \
apt-get -yq install libgpgme-dev; \ apt-get -yq install libgpgme-dev; \
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \
pecl install gnupg-1.5.0RC2; \
else \
pecl install gnupg; \ pecl install gnupg; \
fi; \
docker-php-ext-enable gnupg; \ docker-php-ext-enable gnupg; \
php -m | grep -q 'gnupg'; \ php -m | grep -q 'gnupg'; \
fi fi
@ -221,7 +217,7 @@ RUN if [ ${INSTALL_XDEBUG} = true ]; then \
# Install the xdebug extension # Install the xdebug extension
# https://xdebug.org/docs/compat # https://xdebug.org/docs/compat
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.1; \ pecl install xdebug-3.1.2; \
else \ else \
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \ if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
pecl install xdebug-2.5.5; \ pecl install xdebug-2.5.5; \
@ -362,7 +358,7 @@ RUN if [ ${INSTALL_MONGO} = true ]; then \
docker-php-ext-enable mongo; \ docker-php-ext-enable mongo; \
php -m | grep -oiE '^mongo$'; \ php -m | grep -oiE '^mongo$'; \
else \ else \
if [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "70000" ]; then \ if [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && { [ $(php -r "echo PHP_MINOR_VERSION;") = "0" ] || [ $(php -r "echo PHP_MINOR_VERSION;") = "1" ] ;}; then \
pecl install mongodb-1.9.2; \ pecl install mongodb-1.9.2; \
else \ else \
pecl install mongodb; \ pecl install mongodb; \
@ -1090,7 +1086,7 @@ ARG INSTALL_XMLRPC=false
RUN if [ ${INSTALL_XMLRPC} = true ]; then \ RUN if [ ${INSTALL_XMLRPC} = true ]; then \
apt-get -yq install libxml2-dev; \ apt-get -yq install libxml2-dev; \
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \ if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \
pecl install xmlrpc-1.0.0RC2; \ pecl install xmlrpc-1.0.0RC3; \
docker-php-ext-enable xmlrpc; \ docker-php-ext-enable xmlrpc; \
else \ else \
docker-php-ext-install xmlrpc; \ docker-php-ext-install xmlrpc; \

8
php-worker/Dockerfile
View File

@ -65,11 +65,7 @@ ARG INSTALL_GNUPG=false
RUN set -eux; if [ ${INSTALL_GNUPG} = true ]; then \ RUN set -eux; if [ ${INSTALL_GNUPG} = true ]; then \
apk add --no-cache --no-progress --virtual BUILD_DEPS_PHP_GNUPG gpgme-dev; \ apk add --no-cache --no-progress --virtual BUILD_DEPS_PHP_GNUPG gpgme-dev; \
apk add --no-cache --no-progress gpgme; \ apk add --no-cache --no-progress gpgme; \
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \
pecl install gnupg-1.5.0RC2; \
else \
pecl install gnupg; \ pecl install gnupg; \
fi; \
docker-php-ext-enable gnupg; \ docker-php-ext-enable gnupg; \
fi fi
@ -147,7 +143,7 @@ RUN if [ ${INSTALL_MONGO} = true ]; then \
docker-php-ext-enable mongo; \ docker-php-ext-enable mongo; \
php -m | grep -oiE '^mongo$'; \ php -m | grep -oiE '^mongo$'; \
else \ else \
if [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "70000" ]; then \ if [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && { [ $(php -r "echo PHP_MINOR_VERSION;") = "0" ] || [ $(php -r "echo PHP_MINOR_VERSION;") = "1" ] ;}; then \
pecl install mongodb-1.9.2; \ pecl install mongodb-1.9.2; \
else \ else \
pecl install mongodb; \ pecl install mongodb; \
@ -404,7 +400,7 @@ ARG INSTALL_XMLRPC=false
RUN if [ ${INSTALL_XMLRPC} = true ]; then \ RUN if [ ${INSTALL_XMLRPC} = true ]; then \
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \ if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \
pecl install xmlrpc-1.0.0RC2; \ pecl install xmlrpc-1.0.0RC3; \
docker-php-ext-enable xmlrpc; \ docker-php-ext-enable xmlrpc; \
else \ else \
docker-php-ext-install xmlrpc; \ docker-php-ext-install xmlrpc; \

18
workspace/Dockerfile
View File

@ -330,25 +330,17 @@ ARG INSTALL_XDEBUG=false
RUN if [ ${INSTALL_XDEBUG} = true ]; then \ RUN if [ ${INSTALL_XDEBUG} = true ]; then \
# Install the xdebug extension # Install the xdebug extension
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \ # https://xdebug.org/docs/compat
pecl install xdebug-3.0.0; \ 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; \
else \ else \
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \ if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
pecl install xdebug-2.5.5; \ pecl install xdebug-2.5.5; \
else \ else \
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && [ $(php -r "echo PHP_MINOR_VERSION;") = "0" ]; then \ if [ $(php -r "echo PHP_MINOR_VERSION;") = "0" ]; then \
pecl install xdebug-2.9.0; \ pecl install xdebug-2.9.0; \
else \ else \
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && [ $(php -r "echo PHP_MINOR_VERSION;") = "1" ]; then \
pecl install xdebug-2.9.8; \ pecl install xdebug-2.9.8; \
else \
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ]; then \
pecl install xdebug-2.9.8; \
else \
#pecl install xdebug; \
echo "xDebug 3 required, not supported."; \
fi \
fi \
fi \ fi \
fi \ fi \
fi && \ fi && \
@ -457,7 +449,7 @@ RUN if [ ${INSTALL_MONGO} = true ]; then \
ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/mongo.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/30-mongo.ini; \ ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/mongo.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/30-mongo.ini; \
php -m | grep -oiE '^mongo$'; \ php -m | grep -oiE '^mongo$'; \
else \ else \
if [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "70000" ]; then \ if [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && { [ $(php -r "echo PHP_MINOR_VERSION;") = "0" ] || [ $(php -r "echo PHP_MINOR_VERSION;") = "1" ] ;}; then \
pecl install mongodb-1.9.2; \ pecl install mongodb-1.9.2; \
else \ else \
pecl install mongodb; \ pecl install mongodb; \