Compare commits

..

147 Commits

Author SHA1 Message Date
3ee62a6f46 Merge branch 'ags-backend-enterprise' into ags-backend-enterprise-persist 2023-10-26 14:46:25 -04:00
077e49d6f7 Merge branch 'acs-backend-enterprise-persist' into ags-backend-enterprise-persist 2023-10-26 14:46:07 -04:00
1149792321 Merge branch 'ags-enterprise' into ags-backend-enterprise 2023-10-26 14:43:37 -04:00
d23afd274c Merge branch 'acs-backend-enterprise' into ags-backend-enterprise 2023-10-26 14:43:33 -04:00
c088f81a2b Merge branch 'acs-enterprise' into ags-enterprise 2023-10-26 14:42:48 -04:00
5fc2127922 Merge branch 'ags' into ags-enterprise 2023-10-26 14:42:39 -04:00
31a89f370d Merge branch 'acs' into ags 2023-10-26 14:41:42 -04:00
07071281a9 Merge branch 'acs-backend-enterprise' into acs-backend-enterprise-persist 2023-10-26 14:35:31 -04:00
2c414ceb6c Merge branch 'ags-backend-enterprise' into ags-backend-enterprise-persist 2023-10-25 22:28:13 -04:00
20609d3e0f Merge branch 'acs-backend-enterprise-persist' into ags-backend-enterprise-persist 2023-10-25 22:27:56 -04:00
61ef62ecb1 Merge branch 'ags-enterprise' into ags-backend-enterprise 2023-10-25 22:27:15 -04:00
5429c03548 Merge branch 'acs-backend-enterprise' into ags-backend-enterprise 2023-10-25 22:26:52 -04:00
fa90205f6f Merge branch 'ags' into ags-enterprise 2023-10-25 22:26:23 -04:00
3d4f0640ab Merge branch 'acs-enterprise' into ags-enterprise 2023-10-25 22:26:19 -04:00
8a53f02159 Merge branch 'acs' into ags 2023-10-25 22:23:25 -04:00
f6db89c22a Merge branch 'acs-backend-enterprise' into acs-backend-enterprise-persist 2023-10-25 21:55:50 -04:00
b7bba65f41 Merge branch 'acs-backend-persist' into acs-backend-enterprise-persist 2023-10-25 21:55:22 -04:00
2d292ade40 Merge branch 'acs-persist' into acs-backend-persist 2023-10-25 21:46:53 -04:00
9af50009c1 Merge branch 'acs-backend' into acs-backend-persist 2023-10-25 21:46:36 -04:00
664a47f49c Merge branch 'acs-lats' into acs-backend 2023-10-25 21:45:51 -04:00
020c4822fd Merge branch 'acs-search' into acs-backend 2023-10-25 21:45:36 -04:00
105b34664a Merge branch 'acs-lats-base' into acs-lats 2023-10-25 21:43:40 -04:00
415994f1f3 ATE AIO v4.0.0 2023-10-25 20:23:36 -04:00
9a93ec369c Merge branch 'acs-base' into acs-lats-base 2023-10-25 20:23:20 -04:00
f7c664e7f4 Merge branch 'acs-base' into acs-persist 2023-10-25 20:14:48 -04:00
a426d52a14 Merge branch 'ags-backend-enterprise' into ags-backend-enterprise-persist 2022-11-01 17:32:43 -04:00
7280fa0a3a Merge branch 'acs-backend-enterprise-persist' into ags-backend-enterprise-persist 2022-11-01 17:32:34 -04:00
6002fcaef2 Merge branch 'acs-backend-enterprise' into ags-backend-enterprise 2022-11-01 17:30:10 -04:00
66b3e49873 Merge branch 'ags-enterprise' into ags-backend-enterprise 2022-11-01 17:29:30 -04:00
4336b63b85 Merge branch 'acs-enterprise' into ags-enterprise 2022-11-01 17:23:04 -04:00
df0a91920b Merge branch 'ags' into ags-enterprise 2022-11-01 17:22:19 -04:00
18889ab89d Merge branch 'acs' into ags 2022-11-01 17:20:40 -04:00
c9b136e201 Merge branch 'acs-backend-enterprise' into acs-backend-enterprise-persist 2022-11-01 16:54:08 -04:00
d09c72702a Merge branch 'acs-backend-persist' into acs-backend-enterprise-persist 2022-11-01 16:49:30 -04:00
4a165744ee Merge branch 'acs-backend-enterprise' into acs-backend-enterprise-persist 2022-11-01 16:47:54 -04:00
a24bf1b647 Merge branch 'acs-search-persist' into acs-backend-persist 2022-11-01 16:46:48 -04:00
6d56f610a7 Merge branch 'acs-backend' into acs-backend-persist 2022-11-01 16:46:14 -04:00
4748d0e7b6 Merge branch 'acs-persist' into acs-search-persist 2022-11-01 16:44:50 -04:00
299d2fe04d Merge branch 'acs-search-base' into acs-search-persist 2022-11-01 16:43:23 -04:00
c60e224a14 Merge branch 'acs-lats' into acs-backend 2022-11-01 16:17:27 -04:00
fc74faf57a Merge branch 'acs-search' into acs-backend 2022-11-01 16:16:59 -04:00
da933f2aa7 Merge branch 'acs' into acs-lats 2022-11-01 16:15:28 -04:00
10aa561c52 Merge branch 'acs-lats-base' into acs-lats 2022-11-01 16:11:15 -04:00
2dc64b23e4 parameterized LATS version 2022-11-01 16:09:56 -04:00
e9186dec84 Merge branch 'acs-base' into acs-lats-base 2022-11-01 16:08:01 -04:00
8a7d6d2016 Merge branch 'acs-base' into acs-persist 2022-11-01 15:09:25 -04:00
973f5f21fc Merge branch 'acs-backend-enterprise-persist' into ags-backend-enterprise-persist 2021-07-30 16:19:35 -04:00
35f671df5e Merge branch 'ags-backend-enterprise' into ags-backend-enterprise-persist 2021-07-30 16:19:27 -04:00
97ced2653d Merge branch 'acs-backend-enterprise' into acs-backend-enterprise-persist 2021-07-30 16:14:38 -04:00
5b62436d30 Merge branch 'ags-enterprise' into ags-backend-enterprise 2021-07-30 16:13:32 -04:00
f66c710a6e Merge branch 'acs-backend-enterprise' into ags-backend-enterprise 2021-07-30 16:13:27 -04:00
e62b0838f2 Merge branch 'acs-backend' into acs-backend-persist 2021-07-30 16:12:48 -04:00
184c1bb158 Merge branch 'ags' into ags-enterprise 2021-07-30 16:11:27 -04:00
d0e042a9c1 Merge branch 'acs-enterprise' into ags-enterprise 2021-07-30 16:09:20 -04:00
3a2220d215 Merge branch 'acs-search' into acs-backend 2021-07-30 16:08:53 -04:00
f0713c90dd Merge branch 'acs-lats' into acs-backend 2021-07-30 16:08:47 -04:00
0332838752 updated ATE AIO memory limit min 2021-07-30 15:57:23 -04:00
35e15a1735 Merge branch 'acs' into acs-lats 2021-07-30 15:56:37 -04:00
da93d4ea48 increased AGS platform memory limit min 2021-07-30 15:55:53 -04:00
01a5d97ed7 Merge branch 'acs' into ags 2021-07-30 15:55:20 -04:00
brian
a2ef5824d3 Merge branch 'ags-backend-enterprise' into ags-backend-enterprise-persist 2021-04-02 09:21:26 -04:00
brian
08a800ab24 Merge branch 'acs-backend-enterprise-persist' into ags-backend-enterprise-persist 2021-04-02 09:21:25 -04:00
brian
230e7fcf5e Merge branch 'acs-backend-enterprise' into acs-backend-enterprise-persist 2021-04-02 09:14:44 -04:00
brian
180e642ce3 Merge branch 'acs-backend-persist' into acs-backend-enterprise-persist 2021-04-02 09:14:43 -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
38def362f6 Merge branch 'acs-search-persist' into acs-backend-persist 2021-04-02 09:14:37 -04:00
brian
f3d3293e9e Merge branch 'acs-backend' into acs-backend-persist 2021-04-02 09:14:36 -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
6e09a9c0c9 Merge branch 'acs' into ags 2021-04-02 09:13:52 -04:00
brian
2c82f844b1 Merge branch 'acs-search-base' into acs-search-persist 2021-04-02 09:13:47 -04:00
brian
b805fbbd1a Merge branch 'acs-persist' into acs-search-persist 2021-04-02 09:13:46 -04:00
brian
b7c883068a Merge branch 'acs-base' into acs-persist 2021-04-02 09:13:27 -04:00
brian
5a16e389c4 Merge branch 'acs-base' into acs-lats-base 2021-04-02 09:13:25 -04:00
brian
9f004a7cc0 Merge branch 'ags-backend-enterprise' into ags-backend-enterprise-persist 2021-01-13 17:38:51 -05:00
brian
ed35fcae1d Merge branch 'acs-backend-enterprise-persist' into ags-backend-enterprise-persist 2021-01-13 17:38:48 -05:00
brian
a140d6806f Merge branch 'acs-backend-enterprise' into acs-backend-enterprise-persist 2021-01-13 17:38:40 -05:00
brian
eaa6f1025d Merge branch 'acs-backend-enterprise' into ags-backend-enterprise 2021-01-13 17:38:37 -05:00
e63cca79ce Merge branch 'acs-backend-enterprise-persist' into ags-backend-enterprise-persist 2021-01-13 11:41:27 -05:00
brian
3409eb4eec Merge branch 'acs-backend-enterprise' into acs-backend-enterprise-persist 2021-01-13 11:26:27 -05:00
c9075398cd Merge branch 'acs-backend-enterprise' into ags-backend-enterprise 2021-01-13 11:17:17 -05:00
4f5a939b71 Merge remote-tracking branch 'origin/acs-backend-enterprise' into ags-backend-enterprise 2021-01-13 09:47:53 -05:00
22b2583505 Merge branch 'acs-enterprise' into ags-enterprise 2021-01-13 09:45:50 -05:00
c7378dd9c2 Merge branch 'acs-backend-persist.acs-backend' into acs-backend-enterprise-persist.acs-backend-persist 2021-01-06 16:43:39 -05:00
53404852e1 Merge branch 'acs-backend.acs-lats' into acs-backend-persist.acs-backend 2021-01-06 16:37:17 -05:00
75743d2391 Merge branch 'acs-search-persist.acs-persist' into acs-backend-persist.acs-search-persist 2021-01-06 16:36:22 -05:00
0999563353 Merge branch 'acs.acs-base' into ags.acs 2021-01-06 16:27:44 -05:00
078b2ae35c Merge branch 'acs-lats.acs' into acs-backend.acs-lats 2021-01-06 16:27:31 -05:00
5ff71f0e3c Merge branch 'acs-search.acs' into acs-backend.acs-search 2021-01-06 16:27:17 -05:00
30f3420ee5 Merge branch 'acs-lats-base.acs-base' into acs-lats.acs-lats-base 2021-01-06 16:24:29 -05:00
677a3e1dc8 Merge branch 'acs.acs-base' into acs-lats.acs 2021-01-06 16:24:01 -05:00
2ec11a1135 Merge branch 'acs-base.proxy' into acs-lats-base.acs-base 2021-01-06 16:12:46 -05:00
6a8b1e2628 Merge branch 'acs-persist.acs-base' into acs-search-persist.acs-persist 2021-01-06 16:11:47 -05:00
932159b238 Merge branch 'acs-search-base.acs-base' into acs-search-persist.acs-search-base 2021-01-06 16:11:28 -05:00
135739da10 Merge branch 'acs-base.proxy' into acs-persist.acs-base 2021-01-06 15:56:03 -05:00
295b0711b0 Merge branch 'acs-community.acs-base' into ags-community.acs-community 2021-01-06 12:24:10 -05:00
e660d79ef1 Merge branch 'acs-search-community.acs-community' into acs-backend-community.acs-search-community 2021-01-06 12:23:49 -05:00
f036e13180 Merge branch 'acs-lats-community.acs-community' into acs-backend-community.acs-lats-community 2021-01-06 12:23:35 -05:00
40207d43ff Merge branch 'acs-community.acs-base' into acs-lats-community.acs-community 2021-01-06 12:22:58 -05:00
bc6a8539f3 switched platform to AGS (not AMP module distributed anymore) 2021-01-06 10:24:47 -05:00
02a2ec72c0 Merge branch 'acs-backend-community.acs-lats-community' into acs-backend-community-persist.acs-backend-community 2020-12-26 14:23:53 -05:00
41b87a9e5e Merge branch 'acs-search-community.acs-community' into acs-backend-community.acs-search-community 2020-12-26 14:20:33 -05:00
86ad2bc409 Merge branch 'acs-lats-community.acs-community' into acs-backend-community.acs-lats-community 2020-12-26 14:20:12 -05:00
2a56247aa1 Merge branch 'acs-lats-base.acs-base' into acs-lats-community.acs-lats-base 2020-12-26 14:18:48 -05:00
efb9210c5a Merge branch 'acs-community.acs-base' into acs-lats-community.acs-community 2020-12-26 14:18:31 -05:00
48d46aa70c Merge branch 'acs-base.proxy' into acs-lats-base.acs-base 2020-12-26 14:18:13 -05:00
720346e9d7 Merge branch 'acs-persist.acs-base' into acs-search-persist.acs-persist 2020-12-26 14:01:13 -05:00
68e0652872 Merge branch 'acs-search-base.acs-base' into acs-search-persist.acs-search-base 2020-12-26 14:00:56 -05:00
b81db4fc0f Merge branch 'acs-base.proxy' into acs-persist.acs-base 2020-12-26 13:59:41 -05:00
c377995a1d Merge branch 'acs-persist.acs-base' into acs-search-persist.acs-persist 2020-12-26 13:48:22 -05:00
e223fd99a3 Merge commit '9f75b4439d19154e3aaa48e19d05451530333613' into acs-search-persist.acs-search-base 2020-12-26 13:47:30 -05:00
5beadf9f35 Merge branch 'acs-base.proxy' into acs-persist.acs-base 2020-12-26 13:45:22 -05:00
24337f3a13 Merge branch 'acs-backend-community.acs-lats-community' into acs-backend-community-persist.acs-backend-community 2020-12-25 23:55:11 -05:00
04988e43dd Merge branch 'acs-search-persist.acs-persist' into acs-backend-community-persist.acs-search-persist 2020-12-25 23:54:43 -05:00
f94f3e82e8 Merge branch 'acs-search-base.acs-base' into acs-search-persist.acs-search-base 2020-12-25 23:52:04 -05:00
cb5d306478 Merge branch 'acs-persist.acs-base' into acs-search-persist.acs-persist 2020-12-25 23:51:38 -05:00
abaa41345a Merge branch 'acs-base.proxy' into acs-persist.acs-base 2020-12-25 23:51:17 -05:00
17f70ea253 Merge branch 'acs-search-community.acs-community' into acs-backend-community.acs-search-community 2020-12-25 23:40:25 -05:00
2173a9eb5b Merge branch 'acs-lats-community.acs-community' into acs-backend-community.acs-lats-community 2020-12-25 23:40:01 -05:00
8e1a7f11ca Merge branch 'acs-lats-base.acs-base' into acs-lats-community.acs-lats-base 2020-12-25 23:39:36 -05:00
ca1eaa8bff Merge branch 'acs-community.acs-base' into acs-lats-community.acs-community 2020-12-25 23:39:19 -05:00
32ad6d8195 Merge branch 'acs-base.proxy' into acs-lats-base.acs-base 2020-12-25 23:32:25 -05:00
0488b3402d Merge branch 'acs-backend-community.acs-lats-community' into acs-backend-community-persist.acs-backend-community 2020-12-21 11:56:57 -05:00
fad6fe1c2a Merge branch 'acs-persist.acs-base' into acs-search-persist.acs-persist 2020-12-17 21:33:18 -05:00
2789af0bd7 added persistence to activemq 2020-12-17 21:31:57 -05:00
91da0dedb6 Merge branch 'acs-search-base.acs-base' into acs-search-persist.acs-search-base 2020-12-17 21:30:09 -05:00
8d3c4987f0 added persistence to platform/db 2020-12-17 21:26:03 -05:00
701489665a Merge branch 'acs-lats-community.acs-lats-base' into acs-backend-community.acs-lats-community 2020-12-17 21:03:07 -05:00
0976a3975f Merge branch 'acs-min-community.acs-base' into acs-lats-community.acs-min-community 2020-12-17 21:02:41 -05:00
0ad2cdf9ad Merge branch 'acs-search-community.acs-min-community' into acs-backend-community.acs-search-community 2020-12-17 21:01:06 -05:00
7bb62f421e Merge branch 'acs-search-community.acs-community' into acs-backend-community.acs-search-community 2020-12-17 18:55:51 -05:00
f02d4ff427 Merge branch 'acs-lats-community.acs-community' into acs-backend-community.acs-lats-community 2020-12-17 18:55:28 -05:00
1e09466e78 Merge branch 'acs-community.acs-base' into acs-lats-community.acs-community 2020-12-17 18:54:28 -05:00
1216469feb Merge branch 'acs-lats-community.acs-community' into acs-search-lats-community.acs-lats-community 2020-12-17 16:48:32 -05:00
6a6dbdc798 set core-aio version 2020-12-17 16:48:13 -05:00
2ac3d013c9 Merge branch 'acs-search-community.acs-community' into acs-search-lats-community.acs-search-community 2020-12-17 16:43:44 -05:00
80a938d674 Merge branch 'acs-lats-base.acs-base' into acs-lats-community.acs-lats-base 2020-12-17 16:42:16 -05:00
ddb535ab14 added legacy transform URLs 2020-12-17 16:40:02 -05:00
331eda62fc Merge branch 'acs-base.proxy' into acs-lats-base.acs-base 2020-12-17 16:33:23 -05:00
0bb3b7bb28 added service name reference to platform 2020-12-17 13:07:55 -05:00
f97b6b973b Merge branch 'acs-base.base' into acs-lats-base.acs-base 2020-12-17 13:04:06 -05:00
3fea801d26 added minimum local transform service 2020-12-17 00:01:13 -05:00

View File

@@ -5,7 +5,7 @@ version: "3"
services: services:
platform: platform:
image: quay.io/alfresco/alfresco-content-repository:${ACS_TAG} image: quay.io/alfresco/alfresco-governance-repository-enterprise:${ACS_TAG}
environment: environment:
JAVA_TOOL_OPTIONS: " JAVA_TOOL_OPTIONS: "
-Dencryption.keystore.type=JCEKS -Dencryption.keystore.type=JCEKS
@@ -35,10 +35,10 @@ services:
-Ddeployment.method=DOCKER_COMPOSE -Ddeployment.method=DOCKER_COMPOSE
-Dcsrf.filter.enabled=false -Dcsrf.filter.enabled=false
-Dcors.enabled=false -Dcors.enabled=false
-Dtransform.service.enabled=false -Dtransform.service.enabled=true
-Dtransform.service.url=http://transform-router:8095 -Dtransform.service.url=http://transform-router:8095
-Dsfs.url=http://shared-file-store:8099 -Dsfs.url=http://shared-file-store:8099
-Dlocal.transform.service.enabled=false -Dlocal.transform.service.enabled=true
-Dalfresco-pdf-renderer.url=http://transform-engine-aio:8090 -Dalfresco-pdf-renderer.url=http://transform-engine-aio:8090
-Djodconverter.url=http://transform-engine-aio:8090 -Djodconverter.url=http://transform-engine-aio:8090
-Dimg.url=http://transform-engine-aio:8090 -Dimg.url=http://transform-engine-aio:8090
@@ -55,6 +55,7 @@ services:
- shared-file-store - shared-file-store
volumes: volumes:
- "$ALFRESCO_LICENSE_DIR/acs:/usr/local/tomcat/shared/classes/alfresco/extension/license:ro" - "$ALFRESCO_LICENSE_DIR/acs:/usr/local/tomcat/shared/classes/alfresco/extension/license:ro"
- acsbin-volume:/usr/local/tomcat/alf_data:rw
transform-router: transform-router:
image: quay.io/alfresco/alfresco-transform-router:${ATR_TAG} image: quay.io/alfresco/alfresco-transform-router:${ATR_TAG}
@@ -87,6 +88,8 @@ services:
POSTGRES_USER: alfresco POSTGRES_USER: alfresco
POSTGRES_DB: alfresco POSTGRES_DB: alfresco
command: postgres -c max_connections=300 -c log_min_messages=LOG command: postgres -c max_connections=300 -c log_min_messages=LOG
volumes:
- acsdb-volume:/var/lib/postgresql/data:rw
search: search:
image: alfresco/alfresco-search-services:${ASIE_TAG} image: alfresco/alfresco-search-services:${ASIE_TAG}
@@ -100,6 +103,8 @@ services:
" "
healthcheck: healthcheck:
test: "curl -fsS http://localhost:8983/solr" test: "curl -fsS http://localhost:8983/solr"
volumes:
- solrindex-volume:/opt/alfresco-search-services/data:rw
activemq: activemq:
image: alfresco/alfresco-activemq:${AAMQ_TAG} image: alfresco/alfresco-activemq:${AAMQ_TAG}
@@ -107,6 +112,8 @@ services:
ACTIVEMQ_OPTS_MEMORY: -Xms64m -Xmx256m ACTIVEMQ_OPTS_MEMORY: -Xms64m -Xmx256m
ACTIVEMQ_ADMIN_LOGIN: alfresco ACTIVEMQ_ADMIN_LOGIN: alfresco
ACTIVEMQ_ADMIN_PASSWORD: alfresco ACTIVEMQ_ADMIN_PASSWORD: alfresco
volumes:
- activemq-volume:/opt/activemq/data:rw
sync: sync:
image: quay.io/alfresco/service-sync:${ALF_SYNC_SERV_TAG} image: quay.io/alfresco/service-sync:${ALF_SYNC_SERV_TAG}
@@ -140,3 +147,11 @@ volumes:
driver_opts: driver_opts:
type: tmpfs type: tmpfs
device: tmpfs device: tmpfs
acsbin-volume:
driver: local
acsdb-volume:
driver: local
activemq-volume:
driver: local
solrindex-volume:
driver: local