From ceed5acdc210bb48d1e5a29973633d58966b4c74 Mon Sep 17 00:00:00 2001
From: Pavol Mederly <mederly@evolveum.com>
Date: Wed, 3 Oct 2018 17:34:02 +0200
Subject: [PATCH] Adapt demo/shibboleth (MP_MEM_*/MP_JAVA_OPTS)

---
 demo/shibboleth/.env               |  3 ++-
 demo/shibboleth/docker-compose.yml | 32 +++++++++++++++---------------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/demo/shibboleth/.env b/demo/shibboleth/.env
index d731cbd..21ec0af 100644
--- a/demo/shibboleth/.env
+++ b/demo/shibboleth/.env
@@ -10,4 +10,5 @@ REPO_DATABASE=registry
 REPO_USER=registry_user
 REPO_MISSING_SCHEMA_ACTION=create
 REPO_UPGRADEABLE_SCHEMA_ACTION=stop
-MP_MEM=2048m
+MP_MEM_MAX=2048m
+MP_MEM_INIT=1024m
diff --git a/demo/shibboleth/docker-compose.yml b/demo/shibboleth/docker-compose.yml
index 9c5be10..c656fe4 100644
--- a/demo/shibboleth/docker-compose.yml
+++ b/demo/shibboleth/docker-compose.yml
@@ -32,7 +32,9 @@ services:
      - REPO_UPGRADEABLE_SCHEMA_ACTION
      - REPO_SCHEMA_VERSION_IF_MISSING
      - REPO_SCHEMA_VARIANT
-     - MP_MEM
+     - MP_MEM_MAX
+     - MP_MEM_INIT
+     - MP_JAVA_OPTS
      - TIER_BEACON_OPT_OUT
     networks:
      - net
@@ -43,6 +45,12 @@ services:
      - mp_host-key.pem
     volumes:
      - midpoint_home:/opt/midpoint/var
+     - type: bind
+       source: ./configs-and-secrets/midpoint/httpd/host-cert.pem
+       target: /etc/pki/tls/certs/host-cert.pem
+     - type: bind
+       source: ./configs-and-secrets/midpoint/httpd/host-cert.pem
+       target: /etc/pki/tls/certs/cachain.pem
      - type: bind
        source: ./configs-and-secrets/midpoint/shibboleth/shibboleth2.xml
        target: /etc/shibboleth/shibboleth2.xml
@@ -52,19 +60,11 @@ services:
      - type: bind
        source: ./configs-and-secrets/midpoint/shibboleth/sp-cert.pem
        target: /etc/shibboleth/sp-cert.pem
-     - type: bind
-       source: ./configs-and-secrets/midpoint/httpd/host-cert.pem
-       target: /etc/pki/tls/certs/host-cert.pem
-     - type: bind
-       source: ./configs-and-secrets/midpoint/httpd/host-cert.pem
-       target: /etc/pki/tls/certs/cachain.pem
 
   directory:
     build: ./directory/
-    expose:
-     - "389"
     ports:
-     - "389:389"
+     - 389:389
     networks:
      - net
     volumes:
@@ -74,28 +74,28 @@ services:
     build: ./idp/
     depends_on:
      - directory
+    ports:
+     - 4443:4443
     environment:
      - JETTY_MAX_HEAP=64m
      - JETTY_BROWSER_SSL_KEYSTORE_PASSWORD=password
      - JETTY_BACKCHANNEL_SSL_KEYSTORE_PASSWORD=password
     networks:
      - net
-    ports:
-     - "4443:4443"
 
 networks:
   net:
     driver: bridge
 
 secrets:
-  mp_host-key.pem:
-    file: ./configs-and-secrets/midpoint/httpd/host-key.pem
-  mp_sp-key.pem:
-    file: ./configs-and-secrets/midpoint/shibboleth/sp-key.pem
   mp_database_password.txt:
     file: ./configs-and-secrets/midpoint/application/database_password.txt
   mp_keystore_password.txt:
     file: ./configs-and-secrets/midpoint/application/keystore_password.txt
+  mp_host-key.pem:
+    file: ./configs-and-secrets/midpoint/httpd/host-key.pem
+  mp_sp-key.pem:
+    file: ./configs-and-secrets/midpoint/shibboleth/sp-key.pem
     
 volumes:
   midpoint_mysql: