Merge branch 'acs-base' into acs-lats-base

Merge branch 'proxy' into acs-base
Merge branch 'base' into proxy
2021-04-02 09:13:25 -04:00 · 2021-04-02 08:42:43 -04:00 · 2021-04-02 08:41:45 -04:00 · 2021-04-02 08:40:18 -04:00 · 2021-01-06 16:12:46 -05:00 · 2020-12-26 14:18:13 -05:00
2 changed files with 11 additions and 3 deletions
--- a/.env
+++ b/.env
@@ -1,6 +1,5 @@
-EXTERNAL_RESOURCE_DIR=~
-ALFRESCO_DIR=${EXTERNAL_RESOURCE_DIR}/alfresco
-ALFRESCO_LICENSE_DIR=${ALFRESCO_DIR}/license
+ALFRESCO_DIR=~/alfresco
+ALFRESCO_LICENSE_DIR=~/alfresco/license

 PROXY_PROTOCOL=http
 PROXY_HOST=localhost
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -14,11 +14,20 @@ services:
                -Dalfresco.port=${PROXY_PORT}
                -Dalfresco.protocol=${PROXY_PROTOCOL}
                -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
+                -DlocalTransform.core-aio.url=http://transform-core-aio:8090/
+                -Dalfresco-pdf-renderer.url=http://transform-core-aio:8090/
+                -Djodconverter.url=http://transform-core-aio:8090/
+                -Dimg.url=http://transform-core-aio:8090/
+                -Dtika.url=http://transform-core-aio:8090/
+                -Dtransform.misc.url=http://transform-core-aio:8090/
                "
        depends_on:
            - postgres-acs
            - activemq
    
+    transform-core-aio:
+        image: alfresco/alfresco-transform-core-aio:latest
+    
    postgres-acs:
        image: postgres:latest
Author	SHA1	Message	Date
brian	5a16e389c4	Merge branch 'acs-base' into acs-lats-base	2021-04-02 09:13:25 -04:00
Brian Long	6bce626075	Merge branch 'proxy' into acs-base	2021-04-02 08:42:43 -04:00
Brian Long	3d6aa1d4bc	Merge branch 'base' into proxy	2021-04-02 08:41:45 -04:00
Brian Long	91ad3afc0a	removed external dir	2021-04-02 08:40:18 -04:00
Brian Long	2ec11a1135	Merge branch 'acs-base.proxy' into acs-lats-base.acs-base	2021-01-06 16:12:46 -05:00
Brian Long	48d46aa70c	Merge branch 'acs-base.proxy' into acs-lats-base.acs-base	2020-12-26 14:18:13 -05:00
Brian Long	32ad6d8195	Merge branch 'acs-base.proxy' into acs-lats-base.acs-base	2020-12-25 23:32:25 -05:00
Brian Long	ddb535ab14	added legacy transform URLs	2020-12-17 16:40:02 -05:00
Brian Long	331eda62fc	Merge branch 'acs-base.proxy' into acs-lats-base.acs-base	2020-12-17 16:33:23 -05:00
Brian Long	0bb3b7bb28	added service name reference to platform	2020-12-17 13:07:55 -05:00
Brian Long	f97b6b973b	Merge branch 'acs-base.base' into acs-lats-base.acs-base	2020-12-17 13:04:06 -05:00
Brian Long	3fea801d26	added minimum local transform service	2020-12-17 00:01:13 -05:00