merge 4.0.0_20200311

Dockerfile

@@ -8,12 +8,12 @@ FROM centos:centos7
 ENV TOMCAT_MAJOR=9 \
     TOMCAT_VERSION=9.0.31 \
 ##shib-idp \
-    VERSION=3.4.6 \
+    VERSION=4.0.0 \
 ##TIER \
-    TIERVERSION=20200303 \
-################## \
-### OTHER VARS ### \
-################## \
+    TIERVERSION=20200311 \
+#################### \
+#### OTHER VARS #### \
+#################### \
 # \
 #global \
     IMAGENAME=shibboleth_idp \
@@ -70,16 +70,16 @@ RUN update-ca-trust extract
 #####     ENV TIER_BEACON_OPT_OUT True
 
 # Install Corretto Java JDK
-#Corretto download page: https://docs.aws.amazon.com/corretto/latest/corretto-8-ug/downloads-list.html
-ARG CORRETTO_URL_PERM=https://corretto.aws/downloads/latest/amazon-corretto-8-x64-linux-jdk.rpm
-ARG CORRETTO_RPM=amazon-corretto-8-x64-linux-jdk.rpm
+#Corretto download page: https://docs.aws.amazon.com/corretto/latest/corretto-11-ug/downloads-list.html
+ARG CORRETTO_URL_PERM=https://corretto.aws/downloads/latest/amazon-corretto-11-x64-linux-jdk.rpm
+ARG CORRETTO_RPM=amazon-corretto-11-x64-linux-jdk.rpm
 COPY container_files/java-corretto/corretto-signing-key.pub .
 RUN curl -O -L $CORRETTO_URL_PERM \
     && rpm --import corretto-signing-key.pub \
     && rpm -K $CORRETTO_RPM \
     && rpm -i $CORRETTO_RPM \
     && rm -r corretto-signing-key.pub $CORRETTO_RPM
-ENV JAVA_HOME=/usr/lib/jvm/java-1.8.0-amazon-corretto
+ENV JAVA_HOME=/usr/lib/jvm/java-11-amazon-corretto
 
 # To use Zulu Java:
 #RUN rpm --import http://repos.azulsystems.com/RPM-GPG-KEY-azulsystems \

container_files/idp/idp.installer.properties

@@ -1,4 +1,4 @@
-idp.src.dir=/tmp/shibboleth/shibboleth-identity-provider-3.4.6
+idp.src.dir=/tmp/shibboleth/shibboleth-identity-provider-4.0.0
 idp.target.dir=/opt/shibboleth-idp
 idp.host.name=idp.example.org
 idp.sealer.password=changeit

container_files/idp/idp.merge.properties

@@ -1,5 +1,3 @@
 idp.entityID=https://idp.example.org/idp/shibboleth
-idp.sealer.storePassword=changeit
-idp.sealer.keyPassword=changeit
 idp.scope=example.org
 

test-compose/idp/Dockerfile

@@ -1,4 +1,4 @@
-FROM tier/shib-idp:3.4.6_20200303
+FROM tier/shib-idp:4.0.0_20200311
 
 # The build args below can be used at build-time to tell the build process where to find your config files.  This is for a completely burned-in config.
 ARG TOMCFG=config/tomcat
@@ -17,9 +17,9 @@ ADD ${TOMCERT} /opt/certs
 ADD ${TOMWWWROOT} /usr/local/tomcat/webapps/ROOT
 ADD ${SHBCFG} /opt/shibboleth-idp/conf
 ADD ${SHBCREDS} /opt/shibboleth-idp/credentials
-ADD ${SHBVIEWS} /opt/shibboleth-idp/views
-ADD ${SHBEDWAPP} /opt/shibboleth-idp/edit-webapp
-ADD ${SHBMSGS} /opt/shibboleth-idp/messages
+#ADD ${SHBVIEWS} /opt/shibboleth-idp/views
+#ADD ${SHBEDWAPP} /opt/shibboleth-idp/edit-webapp
+#ADD ${SHBMSGS} /opt/shibboleth-idp/messages
 ADD ${SHBMD} /opt/shibboleth-idp/metadata
 
 

test-compose/idp/container_files/config/shib-idp/conf/access-control.xml

@@ -30,7 +30,7 @@
 
         <entry key="AccessByIPAddress">
             <bean id="AccessByIPAddress" parent="shibboleth.IPRangeAccessControl"
-                p:allowedRanges="#{ {'127.0.0.1/32', '::1/128', '172.17.0.0/24', '172.18.0.0/24', '10.255.0.0/16'} }" />
+                p:allowedRanges="#{ {'127.0.0.1/32', '::1/128'} }" />
         </entry>
 
         <!--