Merge branch 'aims' into acs-aims

docker-compose.yml

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