Make IDP metadata a bit more configurable

demo.yml

@@ -85,11 +85,12 @@ services:
       context: ./idp
       args:
         TENANT: jhu
-    image: ghcr.io/eclipse-pass/idp:0.2.0@sha256:207262db39f30412303ad3c8cffeeb24e52eab91491b1885982f14cfa46078d9
+    image: ghcr.io/eclipse-pass/idp:0.2.0@sha256:fcc77f3f954b06bceaba55b26d9cea4f00d04c46b52fc3c3bd8533563d8cfbfc
     container_name: idp
     depends_on:
      - ldap
     environment:
+     - IDP_HOST=https://pass.local
      - JETTY_MAX_HEAP=64m
      - JETTY_BROWSER_SSL_KEYSTORE_PASSWORD=password
      - JETTY_BACKCHANNEL_SSL_KEYSTORE_PASSWORD=password

eclipse-pass.base.yml

@@ -82,7 +82,7 @@ services:
       context: ./idp
       args:
         TENANT: jhu
-    image: ghcr.io/eclipse-pass/idp:0.2.0@sha256:a674b34a30b3546c978a57263aab76d871f5a5c4914f234dea73708e5bfbe2fe
+    image: ghcr.io/eclipse-pass/idp:0.2.0@sha256:fcc77f3f954b06bceaba55b26d9cea4f00d04c46b52fc3c3bd8533563d8cfbfc
     container_name: idp
     depends_on:
      - ldap

eclipse-pass.demo.yml

@@ -18,5 +18,9 @@ services:
   pass-ui-public:
     env_file: .eclipse-pass.demo_env
 
+  idp:
+    environment:
+      - IDP_HOST=https://demo.eclipse-pass.org
+
   loader:
     env_file: .eclipse-pass.demo_env

eclipse-pass.nightly.yml

@@ -1,5 +1,3 @@
-version: '3.8'
-
 # Manages the nightly.eclipse-pass.org deploy
 # `docker-compose -f eclipse-pass.base.yml -f eclipse-pass.nightly.yml up`
 version: '3.8'
@@ -21,5 +19,9 @@ services:
   pass-ui-public:
     env_file: .eclipse-pass.nightly_env
 
+  idp:
+    environment:
+      - IDP_HOST=https://nightly.eclipse-pass.org
+
   loader:
     env_file: .eclipse-pass.nightly_env

idp/Dockerfile

@@ -7,9 +7,15 @@ COPY common/shibboleth-idp/ /opt/shibboleth-idp/
 COPY common/shib-jetty-base/ /opt/shib-jetty-base/
 
 COPY ${TENANT}/shibboleth-idp/ /opt/shibboleth-idp/
-COPY metadata/{IDP_ENV}/ /opt/shibboleth-idp/metadata/
 
 COPY styling/main.css /opt/shibboleth-idp/webapp/css/main.css
 COPY styling/dummylogo.png /opt/shibboleth-idp/webapp/images/dummylogo.png
 COPY styling/login.vm /opt/shibboleth-idp/views/login.vm
-COPY styling/error.vm /opt/shibboleth-idp/views/error.vm
+COPY styling/error.vm /opt/shibboleth-idp/views/error.vm
+
+# Update metadata for deploy target
+COPY metadata/*.xml /opt/shibboleth-idp/metadata/
+
+COPY start.sh /bin/
+
+ENTRYPOINT ["start.sh"]

idp/start.sh

@@ -0,0 +1,8 @@
+#! /bin/sh
+echo "IDP_HOST: $IDP_HOST"
+echo "Updating metadata files..."
+sed -i "s#https://pass.local#$IDP_HOST#g" /opt/shibboleth-idp/metadata/idp-metadata.xml
+sed -i "s#https://pass.local#$IDP_HOST#g" /opt/shibboleth-idp/metadata/sp-metadata.xml
+
+echo "Starting Jetty"
+/usr/local/bin/run-jetty.sh