Dockerfile

@@ -1,49 +1,40 @@
-FROM alpine:3.7 as bootstrap
+FROM rockylinux:8.8
+#FROM --platform=$TARGETPLATFORM rockylinux:8.8
 
-ARG version=1.18.0
+# Install Corretto Java JDK (from Amazon repo, more arch independent)
+RUN rpm --import https://yum.corretto.aws/corretto.key \
+    && curl -L -o /etc/yum.repos.d/corretto.repo https://yum.corretto.aws/corretto.repo \
+    && yum install -y java-17-amazon-corretto-devel
+ENV JAVA_HOME=/usr/lib/jvm/java-17-amazon-corretto
 
-COPY bootstrapfiles/shibui-${version}.war.sha256sum .
+RUN rm -fr /var/cache/yum/* && yum clean all && yum -y update && yum -y install --setopt=tsflags=nodocs epel-release && \
+    yum -y install wget supervisor && \
+    yum -y clean all
 
-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 mkdir -p /opt/shibui
 
-FROM centos:7
+COPY containerfiles/supervisord.conf /etc/supervisor/supervisord.conf
+COPY containerfiles/users.txt /opt/shibui
 
 # beacon env
-ENV TIERVERSION=PACKAGE_1.18.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 .
-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
+ENV TIERVERSION=PACKAGE_2.0.0-BETA-R1
+ARG version=2.0.0-BETA-R1
 
-RUN mkdir -p /opt/shibui
-COPY --from=bootstrap shibui.war /opt/shibui/
+COPY bootstrapfiles/shibui-${version}.war.sha256sum .
 
-COPY containerfiles/supervisord.conf /etc/supervisor/supervisord.conf
-COPY containerfiles/users.txt /opt/shibui
+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 mv shibui.war /opt/shibui/shibui.war
 
 # 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"]

bootstrapfiles/shibui-2.0.0-BETA-R1.war.sha256sum

@@ -0,0 +1 @@
+8ce6eec82e69c67c821c44349f4c4784f184ef5d2ac8902576ba620b2584e9a6  shibui-2.0.0-BETA-R1.war