Merge branch 'aims' into aims-persist

.env

@@ -4,3 +4,5 @@ PROXY_PORT=8080
 IDENTITY_SERVICE_PROTOCOL=http
 IDENTITY_SERVICE_HOST=auth.example.org
 IDENTITY_SERVICE_PORT=8080
+
+AIS_TAG=1.8.0

docker-compose.yml

@@ -1,13 +1,11 @@
 # Sourced from https://github.com/Alfresco/acs-deployment/blob/4.0.3/docker-compose/docker-compose.yml
 #
-# Using version 2 as 3 does not support resource constraint options (cpu_*, mem_* limits) for non swarm mode in Compose
-version: "2.1"
+version: "3"
 
 services:
 
     identity:
-        image: alfresco/alfresco-identity-service:1.4.0
-        mem_limit: 512m
+        image: alfresco/alfresco-identity-service:${AIS_TAG}
         user: jboss
         environment:
             KEYCLOAK_USER: admin