Skip to content

Commit

Permalink
IdP 4.0 beta1 and Corretto Java 11
Browse files Browse the repository at this point in the history
  • Loading branch information
pcaskey committed Feb 6, 2020
1 parent aadcae0 commit e27c663
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 ### \
################## \
Expand Down Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion container_files/idp/idp.installer.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit e27c663

Please sign in to comment.