Compare commits

...
Author SHA1 Message Date
brian e86f9b6237 Merge branch 'acs-frontend-enterprise' into ags-frontend-enterprise 2021-04-02 10:34:43 -04:00
brian.long f90a541ec2 fixed dup service 2021-04-02 10:31:35 -04:00
brian 84feaff8e3 Merge branch 'ags-backend-enterprise' into ags-frontend-enterprise 2021-04-02 09:21:13 -04:00
brian 3b7770e16d Merge branch 'acs-frontend-enterprise' into ags-frontend-enterprise 2021-04-02 09:21:12 -04:00
brian f52aee275e Merge branch 'acs-frontend' into acs-frontend-enterprise 2021-04-02 09:20:56 -04:00
brian c2c340f61e Merge branch 'acs-adw-base' into acs-frontend-enterprise 2021-04-02 09:20:55 -04:00
brian.long c9d1646933 Merge remote-tracking branch 'origin/acs-backend-enterprise' into acs-frontend-enterprise 2021-04-02 09:20:11 -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 a50c3da468 Merge branch 'acs-backend-enterprise' into ags-backend-enterprise 2021-04-02 09:14:39 -04:00
brian f8638e7a26 Merge branch 'ags-enterprise' into ags-backend-enterprise 2021-04-02 09:14:38 -04:00
brian 4d584785ff Merge branch 'ags' into ags-enterprise 2021-04-02 09:14:31 -04:00
brian 96987b7ff1 Merge branch 'acs-enterprise' into ags-enterprise 2021-04-02 09:14:31 -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 b6f2befafb Merge branch 'acs-ats-enterprise' into acs-backend-enterprise 2021-04-02 09:13:57 -04:00
brian c11990900c Merge branch 'acs-sync-base' into acs-backend-enterprise 2021-04-02 09:13:56 -04:00
brian e07cea5ffa Merge branch 'acs-search' into acs-backend-enterprise 2021-04-02 09:13:54 -04:00
brian 6e09a9c0c9 Merge branch 'acs' into ags 2021-04-02 09:13:52 -04:00
brian 29f4ca7c54 Merge branch 'acs-ats-base' into acs-ats-enterprise 2021-04-02 09:13:50 -04:00
brian 73fea3d13d Merge branch 'acs-enterprise' into acs-ats-enterprise 2021-04-02 09:13:49 -04:00
brian 910cc2e2cb Merge branch 'acs' into acs-enterprise 2021-04-02 09:13:44 -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 f10722dec9 Merge branch 'acs-base' into acs-sync-base 2021-04-02 09:13:22 -04:00
brian ec00d1a445 Merge branch 'acs-base' into acs-adw-base 2021-04-02 09:13:18 -04:00
brian bf09b85448 Merge branch 'acs-base' into acs-share-base 2021-04-02 09:13:10 -04:00
brian.long 39928d09fc Merge branch 'ats-base' into acs-ats-base 2021-04-02 09:11:32 -04:00
brian.long 9859e68fe8 Merge branch 'acs-base' into acs-ats-base 2021-04-02 09:11:22 -04:00
brian.long 4dccd7892f Merge branch 'base' into ats-base 2021-04-02 09:09:13 -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 c5f2448cf9 Merge branch 'acs-frontend-enterprise' into ags-frontend-enterprise 2021-01-13 20:52:40 -05:00
brian 806601c800 Merge branch 'ags-backend-enterprise' into ags-frontend-enterprise 2021-01-13 17:38:46 -05:00
brian e9542dbc96 Merge branch 'acs-frontend-enterprise' into ags-frontend-enterprise 2021-01-13 17:38:45 -05:00
brian eaa6f1025d Merge branch 'acs-backend-enterprise' into ags-backend-enterprise 2021-01-13 17:38:37 -05:00
brian 75afb1580b Merge branch 'acs-frontend-enterprise' into ags-frontend-enterprise 2021-01-13 11:55:43 -05:00
brian.long 6aa7c2229d Merge branch 'acs-frontend-enterprise' into ags-frontend-enterprise 2021-01-13 11:38:30 -05:00
brian.long f977291894 using AGS share-enterprise container 2021-01-13 11:22:01 -05:00
brian.long cc4ed62159 Merge remote-tracking branch 'origin/acs-adw-base' into ags-frontend-enterprise 2021-01-13 11:21:00 -05:00
brian.long e8a8d088f4 Merge branch 'ags-backend-enterprise' into ags-frontend-enterprise 2021-01-13 11:19:08 -05:00
brian.long c9075398cd Merge branch 'acs-backend-enterprise' into ags-backend-enterprise 2021-01-13 11:17:17 -05:00
brian.long 128a289ac3 Merge branch 'acs-frontend-enterprise' into ags-frontend-enterprise 2021-01-13 11:12:52 -05:00
brian.long 4f5a939b71 Merge remote-tracking branch 'origin/acs-backend-enterprise' into ags-backend-enterprise 2021-01-13 09:47:53 -05:00
brian.long 22b2583505 Merge branch 'acs-enterprise' into ags-enterprise 2021-01-13 09:45:50 -05: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
2 changed files with 3 additions and 7 deletions
+1 -2
View File
@@ -1,5 +1,4 @@
EXTERNAL_RESOURCE_DIR=/home/brian
ALFRESCO_DIR=${EXTERNAL_RESOURCE_DIR}/alfresco
ALFRESCO_DIR=~/alfresco
ALFRESCO_LICENSE_DIR=~/alfresco/license
PROXY_PROTOCOL=http
+2 -5
View File
@@ -5,7 +5,7 @@ version: "2"
services:
platform:
image: alfresco/alfresco-content-repository:6.2.2.3
image: quay.io/alfresco/alfresco-governance-repository-enterprise:V3.4-latest
mem_limit: 1700m
environment:
JAVA_OPTS: "
@@ -83,11 +83,8 @@ services:
volumes:
- shared-file-store-volume:/tmp/Alfresco/sfs
transform-core-aio:
image: alfresco/alfresco-transform-core-aio:2.3.6
share:
image: alfresco/alfresco-share:6.2.2
image: quay.io/alfresco/alfresco-governance-share-enterprise:V3.4-latest
mem_limit: 512m
environment:
REPO_HOST: "platform"