Merge branch 'dbp-aims' into dbp-persist-aims

docker-compose.yml

@@ -203,6 +203,7 @@ services:
             ACTIVITI_ES_REST_CLIENT_SCHEMA: http
             IDENTITY_SERVICE_ENABLED: "true"
             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
             JAVA_OPTS: "-XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80"
         depends_on:
             - postgres-aps