From 840425e74fa685f661922e82a81fb3c05e68d182 Mon Sep 17 00:00:00 2001
From: Sean Porth <sporth@unicon.net>
Date: Tue, 22 Oct 2024 10:59:27 -0400
Subject: [PATCH] release 2.0.4
---
Dockerfile | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 4356c29..c597891 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,10 +10,11 @@ COPY bootstrapfiles/shibui-${version}.war.sha256sum .
# && yum clean all \
# && rm -rf /var/cache/yum
RUN yum -qy install --setopt=tsflags=nodocs epel-release \
- && yum install -qy curl supervisor
+ && yum install -qy curl supervisor wget
-RUN curl 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
+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=MCM_2.0.4
@@ -30,9 +31,6 @@ RUN curl -O -L $CORRETTO_URL_PERM \
&& rm -r corretto-signing-key.pub $CORRETTO_RPM
ENV JAVA_HOME=/usr/lib/jvm/java-1.17.0-amazon-corretto
-RUN mkdir -p /opt/shibui
-COPY shibui.war /opt/shibui/
-
COPY containerfiles/supervisord.conf /etc/supervisor/supervisord.conf
COPY containerfiles/users.txt /opt/shibui