1.51 (esimonetti#100)

* Update Dockerfile (esimonetti#97) I can't see process preview images when I was clicking on the eye icon in "pmse_Inbox/layout/casesList" Therefore I made a minor change. I'll hope work fine to they. I now I see the diagram draw without issue. Regards * Fix implode on php8 (esimonetti#95) * Updates for new release, and supporting message * Bumped versions for the changes of the community * Bumped versions for the changes of the community Also fixed Xdebug version to 3.1 for PHP 7.4 --------- Co-authored-by: Jorge Luis Sánchez Labastida <[email protected]> Co-authored-by: aurelromansgr <[email protected]>
sugarcrm-developers · Jan 31, 2023 · e9a698b · e9a698b
1 parent fb6567b
commit e9a698b
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 11 deletions.
diff --git 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!
 
 [<img src="https://www.paypalobjects.com/en_AU/i/btn/btn_donate_LG.gif">](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&currency_code=AUD)
 

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1 +1 @@
-1.50
+1.51