Merge branch 'aims' into aps-aims

This commit is contained in:
Brian Long 2021-07-30 16:46:52 -04:00
commit 6608b0600c

View File

@ -74,7 +74,8 @@ services:
- activiti-app - activiti-app
identity: identity:
image: alfresco/alfresco-identity-service:1.3 image: alfresco/alfresco-identity-service:1.4.0
mem_limit: 512m
user: jboss user: jboss
environment: environment:
KEYCLOAK_USER: admin KEYCLOAK_USER: admin
@ -87,7 +88,7 @@ services:
aliases: aliases:
- "${IDENTITY_SERVICE_HOST}" - "${IDENTITY_SERVICE_HOST}"
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:8080/auth"] test: ["CMD", "curl", "-f", "http://localhost:8080/auth/realms/alfresco"]
interval: 10s interval: 10s
timeout: 10s timeout: 10s
# Really long startup times on Windows # Really long startup times on Windows
@ -98,6 +99,7 @@ services:
proxy: proxy:
build: ./nginx-ingress build: ./nginx-ingress
image: local/nginx-ingress:aps-aims image: local/nginx-ingress:aps-aims
mem_limit: 256m
ports: ports:
- 8080:8080 - 8080:8080
depends_on: depends_on: