remove one variable part in shibboleth2.xml config

config/shibboleth/dem-shibboleth2.xml

@@ -23,7 +23,7 @@
         <AttributeExtractor type="XML" validate="true" reloadChanges="false" path="attribute-map.xml"/>
         <AttributeResolver type="Query" subjectMatch="true"/>
         <AttributeFilter type="XML" validate="true" path="attribute-policy.xml"/>
-        <CredentialResolver type="File" key="/run/secrets/DEM_SHIB_KEY" certificate="/run/secrets/DEM_SHIB_CERT"/>
+        <CredentialResolver type="File" key="/run/secrets/SHIB_KEY" certificate="/run/secrets/SHIB_CERT"/>
     </ApplicationDefaults>
     <SecurityPolicyProvider type="XML" validate="true" path="security-policy.xml"/>
     <ProtocolProvider type="XML" validate="true" reloadChanges="false" path="protocols.xml"/>

config/shibboleth/emg-shibboleth2.xml

@@ -23,7 +23,7 @@
         <AttributeExtractor type="XML" validate="true" reloadChanges="false" path="attribute-map.xml"/>
         <AttributeResolver type="Query" subjectMatch="true"/>
         <AttributeFilter type="XML" validate="true" path="attribute-policy.xml"/>
-        <CredentialResolver type="File" key="/run/secrets/EMG_SHIB_KEY" certificate="/run/secrets/EMG_SHIB_CERT"/>
+        <CredentialResolver type="File" key="/run/secrets/SHIB_KEY" certificate="/run/secrets/SHIB_CERT"/>
     </ApplicationDefaults>
     <SecurityPolicyProvider type="XML" validate="true" path="security-policy.xml"/>
     <ProtocolProvider type="XML" validate="true" reloadChanges="false" path="protocols.xml"/>

config/shibboleth/vhr18-shibboleth2.xml

@@ -23,7 +23,7 @@
         <AttributeExtractor type="XML" validate="true" reloadChanges="false" path="attribute-map.xml"/>
         <AttributeResolver type="Query" subjectMatch="true"/>
         <AttributeFilter type="XML" validate="true" path="attribute-policy.xml"/>
-        <CredentialResolver type="File" key="/run/secrets/VHR18_SHIB_KEY" certificate="/run/secrets/VHR18_SHIB_CERT"/>
+        <CredentialResolver type="File" key="/run/secrets/SHIB_KEY" certificate="/run/secrets/SHIB_CERT"/>
     </ApplicationDefaults>
     <SecurityPolicyProvider type="XML" validate="true" path="security-policy.xml"/>
     <ProtocolProvider type="XML" validate="true" reloadChanges="false" path="protocols.xml"/>

docker-compose.dem.ops.yml

@@ -176,8 +176,10 @@ services:
     environment:
       APACHE_SERVERNAME: "https://dem.pass.copernicus.eu:443"
     secrets:
-      - DEM_SHIB_CERT
-      - DEM_SHIB_KEY
+      - source: DEM_SHIB_CERT
+        target: SHIB_CERT
+      - source: DEM_SHIB_KEY
+        target: SHIB_KEY
       - BASIC_AUTH_USERS_AUTH
     deploy:
       replicas: 1

docker-compose.emg.ops.yml

@@ -176,8 +176,10 @@ services:
     environment:
       APACHE_SERVERNAME: "https://emg.pass.copernicus.eu:443"
     secrets:
-      - EMG_SHIB_CERT
-      - EMG_SHIB_KEY
+      - source: EMG_SHIB_CERT
+        target: SHIB_CERT
+      - source: EMG_SHIB_KEY
+        target: SHIB_KEY
       - BASIC_AUTH_USERS_AUTH
     deploy:
       replicas: 1

docker-compose.vhr18.ops.yml

@@ -176,8 +176,10 @@ services:
     environment:
       APACHE_SERVERNAME: "https://vhr18.pass.copernicus.eu:443"
     secrets:
-      - VHR18_SHIB_CERT
-      - VHR18_SHIB_KEY
+      - source: VHR18_SHIB_CERT
+        target: SHIB_CERT
+      - source: VHR18_SHIB_KEY
+        target: SHIB_KEY
       - BASIC_AUTH_USERS_AUTH
     deploy:
       replicas: 1