From e27c663893c53fd10a1057f8826d2376ee0f9103 Mon Sep 17 00:00:00 2001 From: Paul Caskey Date: Thu, 6 Feb 2020 17:27:25 +0000 Subject: [PATCH] IdP 4.0 beta1 and Corretto Java 11 --- Dockerfile | 12 ++++++------ container_files/idp/idp.installer.properties | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 922dc30..b4c87ba 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,9 +8,9 @@ FROM centos:centos7 ENV TOMCAT_MAJOR=9 \ TOMCAT_VERSION=9.0.30 \ ##shib-idp \ - VERSION=3.4.6 \ + VERSION=4.0.0-beta1 \ ##TIER \ - TIERVERSION=20200107 \ + TIERVERSION=20200206 \ ################## \ ### OTHER VARS ### \ ################## \ @@ -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 \ diff --git a/container_files/idp/idp.installer.properties b/container_files/idp/idp.installer.properties index 3724656..8e7c83d 100644 --- a/container_files/idp/idp.installer.properties +++ b/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-beta1 idp.target.dir=/opt/shibboleth-idp idp.host.name=idp.example.org idp.sealer.password=changeit