Compare commits

...
Author SHA1 Message Date
brian baf69f0fb3 Merge branch 'acs-frontend' into ags-frontend 2021-04-02 09:21:17 -04:00
brian 2d0e25fd06 Merge branch 'ags-backend' into ags-frontend 2021-04-02 09:21:16 -04:00
brian 26adfeee1c Merge branch 'acs-backend' into acs-frontend 2021-04-02 09:14:46 -04:00
brian 68d0eeab49 Merge branch 'acs-share-base' into acs-frontend 2021-04-02 09:14:46 -04:00
brian 926494b3ee Merge branch 'ags' into ags-backend 2021-04-02 09:14:34 -04:00
brian 9e49b1d3c1 Merge branch 'acs-backend' into ags-backend 2021-04-02 09:14:33 -04:00
brian 456950f31d Merge branch 'acs-lats' into acs-backend 2021-04-02 09:14:29 -04:00
brian 6740f23779 Merge branch 'acs-search' into acs-backend 2021-04-02 09:14:28 -04:00
brian 880221a953 Merge branch 'acs-lats-base' into acs-lats 2021-04-02 09:14:00 -04:00
brian 398d6692f8 Merge branch 'acs' into acs-lats 2021-04-02 09:13:59 -04:00
brian 6e09a9c0c9 Merge branch 'acs' into ags 2021-04-02 09:13:52 -04:00
brian 99d39fa7f7 Merge branch 'acs-search-base' into acs-search 2021-04-02 09:13:42 -04:00
brian 1778fd04a4 Merge branch 'acs' into acs-search 2021-04-02 09:13:41 -04:00
brian d616b9ef3a Merge branch 'acs-base' into acs 2021-04-02 09:13:32 -04:00
brian a72d43a6af Merge branch 'acs-base' into acs-search-base 2021-04-02 09:13:30 -04:00
brian 5a16e389c4 Merge branch 'acs-base' into acs-lats-base 2021-04-02 09:13:25 -04:00
brian bf09b85448 Merge branch 'acs-base' into acs-share-base 2021-04-02 09:13:10 -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 d753a42731 Merge branch 'acs-frontend.acs-backend' into ags-frontend.acs-frontend 2021-01-06 16:30:24 -05:00
brian.long bf6a3cb669 Merge branch 'ags-backend.acs-backend' into ags-frontend.ags-backend 2021-01-06 16:30:10 -05:00
brian.long 24ea707337 Merge branch 'ags.acs' into ags-backend.ags 2021-01-06 16:29:50 -05:00
brian.long da0046118b Merge branch 'acs-backend.acs-lats' into ags-backend.acs-backend 2021-01-06 16:29:33 -05:00
brian.long 0999563353 Merge branch 'acs.acs-base' into ags.acs 2021-01-06 16:27:44 -05:00
brian.long 2134cda63a Merge branch 'acs-frontend-community.acs-backend-community' into ags-frontend-community.acs-frontend-community 2021-01-06 12:29:50 -05:00
brian.long 4863e29854 Merge branch 'ags-community.acs-community' into ags-backend-community.ags-community 2021-01-06 12:24:27 -05:00
brian.long d96822cedd Merge branch 'acs-backend-community.acs-lats-community' into ags-backend-community.acs-backend-community 2021-01-06 12:24:18 -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 eb09f26857 Merge branch 'acs-frontend-community.acs-backend-community' into ags-frontend-community.acs-frontend-community 2021-01-06 10:47:05 -05:00
brian.long 9709aceaed switched share to AGS (no AMP module distributed anymore) 2021-01-06 10:31:26 -05:00
brian.long 3686a6751d Merge branch 'acs-frontend-community.acs-share-base' into ags-frontend-community.acs-frontend-community 2021-01-06 10:28:33 -05:00
brian.long 59d082734f Merge branch 'acs-backend-community.acs-lats-community' into ags-backend-community.ags-community 2021-01-06 10:26:33 -05:00
brian.long bc6a8539f3 switched platform to AGS (not AMP module distributed anymore) 2021-01-06 10:24:47 -05:00
2 changed files with 4 additions and 5 deletions
+2 -3
View File
@@ -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
+2 -2
View File
@@ -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: "
@@ -49,7 +49,7 @@ services:
image: alfresco/alfresco-transform-core-aio:2.3.6
share:
image: alfresco/alfresco-share:6.2.2
image: alfresco/alfresco-governance-share-community:V3.4-latest
mem_limit: 512m
environment:
REPO_HOST: "platform"