Merge branch 'aims' into acs-aims

This commit is contained in:
Brian Long 2021-07-30 16:45:59 -04:00
commit c8540ca0de

View File

@ -107,7 +107,8 @@ services:
mem_limit: 256m mem_limit: 256m
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
@ -120,7 +121,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
@ -131,6 +132,7 @@ services:
proxy: proxy:
build: ./nginx-ingress build: ./nginx-ingress
image: local/nginx-ingress:acs-share-aims image: local/nginx-ingress:acs-share-aims
mem_limit: 256m
ports: ports:
- 8080:8080 - 8080:8080
depends_on: depends_on: