From 4496eea5f13644078f59e89cb591ce5fa704b803 Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Tue, 7 Nov 2023 16:16:48 -0700
Subject: [PATCH 1/6] NOJIRA
RELEASE 2.0.0-BETA-R1
---
Dockerfile | 20 +++++++++----------
.../shibui-2.0.0-BETA-R1.war.sha256sum | 1 +
2 files changed, 11 insertions(+), 10 deletions(-)
create mode 100644 bootstrapfiles/shibui-2.0.0-BETA-R1.war.sha256sum
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
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 2/6] 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
From de10a751a60dd3d521f45f585419379906b621fc Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Thu, 9 Nov 2023 13:14:01 -0700
Subject: [PATCH 3/6] NOJIRA
reconfigured dockerfile
---
Dockerfile | 34 +++++++++++-----------------------
1 file changed, 11 insertions(+), 23 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 1138772..bd30702 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,25 +1,16 @@
-FROM centos:7
-# beacon env
-ENV TIERVERSION=PACKAGE_2.0.0-BETA-R1
+FROM --platform=$TARGETPLATFORM rockylinux:8.8
-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 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
+# 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 containerfiles/supervisord.conf /etc/supervisor/supervisord.conf
+COPY containerfiles/users.txt /opt/shibui
+
+# beacon env
+ENV TIERVERSION=PACKAGE_2.0.0-BETA-R1
ARG version=2.0.0-BETA-R1
COPY bootstrapfiles/shibui-${version}.war.sha256sum .
@@ -28,10 +19,7 @@ RUN wget https://github.internet2.edu/TIER/shib-idp-ui/releases/download/v${vers
&& sha256sum -c shibui-${version}.war.sha256sum && mv shibui-${version}.war shibui.war
RUN mkdir -p /opt/shibui
-run mv shibui.war /opt/shibui/shibui.war
-
-COPY containerfiles/supervisord.conf /etc/supervisor/supervisord.conf
-COPY containerfiles/users.txt /opt/shibui
+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.
From 32a5b414fb08155cbac75dd2700896e2161bb366 Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Thu, 9 Nov 2023 13:54:55 -0700
Subject: [PATCH 4/6] NOJIRA
reconfigured dockerfile
---
Dockerfile | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index bd30702..7728c10 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,5 @@
-FROM --platform=$TARGETPLATFORM rockylinux:8.8
+FROM rockylinux:8.8
+#FROM --platform=$TARGETPLATFORM rockylinux:8.8
# Install Corretto Java JDK (from Amazon repo, more arch independent)
RUN rpm --import https://yum.corretto.aws/corretto.key \
@@ -6,6 +7,12 @@ RUN rpm --import https://yum.corretto.aws/corretto.key \
&& yum install -y java-17-amazon-corretto-devel
ENV JAVA_HOME=/usr/lib/jvm/java-17-amazon-corretto
+RUN rm -fr /var/cache/yum/* && yum clean all && yum -y update && yum -y install --setopt=tsflags=nodocs epel-release && \
+ yum -y install wget && \
+ yum -y clean all
+
+RUN mkdir -p /opt/shibui
+
COPY containerfiles/supervisord.conf /etc/supervisor/supervisord.conf
COPY containerfiles/users.txt /opt/shibui
@@ -18,7 +25,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 mkdir -p /opt/shibui
RUN mv shibui.war /opt/shibui/shibui.war
# TIER Beacon Opt-out
From 51f27ec1bbfa85538af9ae33d33440fd17045d0a Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Wed, 15 Nov 2023 14:03:12 -0700
Subject: [PATCH 5/6] NOJIRA
added missing setup from dockerfile
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 7728c10..685175c 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,7 @@ RUN rpm --import https://yum.corretto.aws/corretto.key \
ENV JAVA_HOME=/usr/lib/jvm/java-17-amazon-corretto
RUN rm -fr /var/cache/yum/* && yum clean all && yum -y update && yum -y install --setopt=tsflags=nodocs epel-release && \
- yum -y install wget && \
+ yum -y install wget supervisor && \
yum -y clean all
RUN mkdir -p /opt/shibui
From cd40cf7e2f078735d318b51e26bdcafaf5f73201 Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Wed, 29 Nov 2023 13:09:39 -0700
Subject: [PATCH 6/6] NOJIRA
CREATE docker image BETA-R2
---
Dockerfile | 4 ++--
bootstrapfiles/shibui-2.0.0-BETA-R2.war.sha256sum | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
create mode 100644 bootstrapfiles/shibui-2.0.0-BETA-R2.war.sha256sum
diff --git a/Dockerfile b/Dockerfile
index 685175c..1d64a8f 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,8 +17,8 @@ COPY containerfiles/supervisord.conf /etc/supervisor/supervisord.conf
COPY containerfiles/users.txt /opt/shibui
# beacon env
-ENV TIERVERSION=PACKAGE_2.0.0-BETA-R1
-ARG version=2.0.0-BETA-R1
+ENV TIERVERSION=PACKAGE_2.0.0-BETA-R2
+ARG version=2.0.0-BETA-R2
COPY bootstrapfiles/shibui-${version}.war.sha256sum .
diff --git a/bootstrapfiles/shibui-2.0.0-BETA-R2.war.sha256sum b/bootstrapfiles/shibui-2.0.0-BETA-R2.war.sha256sum
new file mode 100644
index 0000000..d4292de
--- /dev/null
+++ b/bootstrapfiles/shibui-2.0.0-BETA-R2.war.sha256sum
@@ -0,0 +1 @@
+8270d6405e0ae3680c8b2cf5dd624e2fe8ec2ab739bf66ac965e667b33473101 shibui-2.0.0-BETA-R2.war
\ No newline at end of file