Merge branch 'acs-base.proxy' into acs-adw-base.acs-base

.env

@@ -1,3 +1,7 @@
-BASEDIR=~
-ALFRESCO_DIR=${BASEDIR}/alfresco
+EXTERNAL_RESOURCE_DIR=~
+ALFRESCO_DIR=${EXTERNAL_RESOURCE_DIR}/alfresco
 ALFRESCO_LICENSE_DIR=${ALFRESCO_DIR}/license
+
+PROXY_PROTOCOL=http
+PROXY_HOST=localhost
+PROXY_PORT=8080

docker-compose.yml

@@ -8,7 +8,11 @@ services:
         image: alfresco/alfresco-content-repository:latest
         environment:
             JAVA_OPTS: "
+                -Ddb.driver=org.postgresql.Driver
                 -Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco
+                -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:

nginx-ingress/nginx.conf

@@ -20,9 +20,10 @@ http {
         proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504;
         proxy_redirect off;
         proxy_buffering off;
-        proxy_set_header Host            $host;
+        proxy_set_header Host              $http_host;
         proxy_set_header X-Real-IP         $remote_addr;
         proxy_set_header X-Forwarded-For   $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
         proxy_pass_header Set-Cookie;
         
         # Protect access to SOLR APIs