From 47c89787e60b475037e3cf2bde4ec4bace215cef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Lado=20Cruz?= Date: Wed, 10 Mar 2021 11:55:09 +0000 Subject: [PATCH 01/20] Fix Redis Problem issue #2851 --- workspace/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workspace/Dockerfile b/workspace/Dockerfile index c6c51054..1edc0834 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -560,7 +560,7 @@ ARG INSTALL_PHPREDIS=false RUN if [ ${INSTALL_PHPREDIS} = true ]; then \ apt-get update -yqq && \ - apt-get install -yqq php-redis \ + apt-get install -yqq php${LARADOCK_PHP_VERSION}-redis \ ;fi ########################################################################### From 43df135ca463c11bb54a23bc5a6a012e72b8389d Mon Sep 17 00:00:00 2001 From: Pavel Savushkin Date: Thu, 18 Mar 2021 10:11:30 +0200 Subject: [PATCH 02/20] feat(AMQP extension): normalize installation of AMQP for php-fpm 8.0 Update installation process of AMQP for PHP 8.0 (fpm service) Closes #2891 --- php-fpm/Dockerfile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index f32e8a7e..e1b121f9 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -381,7 +381,8 @@ ARG INSTALL_AMQP=false RUN if [ ${INSTALL_AMQP} = true ]; then \ # download and install manually, to make sure it's compatible with ampq installed by pecl later # install cmake first - apt-get -y install cmake && \ + apt-get -yqq update && \ + apt-get -yqq install cmake && \ curl -L -o /tmp/rabbitmq-c.tar.gz https://github.com/alanxz/rabbitmq-c/archive/master.tar.gz && \ mkdir -p rabbitmq-c && \ tar -C rabbitmq-c -zxvf /tmp/rabbitmq-c.tar.gz --strip 1 && \ @@ -390,7 +391,11 @@ RUN if [ ${INSTALL_AMQP} = true ]; then \ cmake .. && \ cmake --build . --target install && \ # Install the amqp extension - pecl install amqp && \ + if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \ + printf "\n" | pecl install amqp-1.11.0beta; \ + else \ + printf "\n" | pecl install amqp; \ + fi && \ docker-php-ext-enable amqp && \ # Install the sockets extension docker-php-ext-install sockets \ From 2a953c1a9af7b90b20f0bbcd92e3008b110b4114 Mon Sep 17 00:00:00 2001 From: Pavel Savushkin Date: Fri, 19 Mar 2021 23:03:51 +0200 Subject: [PATCH 03/20] fix(AMQP extension): get it worked for php-worker image We need to be able to build AMQP for php-worker on PHP 7.0: there are some version conflicts. Closes #2891 --- php-worker/Dockerfile | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/php-worker/Dockerfile b/php-worker/Dockerfile index d3f97431..4c21bdab 100644 --- a/php-worker/Dockerfile +++ b/php-worker/Dockerfile @@ -214,14 +214,20 @@ RUN if [ ${INSTALL_AUDIOWAVEFORM} = true ]; then \ && make install \ ;fi - # Install AMQP: ARG INSTALL_AMQP=false RUN if [ ${INSTALL_AMQP} = true ]; then \ - apk --update add rabbitmq-c rabbitmq-c-dev && \ - pecl install amqp && \ + apk del -q openssl openssl-dev && \ + apk --update add -q rabbitmq-c rabbitmq-c-dev && \ + if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \ + printf "\n" | pecl install amqp-1.11.0beta; \ + else \ + printf "\n" | pecl install amqp; \ + fi && \ docker-php-ext-enable amqp && \ + apk del -q rabbitmq-c-dev && \ + apk add --update -q openssl openssl-dev && \ docker-php-ext-install sockets \ ;fi From 267b972d17225fae0e9c781a38be4dd7b4ec1dd3 Mon Sep 17 00:00:00 2001 From: Pavel Savushkin Date: Sat, 20 Mar 2021 00:37:43 +0200 Subject: [PATCH 04/20] fix(AMQP extension): remove unnecessary apt update Avoid extra update. Closes #2891 --- php-fpm/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index e1b121f9..472dc850 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -381,7 +381,6 @@ ARG INSTALL_AMQP=false RUN if [ ${INSTALL_AMQP} = true ]; then \ # download and install manually, to make sure it's compatible with ampq installed by pecl later # install cmake first - apt-get -yqq update && \ apt-get -yqq install cmake && \ curl -L -o /tmp/rabbitmq-c.tar.gz https://github.com/alanxz/rabbitmq-c/archive/master.tar.gz && \ mkdir -p rabbitmq-c && \ From 15bf900fe68cdeb42a6e03518476141559c8d9c6 Mon Sep 17 00:00:00 2001 From: Pavel Savushkin Date: Sat, 20 Mar 2021 01:45:51 +0200 Subject: [PATCH 05/20] fix(envoy package): avoid specified version to support older PHP versions We need to be able to install envoy for all versions of PHP. (cherry picked from commit 7458e04d2c8287ed418a3f6cd7b82d9e6238db85) --- workspace/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workspace/Dockerfile b/workspace/Dockerfile index af8da12b..6adb1491 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -981,7 +981,7 @@ ARG INSTALL_LARAVEL_ENVOY=false RUN if [ ${INSTALL_LARAVEL_ENVOY} = true ]; then \ # Install the Laravel Envoy - composer global require "laravel/envoy=~2.0" \ + composer global require laravel/envoy \ ;fi ########################################################################### From 21dcc046c9ad69d62c56f121978fb3035f83c7ec Mon Sep 17 00:00:00 2001 From: Pavel Savushkin Date: Sat, 20 Mar 2021 02:10:09 +0200 Subject: [PATCH 06/20] fix(hirak/prestissimo package): normalize installation of the package Avoid installation of hirak/prestissimo for the second version of the composer. Change user to root, due to usage of this user as a common one. --- workspace/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/workspace/Dockerfile b/workspace/Dockerfile index af8da12b..188284e3 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -1026,13 +1026,13 @@ RUN if [ ${INSTALL_DEPLOYER} = true ]; then \ ########################################################################### # Prestissimo: ########################################################################### -USER laradock - ARG INSTALL_PRESTISSIMO=false RUN if [ ${INSTALL_PRESTISSIMO} = true ]; then \ - # Install Prestissimo - composer global require "hirak/prestissimo" \ + if [ $(php -r "echo COMPOSER_VERSION;") = "1" ]; then \ + # Install Prestissimo + composer global require "hirak/prestissimo" \ + ;fi ;fi ########################################################################### From 2b778af03ff50c0080af9e5b67ba4778313e4ab3 Mon Sep 17 00:00:00 2001 From: Pavel Savushkin Date: Sat, 20 Mar 2021 02:44:04 +0200 Subject: [PATCH 07/20] fix(ioncube extension): remove installation for PHP 8 PHP 8.0 currently is not supported, so it should be remove from the building for this version. --- php-fpm/Dockerfile | 14 ++++++++------ workspace/Dockerfile | 15 +++++++++------ 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index f32e8a7e..7eb23dd0 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -595,12 +595,14 @@ RUN if [ ${INSTALL_OCI8} = true ]; then \ ARG INSTALL_IONCUBE=false RUN if [ ${INSTALL_IONCUBE} = true ]; then \ - # Install the php ioncube loader - curl -L -o /tmp/ioncube_loaders_lin_x86-64.tar.gz https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz \ - && tar zxpf /tmp/ioncube_loaders_lin_x86-64.tar.gz -C /tmp \ - && mv /tmp/ioncube/ioncube_loader_lin_${LARADOCK_PHP_VERSION}.so $(php -r "echo ini_get('extension_dir');")/ioncube_loader.so \ - && printf "zend_extension=ioncube_loader.so\n" > $PHP_INI_DIR/conf.d/0ioncube.ini \ - && rm -rf /tmp/ioncube* \ + if [ $(php -r "echo PHP_MAJOR_VERSION;") != "8" ]; then \ + # Install the php ioncube loader + curl -L -o /tmp/ioncube_loaders_lin_x86-64.tar.gz https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz \ + && tar zxpf /tmp/ioncube_loaders_lin_x86-64.tar.gz -C /tmp \ + && mv /tmp/ioncube/ioncube_loader_lin_${LARADOCK_PHP_VERSION}.so $(php -r "echo ini_get('extension_dir');")/ioncube_loader.so \ + && printf "zend_extension=ioncube_loader.so\n" > $PHP_INI_DIR/conf.d/0ioncube.ini \ + && rm -rf /tmp/ioncube* \ + ;fi \ ;fi ########################################################################### diff --git a/workspace/Dockerfile b/workspace/Dockerfile index af8da12b..449ff90d 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -691,12 +691,15 @@ RUN if [ ${INSTALL_GRAPHVIZ} = true ]; then \ ARG INSTALL_IONCUBE=false RUN if [ ${INSTALL_IONCUBE} = true ]; then \ - # Install the php ioncube loader - curl -L -o /tmp/ioncube_loaders_lin_x86-64.tar.gz https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz \ - && tar zxpf /tmp/ioncube_loaders_lin_x86-64.tar.gz -C /tmp \ - && mv /tmp/ioncube/ioncube_loader_lin_${LARADOCK_PHP_VERSION}.so $(php -r "echo ini_get('extension_dir');")/ioncube_loader.so \ - && echo "zend_extension=ioncube_loader.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/0ioncube.ini \ - && rm -rf /tmp/ioncube* \ + if [ $(php -r "echo PHP_MAJOR_VERSION;") != "8" ]; then \ + # Install the php ioncube loader + curl -L -o /tmp/ioncube_loaders_lin_x86-64.tar.gz https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz \ + && tar zxpf /tmp/ioncube_loaders_lin_x86-64.tar.gz -C /tmp \ + && mv /tmp/ioncube/ioncube_loader_lin_${LARADOCK_PHP_VERSION}.so $(php -r "echo ini_get('extension_dir');")/ioncube_loader.so \ + && echo "zend_extension=ioncube_loader.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/ioncube.ini \ + && ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/ioncube.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/0ioncube.ini \ + && rm -rf /tmp/ioncube* \ + ;fi \ ;fi ########################################################################### From e059740296f894054290f1cb22cdfc5148338fff Mon Sep 17 00:00:00 2001 From: Pavel Savushkin Date: Sat, 20 Mar 2021 02:47:27 +0200 Subject: [PATCH 08/20] fix(hirak/prestissimo package): add end of the line --- workspace/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workspace/Dockerfile b/workspace/Dockerfile index 188284e3..3563988a 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -1032,7 +1032,7 @@ RUN if [ ${INSTALL_PRESTISSIMO} = true ]; then \ if [ $(php -r "echo COMPOSER_VERSION;") = "1" ]; then \ # Install Prestissimo composer global require "hirak/prestissimo" \ - ;fi + ;fi \ ;fi ########################################################################### From 91e329a84d09e4450c653dca0d8ff6bc97800a54 Mon Sep 17 00:00:00 2001 From: Shao Yu Lung Date: Sun, 21 Mar 2021 19:23:53 +0800 Subject: [PATCH 09/20] support gnupg --- .github/workflows/main-ci.yml | 2 +- docker-compose.yml | 4 ++++ env-example | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main-ci.yml b/.github/workflows/main-ci.yml index d1ea0b71..197a5fa9 100644 --- a/.github/workflows/main-ci.yml +++ b/.github/workflows/main-ci.yml @@ -23,7 +23,7 @@ jobs: PHP_VERSION: ${{ matrix.php_version }} run: | cp env-example .env - sed -i -- '201,272s/=false/=true/g' .env + sed -i -- '202,274s/=false/=true/g' .env sed -i -- 's/CHANGE_SOURCE=true/CHANGE_SOURCE=false/g' .env sed -i -- 's/PHPDBG=true/PHPDBG=false/g' .env sed -i -- 's/CASSANDRA=true/CASSANDRA=false/g' .env diff --git a/docker-compose.yml b/docker-compose.yml index 3d9ed770..56cd7b28 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -74,6 +74,7 @@ services: - INSTALL_SUBVERSION=${WORKSPACE_INSTALL_SUBVERSION} - INSTALL_BZ2=${WORKSPACE_INSTALL_BZ2} - INSTALL_GMP=${WORKSPACE_INSTALL_GMP} + - INSTALL_GNUPG=${WORKSPACE_INSTALL_GNUPG} - INSTALL_XDEBUG=${WORKSPACE_INSTALL_XDEBUG} - INSTALL_PCOV=${WORKSPACE_INSTALL_PCOV} - INSTALL_PHPDBG=${WORKSPACE_INSTALL_PHPDBG} @@ -206,6 +207,7 @@ services: - LARADOCK_PHALCON_VERSION=${PHALCON_VERSION} - INSTALL_BZ2=${PHP_FPM_INSTALL_BZ2} - INSTALL_GMP=${PHP_FPM_INSTALL_GMP} + - INSTALL_GNUPG=${PHP_FPM_INSTALL_GNUPG} - INSTALL_XDEBUG=${PHP_FPM_INSTALL_XDEBUG} - INSTALL_PCOV=${PHP_FPM_INSTALL_PCOV} - INSTALL_PHPDBG=${PHP_FPM_INSTALL_PHPDBG} @@ -307,6 +309,7 @@ services: - INSTALL_GD=${PHP_WORKER_INSTALL_GD} - INSTALL_IMAGEMAGICK=${PHP_WORKER_INSTALL_IMAGEMAGICK} - INSTALL_GMP=${PHP_WORKER_INSTALL_GMP} + - INSTALL_GNUPG=${PHP_WORKER_INSTALL_GNUPG} - INSTALL_PGSQL=${PHP_WORKER_INSTALL_PGSQL} - INSTALL_MONGO=${PHP_WORKER_INSTALL_MONGO} - INSTALL_BCMATH=${PHP_WORKER_INSTALL_BCMATH} @@ -348,6 +351,7 @@ services: - INSTALL_BZ2=${LARAVEL_HORIZON_INSTALL_BZ2} - INSTALL_GD=${LARAVEL_HORIZON_INSTALL_GD} - INSTALL_GMP=${LARAVEL_HORIZON_INSTALL_GMP} + - INSTALL_GNUPG=${LARAVEL_HORIZON_INSTALL_GNUPG} - INSTALL_IMAGEMAGICK=${LARAVEL_HORIZON_INSTALL_IMAGEMAGICK} - INSTALL_PGSQL=${PHP_FPM_INSTALL_PGSQL} - INSTALL_ZIP_ARCHIVE=${LARAVEL_HORIZON_INSTALL_ZIP_ARCHIVE} diff --git a/env-example b/env-example index 2600dc9c..aaca6e7a 100644 --- a/env-example +++ b/env-example @@ -123,6 +123,7 @@ WORKSPACE_INSTALL_WORKSPACE_SSH=false WORKSPACE_INSTALL_SUBVERSION=false WORKSPACE_INSTALL_BZ2=false WORKSPACE_INSTALL_GMP=false +WORKSPACE_INSTALL_GNUPG=false WORKSPACE_INSTALL_XDEBUG=false WORKSPACE_INSTALL_PCOV=false WORKSPACE_INSTALL_PHPDBG=false @@ -212,6 +213,7 @@ PHP_FPM_INSTALL_PHPREDIS=true PHP_FPM_INSTALL_MEMCACHED=false PHP_FPM_INSTALL_BZ2=false PHP_FPM_INSTALL_GMP=false +PHP_FPM_INSTALL_GNUPG=false PHP_FPM_INSTALL_XDEBUG=false PHP_FPM_INSTALL_PCOV=false PHP_FPM_INSTALL_XHPROF=false @@ -277,6 +279,7 @@ PHP_WORKER_INSTALL_GD=false PHP_WORKER_INSTALL_IMAGEMAGICK=false PHP_WORKER_IMAGEMAGICK_VERSION=latest PHP_WORKER_INSTALL_GMP=false +PHP_WORKER_INSTALL_GNUPG=false PHP_WORKER_INSTALL_PGSQL=false PHP_WORKER_INSTALL_MONGO=false PHP_WORKER_INSTALL_BCMATH=false @@ -316,6 +319,7 @@ NGINX_SSL_PATH=./nginx/ssl/ LARAVEL_HORIZON_INSTALL_BZ2=false LARAVEL_HORIZON_INSTALL_GD=false LARAVEL_HORIZON_INSTALL_GMP=false +LARAVEL_HORIZON_INSTALL_GNUPG=false LARAVEL_HORIZON_INSTALL_IMAGEMAGICK=false LARAVEL_HORIZON_IMAGEMAGICK_VERSION=latest LARAVEL_HORIZON_INSTALL_SOCKETS=false From 3d17a13789cb758bc705a1a08405e7ef73567205 Mon Sep 17 00:00:00 2001 From: Shao Yu Lung Date: Sun, 21 Mar 2021 19:24:30 +0800 Subject: [PATCH 10/20] horizon, php-worker | GnuPG --- laravel-horizon/Dockerfile | 17 +++++++++++++++++ php-worker/Dockerfile | 17 +++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/laravel-horizon/Dockerfile b/laravel-horizon/Dockerfile index 10cf90eb..e35e81e2 100644 --- a/laravel-horizon/Dockerfile +++ b/laravel-horizon/Dockerfile @@ -57,6 +57,23 @@ RUN if [ ${INSTALL_BZ2} = true ]; then \ docker-php-ext-install bz2 \ ;fi +########################################################################### +# PHP GnuPG: +########################################################################### + +ARG INSTALL_GNUPG=false + +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 gpgme; \ + if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \ + pecl install gnupg-1.5.0RC2; \ + else \ + pecl install gnupg; \ + fi; \ + docker-php-ext-enable gnupg; \ + fi + #Install GD package: ARG INSTALL_GD=false RUN if [ ${INSTALL_GD} = true ]; then \ diff --git a/php-worker/Dockerfile b/php-worker/Dockerfile index 0787b7ea..97a5125b 100644 --- a/php-worker/Dockerfile +++ b/php-worker/Dockerfile @@ -59,6 +59,23 @@ RUN if [ ${INSTALL_BZ2} = true ]; then \ docker-php-ext-install bz2; \ fi +########################################################################### +# PHP GnuPG: +########################################################################### + +ARG INSTALL_GNUPG=false + +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 gpgme; \ + if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \ + pecl install gnupg-1.5.0RC2; \ + else \ + pecl install gnupg; \ + fi; \ + docker-php-ext-enable gnupg; \ + fi + #Install GD package: ARG INSTALL_GD=false RUN if [ ${INSTALL_GD} = true ]; then \ From 56afa3efa1e1a739b5ef937058e2e54745f25b87 Mon Sep 17 00:00:00 2001 From: Shao Yu Lung Date: Sun, 21 Mar 2021 19:25:00 +0800 Subject: [PATCH 11/20] php-fpm, workspace | GnuPG --- php-fpm/Dockerfile | 15 +++++++++++++++ workspace/Dockerfile | 10 ++++++++++ 2 files changed, 25 insertions(+) diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index 06fbcdf6..4de5e4b5 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -96,6 +96,21 @@ RUN if [ ${INSTALL_GMP} = true ]; then \ docker-php-ext-install gmp \ ;fi +########################################################################### +# GnuPG: +########################################################################### + +ARG INSTALL_GNUPG=false + +RUN if [ ${INSTALL_GNUPG} = true ]; then \ + 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; \ + fi; \ + fi + ########################################################################### # SSH2: ########################################################################### diff --git a/workspace/Dockerfile b/workspace/Dockerfile index 534e4c7a..cac7bd41 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -270,6 +270,16 @@ RUN if [ ${INSTALL_GMP} = true ]; then \ apt-get -y install php${LARADOCK_PHP_VERSION}-gmp \ ;fi +########################################################################### +# GnuPG: +########################################################################### + +ARG INSTALL_GNUPG=false + +RUN if [ ${INSTALL_GNUPG} = true ]; then \ + apt-get install -yqq php${LARADOCK_PHP_VERSION}-gnupg; \ + fi + ########################################################################### # SSH2: ########################################################################### From 89b73eeeee19f18133f1f81fe7c9968acd66dbbc Mon Sep 17 00:00:00 2001 From: Pavel Savushkin Date: Sun, 21 Mar 2021 13:37:16 +0200 Subject: [PATCH 12/20] feat(ioncube extension): add reference to .env file Provide a restriction to env file. --- env-example | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/env-example b/env-example index 7347e051..0bf08ac3 100644 --- a/env-example +++ b/env-example @@ -166,7 +166,7 @@ WORKSPACE_INSTALL_SWOOLE=false WORKSPACE_INSTALL_TAINT=false WORKSPACE_INSTALL_LIBPNG=false WORKSPACE_INSTALL_GRAPHVIZ=false -WORKSPACE_INSTALL_IONCUBE=false +WORKSPACE_INSTALL_IONCUBE=false # PHP 8.0 is not supported yet. Reference: https://forum.ioncube.com/viewtopic.php?t=4592 WORKSPACE_INSTALL_MYSQL_CLIENT=false WORKSPACE_INSTALL_PING=false WORKSPACE_INSTALL_SSHPASS=false @@ -240,7 +240,7 @@ PHP_FPM_INSTALL_POSTGIS=false PHP_FPM_INSTALL_PCNTL=false PHP_FPM_INSTALL_CALENDAR=false PHP_FPM_INSTALL_FAKETIME=false -PHP_FPM_INSTALL_IONCUBE=false +PHP_FPM_INSTALL_IONCUBE=false # PHP 8.0 is not supported yet. Reference: https://forum.ioncube.com/viewtopic.php?t=4592 PHP_FPM_INSTALL_RDKAFKA=false PHP_FPM_INSTALL_GETTEXT=false PHP_FPM_INSTALL_XMLRPC=false From 3c6cfc8dfd99fd356638fda36256844b9b32e67f Mon Sep 17 00:00:00 2001 From: Pavel Savushkin Date: Sun, 21 Mar 2021 13:41:25 +0200 Subject: [PATCH 13/20] feat(amqp extension): add github actions installation We need to be able to test installation of AMQP with GitHub Actions. --- .github/workflows/main-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/main-ci.yml b/.github/workflows/main-ci.yml index ad44a60a..331b4a20 100644 --- a/.github/workflows/main-ci.yml +++ b/.github/workflows/main-ci.yml @@ -1,6 +1,6 @@ name: CI -on: +on: push: branches: '**' tags: '**' @@ -34,7 +34,6 @@ jobs: 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 sed -i -- 's/OCI8=true/OCI8=false/g' .env sed -i -- 's/IONCUBE=true/IONCUBE=false/g' .env From e8d4e1be77d3549c7ccf0098f1dd74ae32701537 Mon Sep 17 00:00:00 2001 From: "Shao Yu-Lung (Allen)" Date: Sun, 21 Mar 2021 21:48:07 +0800 Subject: [PATCH 14/20] Update main-ci.yml CI build install GnuPG --- .github/workflows/main-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main-ci.yml b/.github/workflows/main-ci.yml index 197a5fa9..3367b277 100644 --- a/.github/workflows/main-ci.yml +++ b/.github/workflows/main-ci.yml @@ -24,6 +24,7 @@ jobs: run: | cp env-example .env sed -i -- '202,274s/=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/PHPDBG=true/PHPDBG=false/g' .env sed -i -- 's/CASSANDRA=true/CASSANDRA=false/g' .env From e8e4790db2a9d2385791b5f2fe4ee4753e769241 Mon Sep 17 00:00:00 2001 From: "Shao Yu-Lung (Allen)" Date: Mon, 22 Mar 2021 00:00:38 +0800 Subject: [PATCH 15/20] feat(ioncube extension): add github actions installation --- .github/workflows/main-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/main-ci.yml b/.github/workflows/main-ci.yml index ad44a60a..8f79f598 100644 --- a/.github/workflows/main-ci.yml +++ b/.github/workflows/main-ci.yml @@ -37,7 +37,6 @@ jobs: sed -i -- 's/AMQP=true/AMQP=false/g' .env sed -i -- 's/MEMCACHED=true/MEMCACHED=false/g' .env sed -i -- 's/OCI8=true/OCI8=false/g' .env - sed -i -- 's/IONCUBE=true/IONCUBE=false/g' .env docker-compose build ${{ matrix.service }} build-other: From 4270f1db71379b7775575dbb3b1fb0e3699b2274 Mon Sep 17 00:00:00 2001 From: Pavel Savushkin Date: Sun, 21 Mar 2021 18:10:08 +0200 Subject: [PATCH 16/20] 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. --- .github/workflows/main-ci.yml | 3 +-- php-fpm/Dockerfile | 12 +++++++----- workspace/Dockerfile | 16 ++++++++-------- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/.github/workflows/main-ci.yml b/.github/workflows/main-ci.yml index d1ea0b71..3ab1f21c 100644 --- a/.github/workflows/main-ci.yml +++ b/.github/workflows/main-ci.yml @@ -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 diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index 06fbcdf6..88784a92 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -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 ########################################################################### diff --git a/workspace/Dockerfile b/workspace/Dockerfile index 534e4c7a..4cbcf78f 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -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 From 95fe1b179f4f60ce2a1d050621c3fe7d8e689974 Mon Sep 17 00:00:00 2001 From: Pavel Savushkin Date: Sun, 21 Mar 2021 18:41:48 +0200 Subject: [PATCH 17/20] fix(YAML extension): avoid typo --- workspace/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workspace/Dockerfile b/workspace/Dockerfile index 4cbcf78f..47bd4adb 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -1395,7 +1395,7 @@ RUN if [ ${INSTALL_YAML} = true ]; then \ 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; \ + && ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/yaml.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/35-yaml.ini \ ;fi ########################################################################### From 9317b71ebcb07b034dc6c8e9f775e800c2297344 Mon Sep 17 00:00:00 2001 From: Pavel Savushkin Date: Sun, 21 Mar 2021 18:46:47 +0200 Subject: [PATCH 18/20] fix(YAML extension): avoid typo --- php-fpm/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index 88784a92..27a839e0 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -843,7 +843,7 @@ RUN if [ ${INSTALL_YAML} = true ]; then \ 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 + else \ echo '' | pecl install yaml; \ fi \ && docker-php-ext-enable yaml; \ From ad2b94fa60bff9271592f33152610d84d5b3db95 Mon Sep 17 00:00:00 2001 From: Pavel Savushkin Date: Sun, 21 Mar 2021 18:51:06 +0200 Subject: [PATCH 19/20] fix(YAML extension): avoid typo --- workspace/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workspace/Dockerfile b/workspace/Dockerfile index 47bd4adb..578a795b 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -1391,7 +1391,7 @@ RUN if [ ${INSTALL_YAML} = true ]; then \ 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 + else \ echo '' | pecl install yaml; \ fi \ && echo "extension=yaml.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/yaml.ini \ From 5686c698e7afae651d1e0efddbdc3779ed3374eb Mon Sep 17 00:00:00 2001 From: Pavel Savushkin Date: Sun, 21 Mar 2021 19:21:34 +0200 Subject: [PATCH 20/20] fix(YAML extension): avoid typo --- php-fpm/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index 27a839e0..980ad426 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -838,15 +838,15 @@ USER root 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 \ + apt-get install -yqq libyaml-dev \ + && if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \ 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; \ + && docker-php-ext-enable yaml \ ;fi ###########################################################################