From 8ea98a40a40e6864d43d5c2598015ff4dcfa969d Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Tue, 7 Nov 2023 17:03:37 -0700
Subject: [PATCH] NOJIRA

reconfigured dockerfile
---
 Dockerfile | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4f7b29f..1138772 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,22 +1,18 @@
-FROM alpine:3.7 as bootstrap
-
-ARG version=2.0.0-BETA-R1
-
-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
-
 FROM centos:7
-
 # beacon env
-ENV TIERVERSION=PACKAGE_2.0.0
+ENV TIERVERSION=PACKAGE_2.0.0-BETA-R1
+
+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
 
 # Install Corretto Java JDK
 #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 .
+COPY containerfiles/corretto-signing-key.pub .
 RUN curl -O -L $CORRETTO_URL_PERM \
     && rpm --import corretto-signing-key.pub \
     && rpm -K $CORRETTO_RPM \
@@ -24,14 +20,15 @@ RUN curl -O -L $CORRETTO_URL_PERM \
     && rm -r corretto-signing-key.pub $CORRETTO_RPM
 ENV JAVA_HOME=/usr/lib/jvm/java-17-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
+ARG version=2.0.0-BETA-R1
+
+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 mkdir -p /opt/shibui
-COPY --from=bootstrap shibui.war /opt/shibui/
+run mv shibui.war /opt/shibui/shibui.war
 
 COPY containerfiles/supervisord.conf /etc/supervisor/supervisord.conf
 COPY containerfiles/users.txt /opt/shibui