Merge branch 'acs-base' into acs-mysql-base

.env

@@ -8,4 +8,3 @@ PROXY_PORT=8080
 ACS_TAG=7.4.1.1
 AAMQ_TAG=latest
 POSTGRES_TAG=13
-ADW_TAG=4.1.0

docker-compose.yml

@@ -17,33 +17,27 @@ services:
                 -Dmetadata-keystore.metadata.password=oKIWzVdEdA
                 -Dmetadata-keystore.metadata.algorithm=DESede"
             JAVA_OPTS: "
-                -Ddb.driver=org.postgresql.Driver
-                -Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco
+                -Ddb.driver=com.mysql.jdbc.Driver
+                -Ddb.url=jdbc:mysql://mysql-acs:3306/alfresco?useUnicode=yes\\&characterEncoding=UTF-8\\&useSSL=false
                 -Dalfresco.host=${PROXY_HOST}
                 -Dalfresco.port=${PROXY_PORT}
                 -Dalfresco.protocol=${PROXY_PROTOCOL}
                 -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
                 "
         depends_on:
-            - postgres-acs
+            - mysql-acs
             - activemq
     
-    postgres-acs:
-        image: postgres:${POSTGRES_TAG}
+    mysql-acs:
+        image: mysql:latest
 
     activemq:
         image: alfresco/alfresco-activemq:${AAMQ_TAG}
 
-    digital-workspace:
-        image: quay.io/alfresco/alfresco-digital-workspace:${ADW_TAG}
-        environment:
-            APP_CONFIG_ECM_HOST: "${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}"
-    
     proxy:
         build: ./nginx-ingress
-        image: local/nginx-ingress:acs-adw
+        image: local/nginx-ingress:acs
         ports:
             - 8080:8080
         depends_on:
             - platform
-            - digital-workspace

nginx-ingress/entrypoint.sh

@@ -4,10 +4,6 @@ if [[ $ACS_PLATFORM_URL ]]; then
   sed -i s%http:\/\/platform:8080%"$ACS_PLATFORM_URL"%g /etc/nginx/nginx.conf
 fi
 
-if [[ $ADW_URL ]]; then
-  sed -i s%http:\/\/digital-workspace:8080%"$ADW_URL"%g /etc/nginx/nginx.conf
-fi
-
 if [[ $ACCESS_LOG ]]; then
   sed -i s%\#ENV_ACCESS_LOG%"access_log $ACCESS_LOG;"%g /etc/nginx/nginx.conf
 fi

nginx-ingress/nginx.conf

@@ -48,12 +48,5 @@ http {
             # If using external proxy / load balancer (for initial redirect if no trailing slash)
             absolute_redirect off;
         }
-
-        location /workspace/ {
-            proxy_pass http://digital-workspace:8080/;
-
-            # If using external proxy / load balancer (for initial redirect if no trailing slash)
-            absolute_redirect off;
-        }
     }
 }