diff --git a/README.md b/README.md index 083559c6a..de517d22b 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ This repository will help you deploy a Docker based **development only** full st ## Donations -If you find this sofware useful, please consider supporting the work that went into it, with a monthly amount. Thank you! +If you find this software useful, please consider supporting the work that went into it, with a monthly amount. Thank you! [](https://www.paypal.com/donate/?business=35FG9B3LQ3WPA&no_recurring=0&item_name=If+you+find+this+software+useful%2C+please+consider+supporting+the+work+that+went+into+it%2C+with+a+monthly+amount.+Thank+you%21¤cy_code=AUD) diff --git a/images/php/74/apache/Dockerfile b/images/php/74/apache/Dockerfile index b22a8d799..204f6215a 100644 --- a/images/php/74/apache/Dockerfile +++ b/images/php/74/apache/Dockerfile @@ -67,7 +67,8 @@ RUN docker-php-ext-install mysqli \ && docker-php-ext-install imap \ && docker-php-ext-install zip \ && docker-php-ext-install ldap \ - && pecl install xdebug \ +# cannot install latest Xdebug any longer on php 7.4 as it requires php 8+ + && pecl install xdebug-3.1.6 \ && pecl install redis \ && docker-php-ext-enable redis \ && docker-php-ext-install soap diff --git a/images/php/74/cron/Dockerfile b/images/php/74/cron/Dockerfile index 8a67d9637..ba2f0c97b 100644 --- a/images/php/74/cron/Dockerfile +++ b/images/php/74/cron/Dockerfile @@ -49,7 +49,8 @@ RUN docker-php-ext-install mysqli \ && docker-php-ext-install imap \ && docker-php-ext-install zip \ && docker-php-ext-install ldap \ - && pecl install xdebug \ +# cannot install latest Xdebug any longer on php 7.4 as it requires php 8+ + && pecl install xdebug-3.1.6 \ && pecl install redis \ && docker-php-ext-enable redis \ && docker-php-ext-install soap diff --git a/images/php/80/apache/Dockerfile b/images/php/80/apache/Dockerfile index 05599e608..d42e7b503 100644 --- a/images/php/80/apache/Dockerfile +++ b/images/php/80/apache/Dockerfile @@ -59,19 +59,20 @@ RUN set -ex \ RUN docker-php-ext-install mysqli \ && docker-php-ext-install bcmath \ - && docker-php-ext-configure gd --enable-gd --with-freetype --with-jpeg \ && docker-php-ext-install gd \ && docker-php-ext-install gmp \ && docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install imap \ && docker-php-ext-install zip \ && docker-php-ext-install ldap \ - && pecl install xdebug \ +# cannot install latest Xdebug any longer on php 7.4 as it requires php 8+ + && pecl install xdebug-3.1.6 \ && pecl install redis \ && docker-php-ext-enable redis \ && docker-php-ext-install soap -RUN docker-php-ext-install -j$(nproc) gd +RUN docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/ \ +&& docker-php-ext-install -j$(nproc) gd # enabled by default, it can be disabled locally COPY config/php/mods-available/xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini diff --git a/images/php/80/cron/Dockerfile b/images/php/80/cron/Dockerfile index bb99f2ee2..eb99e99dd 100644 --- a/images/php/80/cron/Dockerfile +++ b/images/php/80/cron/Dockerfile @@ -48,7 +48,9 @@ RUN docker-php-ext-install mysqli \ && docker-php-ext-install imap \ && docker-php-ext-install zip \ && docker-php-ext-install ldap \ - && pecl install xdebug \ + && docker-php-ext-install ldap \ +# cannot install latest Xdebug any longer on php 7.4 as it requires php 8+ + && pecl install xdebug-3.1.6 \ && pecl install redis \ && docker-php-ext-enable redis \ && docker-php-ext-install soap diff --git a/images/php/80/cron/apps/sugarcron b/images/php/80/cron/apps/sugarcron index 37fff1c99..ce24473ac 100644 --- a/images/php/80/cron/apps/sugarcron +++ b/images/php/80/cron/apps/sugarcron @@ -12,7 +12,7 @@ while (true) { $output = array(); exec('cd ' . $folder . ' && php -f ' . $cron . ' && cd /', $output); if (!empty($output)) { - echo implode($output, PHP_EOL).PHP_EOL; + echo implode(PHP_EOL, $output).PHP_EOL; } echo '[' . date('Y-m-d H:i:s') . '] sugar cron end' . PHP_EOL; if (file_exists($folder . '/' . $cron_pause)) { diff --git a/stacks/sugar12/php80.yml b/stacks/sugar12/php80.yml index 997ed3192..99f59a170 100644 --- a/stacks/sugar12/php80.yml +++ b/stacks/sugar12/php80.yml @@ -3,7 +3,7 @@ version: '3' services: web1: container_name: "sugar-web1" - image: esimonetti/sugardockerized:php8.0-apache-1.50 + image: esimonetti/sugardockerized:php8.0-apache-1.51 ports: - "80:80" extra_hosts: @@ -26,7 +26,7 @@ services: - testsmtp cron: container_name: "sugar-cron" - image: esimonetti/sugardockerized:php8.0-cron-1.50 + image: esimonetti/sugardockerized:php8.0-cron-1.51 volumes: - ../../data/app:/var/www/html depends_on: diff --git a/utilities/stack.sh b/utilities/stack.sh index a0a080ae2..350c80a56 100755 --- a/utilities/stack.sh +++ b/utilities/stack.sh @@ -71,6 +71,14 @@ else echo -------------------------------------------------------------------------------------------------------------------------------- echo fi + + echo + echo + echo If you find this software useful, please consider supporting the work that went into it, with a monthly amount + echo Please visit the original repo: https://github.com/esimonetti/SugarDockerized for details + echo Thank you! + echo + echo fi else if [ ! -d 'data' ] diff --git a/version b/version index ec8bede26..08369aae5 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.50 +1.51