diff --git a/docker-compose.yml b/docker-compose.yml index 8ca7203..a54cae1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,7 +5,7 @@ version: "2" services: platform: - image: alfresco/alfresco-content-repository-community:6.2.0-ga + image: alfresco/alfresco-content-repository:6.2.2.3 mem_limit: 1700m environment: JAVA_OPTS: " @@ -35,7 +35,18 @@ services: -Dcsrf.filter.enabled=false -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80 - -Dtransform.service.enabled=false + -Dtransform.service.enabled=true + -Dlocal.transform.service.enabled=false + + -Dtransform.service.url=http://transform-router:8095 + -Dsfs.url=http://shared-file-store:8099 + -Dalfresco-pdf-renderer.url=http://transform-engine-aio:8090 + -Djodconverter.url=http://transform-engine-aio:8090 + -Dimg.url=http://transform-engine-aio:8090 + -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 @@ -44,6 +55,33 @@ services: depends_on: - postgres-acs - activemq + - shared-file-store + volumes: + - "$ALFRESCO_LICENSE_DIR/acs:/usr/local/tomcat/shared/classes/alfresco/extension/license:ro" + + transform-router: + image: quay.io/alfresco/alfresco-transform-router:1.3.1 + environment: + ACTIVEMQ_URL: "nio://activemq:61616" + CORE_AIO_URL : "http://transform-core-aio:8090" + FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file" + depends_on: + - activemq + - shared-file-store + + transform-core-aio: + image: alfresco/alfresco-transform-core-aio:2.3.6 + environment: + ACTIVEMQ_URL: "nio://activemq:61616" + FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file" + depends_on: + - activemq + - shared-file-store + + shared-file-store: + image: alfresco/alfresco-shared-file-store:0.10.0 + volumes: + - shared-file-store-volume:/tmp/Alfresco/sfs transform-core-aio: image: alfresco/alfresco-transform-core-aio:2.3.6 @@ -88,6 +126,24 @@ services: image: alfresco/alfresco-activemq:5.15.8 mem_limit: 256m + 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 + + digital-workspace: + image: quay.io/alfresco/alfresco-digital-workspace:2.0.0-adw + mem_limit: 128m + environment: + BASE_PATH: ./ + identity: image: alfresco/alfresco-identity-service:1.3 user: jboss @@ -102,10 +158,18 @@ services: proxy: build: ./nginx-ingress - image: local/nginx-ingress:acs-share-aims + image: local/nginx-ingress:acs-sync-share-adw-aims ports: - 8080:8080 depends_on: - platform + - sync - share + - digital-workspace - identity + +volumes: + shared-file-store-volume: + driver_opts: + type: tmpfs + device: tmpfs diff --git a/nginx-ingress/entrypoint.sh b/nginx-ingress/entrypoint.sh index 9e8c848..303e738 100644 --- a/nginx-ingress/entrypoint.sh +++ b/nginx-ingress/entrypoint.sh @@ -4,10 +4,18 @@ if [[ $ACS_PLATFORM_URL ]]; then sed -i s%http:\/\/platform:8080%"$ACS_PLATFORM_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 [[ $ACS_SHARE_URL ]]; then sed -i s%http:\/\/share:8080%"$ACS_SHARE_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 [[ $AIMS_URL ]]; then sed -i s%http:\/\/identity:8080%"$AIMS_URL"%g /etc/nginx/nginx.conf fi diff --git a/nginx-ingress/nginx.conf b/nginx-ingress/nginx.conf index d22a006..4f7ab44 100644 --- a/nginx-ingress/nginx.conf +++ b/nginx-ingress/nginx.conf @@ -48,10 +48,21 @@ 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/; + } location /share/ { proxy_pass http://share:8080; } + + location /workspace/ { + proxy_pass http://digital-workspace:8080; + + # If using external proxy / load balancer (for initial redirect if no trailing slash) + absolute_redirect off; + } location /auth/ { proxy_pass http://identity:8080;