diff --git a/Dockerfile b/Dockerfile index 8e8ebc6..4f7b29f 100755 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.7 as bootstrap -ARG version=1.18.0 +ARG version=2.0.0-BETA-R1 COPY bootstrapfiles/shibui-${version}.war.sha256sum . @@ -10,19 +10,19 @@ RUN wget https://github.internet2.edu/TIER/shib-idp-ui/releases/download/v${vers FROM centos:7 # beacon env -ENV TIERVERSION=PACKAGE_1.18.0 +ENV TIERVERSION=PACKAGE_2.0.0 # Install Corretto Java JDK -#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 containerfiles/corretto-signing-key.pub . +#Corretto download page: https://docs.aws.amazon.com/corretto/latest/corretto-17-ug/downloads-list.html +ARG CORRETTO_URL_PERM=https://corretto.aws/downloads/latest/amazon-corretto-17-x64-linux-jdk.rpm +ARG CORRETTO_RPM=amazon-corretto-17-x64-linux-jdk.rpm +COPY container_files/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.11.0-amazon-corretto +ENV JAVA_HOME=/usr/lib/jvm/java-17-amazon-corretto RUN yum -q -qy update \ && yum -qy install --setopt=tsflags=nodocs epel-release \ @@ -38,12 +38,12 @@ COPY containerfiles/users.txt /opt/shibui # TIER Beacon Opt-out # Completely uncomment the following ENV line to prevent the containers from sending analytics information to Internet2. -# With the default/release configuration, it will only send product (Shibb/Grouper/COmanage) and version (3.3.1-17040, etc) -# once daily between midnight and 4am. There is no configuration or private information collected or sent. +# With the default/release configuration, it will only send product (Shibb/Grouper/COmanage) and version (3.3.1-17040, etc) +# once daily between midnight and 4am. There is no configuration or private information collected or sent. # This data helps with the scalaing and funding of TIER. Please do not disable it if you find the TIER tools useful. # To keep it commented, keep multiple comments on the following line (to prevent other scripts from processing it). ##### ENV TIER_BEACON_OPT_OUT True WORKDIR /opt/shibui -CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf"] +CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf"] \ No newline at end of file diff --git a/bootstrapfiles/shibui-2.0.0-BETA-R1.war.sha256sum b/bootstrapfiles/shibui-2.0.0-BETA-R1.war.sha256sum new file mode 100644 index 0000000..1f736a9 --- /dev/null +++ b/bootstrapfiles/shibui-2.0.0-BETA-R1.war.sha256sum @@ -0,0 +1 @@ +8ce6eec82e69c67c821c44349f4c4784f184ef5d2ac8902576ba620b2584e9a6 shibui-2.0.0-BETA-R1.war \ No newline at end of file