Commit d4616bfd authored by Brian Long's avatar Brian Long
Browse files

Merge branch 'acs-backend-enterprise-persist' into acs-frontend-enterprise-persist

parents 28e32e34 3409eb4e

docker-compose.yml

+16 −1
Original line number Diff line number Diff line
@@ -46,6 +46,8 @@ services: 
                -Dtika.url=http://transform-engine-aio:8090

                -Dtransform.misc.url=http://transform-engine-aio:8090



                -Ddsync.service.uris=${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}/sync

                

                -Dsystem.content.eagerOrphanCleanup=true

                -Dsystem.content.orphanProtectDays=0

                -Djodconverter.enabled=false
@@ -128,13 +130,26 @@ services: 
        volumes:

            - activemq-volume:/opt/activemq/data:rw



    sync:

        image: quay.io/alfresco/service-sync:3.3.3.1

        environment:

            JAVA_OPTS : "

                -Dsql.db.url=jdbc:postgresql://postgres-acs:5432/alfresco

                -Dmessaging.broker.host=activemq

                -Drepo.hostname=platform

                "

        depends_on:

            - postgres-acs

            - activemq



    proxy:

        build: ./nginx-ingress

        image: local/nginx-ingress:acs-share

        image: local/nginx-ingress:acs-sync-share

        ports:

            - 8080:8080

        depends_on:

            - platform

            - sync

            - share



volumes:

nginx-ingress/entrypoint.sh

+4 −0
Original line number Diff line number Diff line
@@ -8,6 +8,10 @@ if [[ $ACS_SHARE_URL ]]; then 
  sed -i s%http:\/\/share:8080%"$ACS_SHARE_URL"%g /etc/nginx/nginx.conf

fi



if [[ $ACS_SYNC_URL ]]; then

  sed -i s%http:\/\/sync:9090%"$ACS_SYNC_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

+4 −0
Original line number Diff line number Diff line
@@ -55,5 +55,9 @@ http { 
            # If using external proxy / load balancer (for initial redirect if no trailing slash)

            absolute_redirect off;

        }

        

        location /sync/ {

            proxy_pass http://sync:9090/alfresco/;

        }

    }

}