Merge branch 'aps-aims' into dbp-aims

README.md

@@ -3,3 +3,10 @@
 
 This Git Repository intends to represent environments in Docker Compose.  All environments are effectively a derivative of other environments.  The original environment is the environment represented by the `base` branch.  All derivative environments are represented by other branches.  Those branches are named in the format `{core}.{parent}`.
 
+## Licensing
+
+This version of Alfresco requires licensing.
+
+### APS
+
+APS requires a license file for it to work.  For licensing to work, you must place your license file in the following directory relative to the user home directory that runs the Docker Compose command: `alfresco/license/aps`.  The filename must be `activiti.lic`.  You can use symbolic linking if desired.

docker-compose.yml

@@ -254,7 +254,6 @@ services:
     proxy:
         build: ./nginx-ingress
         image: local/nginx-ingress:acs-sync-share-adw-aps-aims
-        mem_limit: 256m
         ports:
             - 8080:8080
         depends_on: