Merged multiple PR and added supporting changes for deployment

esimonetti · Jun 28, 2021 · 789af7a · 789af7a
1 parent 3333c91
commit 789af7a
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -14,7 +14,8 @@ This repository will help you deploy a Docker based **development only** full st
 
 ## Stacks available
 There are few stacks available, with in itself multiple platform combinations. You can read more about the specific stacks on the links below:
-* [Sugar 9](stacks/sugar9/README.md) - This stack is also valid for 9.1, 9.2 and 9.3 for local development of Sugar Cloud only versions
+* [Sugar 11](stacks/sugar11/README.md) - This stack is valid from version 11 for local developement also of Sugar Cloud only versions
+* [Sugar 9](stacks/sugar9/README.md) - This stack is also valid for 9.x and 10.x for local development of Sugar Cloud only versions
 * [Sugar 8](stacks/sugar8/README.md)
 
 You will find additional stacks within the [stack directory of the project](stacks).

diff --git a/images/php/73/cron/Dockerfile b/images/php/73/cron/Dockerfile
@@ -14,6 +14,7 @@ RUN apt-get update \
     libldap2-dev \
     libfreetype6-dev \
     libjpeg62-turbo-dev \
+    libxml2-dev \
     git \
     --no-install-recommends
 
@@ -52,7 +53,8 @@ RUN docker-php-ext-install mysqli \
     # problem for xdebug 2.6.1 with php 7.3rc (https://bugs.xdebug.org/view.php?id=1584)
     && pecl install xdebug-2.7.0beta1 \
     && pecl install redis \
-    && docker-php-ext-enable redis
+    && docker-php-ext-enable redis \
+    && docker-php-ext-install soap
 
 # disable by default, it can be enabled locally
 #COPY config/php/mods-available/xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini

diff --git a/images/php/74/apache/config/php/mods-available/xdebug.ini b/images/php/74/apache/config/php/mods-available/xdebug.ini
@@ -1,4 +1,4 @@
-zend_extension=xdebug.so
+;zend_extension=xdebug.so
 xdebug.max_nesting_level=500
 xdebug.profiler_enable=0
 

diff --git a/images/php/74/cron/Dockerfile b/images/php/74/cron/Dockerfile
@@ -14,6 +14,7 @@ RUN apt-get update \
     libldap2-dev \
     libfreetype6-dev \
     libjpeg62-turbo-dev \
+    libxml2-dev \
     git \
     --no-install-recommends
 
@@ -47,7 +48,8 @@ RUN docker-php-ext-install mysqli \
     && docker-php-ext-install ldap \
     && pecl install xdebug \
     && pecl install redis \
-    && docker-php-ext-enable redis
+    && docker-php-ext-enable redis \
+    && docker-php-ext-install soap
 
 # FIX for PHP 7.4 - Problems on GD with JPEG and FreeType support
 RUN docker-php-ext-configure gd --enable-gd --with-freetype --with-jpeg
@@ -87,4 +89,4 @@ RUN chmod +x /usr/local/bin/sugarcron
 WORKDIR "/var/www/html/sugar"
 USER sugar
 
-CMD ["/usr/local/bin/sugarcron"]
+CMD ["/usr/local/bin/sugarcron"]
diff --git a/stacks/sugar11/php74.yml b/stacks/sugar11/php74.yml
@@ -3,7 +3,7 @@ version: '3'
 services:
     web1:
         container_name: "sugar-web1"
-        image: sugar_php74_web
+        image: esimonetti/sugardockerized:php7.4-apache-1.40
         ports:
             - "8080:80"
         extra_hosts:                                   
@@ -18,27 +18,31 @@ services:
             - elasticsearch
             - redis
             - permissions
+            - testsmtp
         links:
             - mysql
             - elasticsearch
             - redis
+            - testsmtp
     cron:
         container_name: "sugar-cron"
-        image: sugar_php74_cron        
+        image: esimonetti/sugardockerized:php7.4-cron-1.40
         volumes:
             - ../../data/app:/var/www/html
         depends_on:
             - mysql
             - elasticsearch
             - redis
             - permissions
-        links:            
+            - testsmtp
+        links:
             - mysql
             - elasticsearch
-            - redis  
+            - redis
+            - testsmtp
     mysql:
         container_name: "sugar-mysql"
-        image: sugar_mysql
+        image: esimonetti/sugardockerized:mysql5.7-1.06
         ports:
             - "3306:3306"
         volumes:
@@ -74,10 +78,14 @@ services:
             - ../../data/redis:/data
     permissions:
         container_name: "sugar-permissions"
-        image: sugar_permissions
+        image: esimonetti/sugardockerized:permissions-1.19
         volumes:
             - ../../data/app:/var/www/html
+    testsmtp:
+        container_name: "sugar-smtp"
+        image: sugar_testsmtp
+        build: ../../images/testsmtp
 
 volumes:
     es-data01:
-        driver: local
+        driver: local
diff --git a/stacks/sugar9/php73-mac.yml b/stacks/sugar9/php73-mac.yml
@@ -5,7 +5,7 @@ version: '3'
 services:
     web1:
         container_name: "sugar-web1"
-        image: esimonetti/sugardockerized:php7.3-apache-1.28
+        image: esimonetti/sugardockerized:php7.3-apache-1.40
         ports:
             - "80:80"
         extra_hosts:
@@ -26,7 +26,7 @@ services:
             - redis
     cron:
         container_name: "sugar-cron"
-        image: esimonetti/sugardockerized:php7.3-cron-1.28
+        image: esimonetti/sugardockerized:php7.3-cron-1.40
         volumes:
             - ../../data/app:/var/www/html:delegated
         depends_on:

diff --git a/stacks/sugar9/php73.yml b/stacks/sugar9/php73.yml
@@ -3,7 +3,7 @@ version: '3'
 services:
     web1:
         container_name: "sugar-web1"
-        image: esimonetti/sugardockerized:php7.3-apache-1.28
+        image: esimonetti/sugardockerized:php7.3-apache-1.40
         ports:
             - "80:80"
         extra_hosts:
@@ -26,7 +26,7 @@ services:
             - testsmtp
     cron:
         container_name: "sugar-cron"
-        image: esimonetti/sugardockerized:php7.3-cron-1.28
+        image: esimonetti/sugardockerized:php7.3-cron-1.40
         volumes:
             - ../../data/app:/var/www/html
         depends_on:

diff --git a/stacks/sugar9/php73lb.yml b/stacks/sugar9/php73lb.yml
@@ -14,7 +14,7 @@ services:
             - web2
     web1:
         container_name: "sugar-web1"
-        image: esimonetti/sugardockerized:php7.3-apache-1.28
+        image: esimonetti/sugardockerized:php7.3-apache-1.40
         extra_hosts:
             - "docker.local:127.0.0.1"
         environment:
@@ -35,7 +35,7 @@ services:
             - testsmtp
     web2:
         container_name: "sugar-web2"
-        image: esimonetti/sugardockerized:php7.3-apache-1.28
+        image: esimonetti/sugardockerized:php7.3-apache-1.40
         extra_hosts:
             - "docker.local:127.0.0.1"
         environment:
@@ -56,7 +56,7 @@ services:
             - testsmtp
     cron:
         container_name: "sugar-cron"
-        image: esimonetti/sugardockerized:php7.3-cron-1.28
+        image: esimonetti/sugardockerized:php7.3-cron-1.40
         volumes:
             - ../../data/app:/var/www/html
         depends_on:

diff --git a/version b/version
@@ -1 +1 @@
-1.31
+1.40