Merge pull request #26 from docker/2.0.6

2.0.6

Dockerfile

@@ -1,37 +1,35 @@
-FROM alpine:3.7 as bootstrap
+FROM rockylinux/rockylinux:8.10
 
-ARG version=1.18.0
+ARG version=2.0.6
 
 COPY bootstrapfiles/shibui-${version}.war.sha256sum .
 
-RUN wget https://github.internet2.edu/TIER/shib-idp-ui/releases/download/v${version}/shibui-${version}.war \
-    && sha256sum -c shibui-${version}.war.sha256sum && mv shibui-${version}.war shibui.war
+#RUN yum -q -qy update \
+#    && yum -qy install --setopt=tsflags=nodocs epel-release \
+#    && yum -qy install curl cronie supervisor \
+#    && yum clean all \
+#    && rm -rf /var/cache/yum
+RUN yum -qy install --setopt=tsflags=nodocs epel-release \
+    && yum install -qy curl supervisor wget
 
-FROM centos:7
+RUN mkdir -p /opt/shibui
+RUN wget https://github.internet2.edu/TIER/shib-idp-ui/releases/download/v${version}/shibui-${version}.war
+RUN sha256sum -c shibui-${version}.war.sha256sum && mv shibui-${version}.war /opt/shibui/shibui.war
 
 # beacon env
-ENV TIERVERSION=PACKAGE_1.18.0
+ENV TIERVERSION=MCM_2.0.5
 
 # 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
+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 containerfiles/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
-
-RUN yum -q -qy update \
-    && yum -qy install --setopt=tsflags=nodocs epel-release \
-    && yum -qy install curl cronie supervisor \
-    && yum clean all \
-    && rm -rf /var/cache/yum
-
-RUN mkdir -p /opt/shibui
-COPY --from=bootstrap shibui.war /opt/shibui/
+ENV JAVA_HOME=/usr/lib/jvm/java-1.17.0-amazon-corretto
 
 COPY containerfiles/supervisord.conf /etc/supervisor/supervisord.conf
 COPY containerfiles/users.txt /opt/shibui

bootstrapfiles/shibui-2.0.0.war.sha256sum

@@ -0,0 +1 @@
+ce537fe9ab834d6efafe6be3413a98a2ec4cafb5634634f71b01f9c86fd29ebf  shibui-2.0.0.war

bootstrapfiles/shibui-2.0.1.war.sha256sum

@@ -0,0 +1 @@
+506003514a20c33db7654c17389f0fc7ff3e1e6a4192980761b17a4f24a6f38c  shibui-2.0.1.war

bootstrapfiles/shibui-2.0.4.war.sha256sum

@@ -0,0 +1 @@
+308dbceb044978d5c8989a9bfa9c83a30e52b4113756ce8b32f50622e66b8a79  shibui-2.0.4.war

bootstrapfiles/shibui-2.0.5.war.sha256sum

@@ -0,0 +1 @@
+006a6da1afb958bc572115e63e31cc0b0bae2eb80d1a33d9862277cfcad6daba  shibui-2.0.5.war

bootstrapfiles/shibui-2.0.6.war.sha256sum

@@ -0,0 +1 @@
+807e245e8c27a9faf9dc950d2f2863c6330f8dd1e26dba35fde87ba2bd498307  shibui-2.0.6.war