Merge branch 'acs' into ags

Merge branch 'acs-base' into acs
Merge branch 'proxy' into acs-base
2021-04-02 09:13:52 -04:00 · 2021-04-02 09:13:32 -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:27:44 -05:00
2 changed files with 3 additions and 4 deletions
--- a/.env
+++ b/.env
@@ -1,6 +1,5 @@
-EXTERNAL_RESOURCE_DIR=~
+ALFRESCO_DIR=~/alfresco
-ALFRESCO_DIR=${EXTERNAL_RESOURCE_DIR}/alfresco
+ALFRESCO_LICENSE_DIR=~/alfresco/license
 ALFRESCO_LICENSE_DIR=${ALFRESCO_DIR}/license
 PROXY_PROTOCOL=http
 PROXY_HOST=localhost
--- 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-governance-repository-community:V3.4-latest
        mem_limit: 1700m
        environment:
            JAVA_OPTS: "
Author	SHA1	Message	Date
brian	6e09a9c0c9	Merge branch 'acs' into ags	2021-04-02 09:13:52 -04:00
brian	d616b9ef3a	Merge branch 'acs-base' into acs	2021-04-02 09:13:32 -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	0999563353	Merge branch 'acs.acs-base' into ags.acs	2021-01-06 16:27:44 -05:00
Brian Long	295b0711b0	Merge branch 'acs-community.acs-base' into ags-community.acs-community	2021-01-06 12:24:10 -05:00
Brian Long	bc6a8539f3	switched platform to AGS (not AMP module distributed anymore)	2021-01-06 10:24:47 -05:00