inteligr8/env-docker-alfresco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'aps' into aps-aims

Browse Source
This commit is contained in:
Brian Long 2023-10-25 19:48:28 -04:00
commit d4362a2bcd
2 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.env
View File

@ -8,7 +8,6 @@ IDENTITY_SERVICE_PROTOCOL=http
IDENTITY_SERVICE_HOST=auth.example.org IDENTITY_SERVICE_HOST=auth.example.org
IDENTITY_SERVICE_PORT=8080 IDENTITY_SERVICE_PORT=8080
APS_TAG=2.3.5 APS_TAG=2.4.1
AIS_TAG=1.8.0 AIS_TAG=1.8.0
POSTGRES_TAG=13 POSTGRES_TAG=13
ELASTICSEARCH_TAG=7.17.7

19
docker-compose.yml
View File

@ -1,8 +1,9 @@
# Sourced from https://github.com/Alfresco/acs-deployment/blob/4.0.3/docker-compose/docker-compose.yml # Originally sourced from https://github.com/Alfresco/acs-deployment/blob/4.0.3/docker-compose/docker-compose.yml
# #
version: "3" version: "3"
services: services:
activiti-app: activiti-app:
image: quay.io/alfresco/alfresco-process-services:${APS_TAG} image: quay.io/alfresco/alfresco-process-services:${APS_TAG}
environment: environment:
@ -11,10 +12,6 @@ services:
ACTIVITI_DATASOURCE_DRIVER: org.postgresql.Driver ACTIVITI_DATASOURCE_DRIVER: org.postgresql.Driver
ACTIVITI_HIBERNATE_DIALECT: org.hibernate.dialect.PostgreSQLDialect ACTIVITI_HIBERNATE_DIALECT: org.hibernate.dialect.PostgreSQLDialect
ACTIVITI_DATASOURCE_URL: 'jdbc:postgresql://postgres-aps:5432/activiti?characterEncoding=UTF-8' ACTIVITI_DATASOURCE_URL: 'jdbc:postgresql://postgres-aps:5432/activiti?characterEncoding=UTF-8'
ACTIVITI_ES_SERVER_TYPE: rest
ACTIVITI_ES_REST_CLIENT_ADDRESS: search-aps
ACTIVITI_ES_REST_CLIENT_PORT: 9200
ACTIVITI_ES_REST_CLIENT_SCHEMA: http
IDENTITY_SERVICE_ENABLED: "true" IDENTITY_SERVICE_ENABLED: "true"
IDENTITY_SERVICE_AUTH: ${IDENTITY_SERVICE_PROTOCOL}://${IDENTITY_SERVICE_HOST}:${IDENTITY_SERVICE_PORT}/auth IDENTITY_SERVICE_AUTH: ${IDENTITY_SERVICE_PROTOCOL}://${IDENTITY_SERVICE_HOST}:${IDENTITY_SERVICE_PORT}/auth
IDENTITY_SERVICE_CONTENT_SSO_REDIRECT_URI: ${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}/activiti-app/app/rest/integration/sso/confirm-auth-request IDENTITY_SERVICE_CONTENT_SSO_REDIRECT_URI: ${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}/activiti-app/app/rest/integration/sso/confirm-auth-request
@ -54,18 +51,6 @@ services:
POSTGRES_USER: alfresco POSTGRES_USER: alfresco
POSTGRES_PASSWORD: alfresco POSTGRES_PASSWORD: alfresco
command: postgres -c max_connections=50 -c log_min_messages=LOG command: postgres -c max_connections=50 -c log_min_messages=LOG
search-aps:
image: elasticsearch:${ELASTICSEARCH_TAG}
environment:
discovery.type: single-node
ES_JAVA_OPTS: "-Xms128m -Xmx256m"
ulimits:
memlock:
soft: -1
hard: -1
depends_on:
- activiti-app
identity: identity:
image: alfresco/alfresco-identity-service:${AIS_TAG} image: alfresco/alfresco-identity-service:${AIS_TAG}