Compare commits

...

38 Commits

Author SHA1 Message Date
6178fe93b0 Merge branch 'acs-backend' into acs-backend-persist 2023-11-01 14:25:45 -04:00
9f059b6c13 Merge branch 'acs-backend' into acs-backend-persist 2023-10-26 14:30:42 -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
f7c664e7f4 Merge branch 'acs-base' into acs-persist 2023-10-25 20:14:48 -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
8a7d6d2016 Merge branch 'acs-base' into acs-persist 2022-11-01 15:09:25 -04:00
e62b0838f2 Merge branch 'acs-backend' into acs-backend-persist 2021-07-30 16:12:48 -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
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
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
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
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
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
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

View File

@@ -51,6 +51,8 @@ services:
depends_on: depends_on:
- postgres-acs - postgres-acs
- activemq - activemq
volumes:
- acsbin-volume:/usr/local/tomcat/alf_data:rw
transform-core-aio: transform-core-aio:
image: alfresco/alfresco-transform-core-aio:${ATE_AIO_TAG} image: alfresco/alfresco-transform-core-aio:${ATE_AIO_TAG}
@@ -62,6 +64,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}
@@ -75,6 +79,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}
@@ -82,6 +88,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
proxy: proxy:
build: ./nginx-ingress build: ./nginx-ingress
@@ -90,3 +98,13 @@ services:
- 8080:8080 - 8080:8080
depends_on: depends_on:
- platform - platform
volumes:
acsbin-volume:
driver: local
acsdb-volume:
driver: local
activemq-volume:
driver: local
solrindex-volume:
driver: local