From 47a78326c44832c329e7b8e24968395e3bada532 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 15 Jun 2018 16:02:36 -0400
Subject: [PATCH 1/7] Update Dockerfile
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index bdc6c589..1e052d72 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,7 @@ RUN yum update -y \
&& yum clean all
ENV GROUPER_VERSION=2.3.0 \
- JAVA_HOME=/usr
+ JAVA_HOME=/usr/lib/jvm/zulu-8/
# use Zulu package
RUN rpm --import http://repos.azulsystems.com/RPM-GPG-KEY-azulsystems \
From 61a3ba6a0d2a4a8abb2afac430cc09713b759205 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 15 Jun 2018 16:24:11 -0400
Subject: [PATCH 2/7] Update Dockerfile
---
Dockerfile | 1 +
1 file changed, 1 insertion(+)
diff --git a/Dockerfile b/Dockerfile
index 1e052d72..8720987f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,6 +11,7 @@ ENV GROUPER_VERSION=2.3.0 \
RUN rpm --import http://repos.azulsystems.com/RPM-GPG-KEY-azulsystems \
&& curl -o /etc/yum.repos.d/zulu.repo http://repos.azulsystems.com/rhel/zulu.repo \
&& yum -y install zulu-8
+ && ln -s $JAVA_HOME/bin/java /etc/alternatives
#RUN java_version=8.0.172; \
# zulu_version=8.30.0.1; \
From 30df43bdb904c1c879ceb5cdd976fea5dd154ff2 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 15 Jun 2018 16:24:58 -0400
Subject: [PATCH 3/7] Update Dockerfile
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 8720987f..41c9cce2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@ ENV GROUPER_VERSION=2.3.0 \
# use Zulu package
RUN rpm --import http://repos.azulsystems.com/RPM-GPG-KEY-azulsystems \
&& curl -o /etc/yum.repos.d/zulu.repo http://repos.azulsystems.com/rhel/zulu.repo \
- && yum -y install zulu-8
+ && yum -y install zulu-8 \
&& ln -s $JAVA_HOME/bin/java /etc/alternatives
#RUN java_version=8.0.172; \
From b03d1cdda13aab81773bfe9a52343ae471a3effe Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 15 Jun 2018 16:28:36 -0400
Subject: [PATCH 4/7] Update Dockerfile
---
Dockerfile | 1 +
1 file changed, 1 insertion(+)
diff --git a/Dockerfile b/Dockerfile
index 41c9cce2..bc6512b0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,6 +11,7 @@ ENV GROUPER_VERSION=2.3.0 \
RUN rpm --import http://repos.azulsystems.com/RPM-GPG-KEY-azulsystems \
&& curl -o /etc/yum.repos.d/zulu.repo http://repos.azulsystems.com/rhel/zulu.repo \
&& yum -y install zulu-8 \
+ && ls -ld /etc/alternatives/java \
&& ln -s $JAVA_HOME/bin/java /etc/alternatives
#RUN java_version=8.0.172; \
From a14c250bb2fdcacf49581b7feb2ced5fa971c0be Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 15 Jun 2018 16:31:29 -0400
Subject: [PATCH 5/7] Update Dockerfile
---
Dockerfile | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index bc6512b0..0070aedc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,9 +10,7 @@ ENV GROUPER_VERSION=2.3.0 \
# use Zulu package
RUN rpm --import http://repos.azulsystems.com/RPM-GPG-KEY-azulsystems \
&& curl -o /etc/yum.repos.d/zulu.repo http://repos.azulsystems.com/rhel/zulu.repo \
- && yum -y install zulu-8 \
- && ls -ld /etc/alternatives/java \
- && ln -s $JAVA_HOME/bin/java /etc/alternatives
+ && yum -y install zulu-8
#RUN java_version=8.0.172; \
# zulu_version=8.30.0.1; \
@@ -60,6 +58,7 @@ COPY --from=installing /opt/grouper/$GROUPER_VERSION/grouper.ws-$GROUPER_VERSION
#COPY --from=installing /opt/grouper/$GROUPER_VERSION/grouper.clientBinary-$GROUPER_VERSION/ /opt/grouper/grouper.clientBinary/
COPY --from=installing /opt/grouper/$GROUPER_VERSION/apache-tomcat-$TOMCAT_VERSION/ /opt/tomcat/
COPY --from=installing /opt/grouper/$GROUPER_VERSION/apache-tomee-webprofile-$TOMEE_VERSION/ /opt/tomee/
+COPY --from=installing /etc/alternatives/java /etc/alternatives/java
ADD http://central.maven.org/maven2/org/apache/logging/log4j/log4j-core/2.11.0/log4j-core-2.11.0.jar /opt/tomcat/bin
ADD http://central.maven.org/maven2/org/apache/logging/log4j/log4j-api/2.11.0/log4j-api-2.11.0.jar /opt/tomcat/bin
From c200a08c8f35df4b146a7dcbffc4bd8293af73b6 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 15 Jun 2018 17:37:55 -0400
Subject: [PATCH 6/7] Update Dockerfile
---
Dockerfile | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 0070aedc..4e13f4f2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -94,7 +94,7 @@ LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
ImageName=$imagename \
ImageOS=centos7
-ENV JAVA_HOME=/usr \
+ENV JAVA_HOME=/usr/lib/jvm/zulu-8/ \
PATH=$PATH:$JAVA_HOME/bin \
GROUPER_HOME=/opt/grouper/grouper.apiBinary
@@ -115,7 +115,9 @@ RUN groupadd -r tomcat \
&& useradd -r -m -s /sbin/nologin -g tomcat tomcat \
&& mkdir -p /opt/tomcat/logs/ /opt/tomcat/temp/ /opt/tomcat/work/ \
&& chown -R tomcat:tomcat /opt/tomcat/logs/ /opt/tomcat/temp/ /opt/tomcat/work/ \
- && chown -R tomcat:tomcat /opt/tomee/logs/ /opt/tomee/temp/ /opt/tomee/work/
+ && chown -R tomcat:tomcat /opt/tomee/logs/ /opt/tomee/temp/ /opt/tomee/work/ \
+ && rm /etc/alternatives/java \
+ && ln -s $JAVA_HOME/bin/java /etc/alternatives/java
RUN rm /etc/shibboleth/sp-key.pem /etc/shibboleth/sp-cert.pem
From 64d77c1bdee8fcdbdb0f1d3d1175acd4b6c5a226 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 15 Jun 2018 18:36:54 -0400
Subject: [PATCH 7/7] Update Dockerfile
---
Dockerfile | 1 -
1 file changed, 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 4e13f4f2..ac08e98b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -116,7 +116,6 @@ RUN groupadd -r tomcat \
&& mkdir -p /opt/tomcat/logs/ /opt/tomcat/temp/ /opt/tomcat/work/ \
&& chown -R tomcat:tomcat /opt/tomcat/logs/ /opt/tomcat/temp/ /opt/tomcat/work/ \
&& chown -R tomcat:tomcat /opt/tomee/logs/ /opt/tomee/temp/ /opt/tomee/work/ \
- && rm /etc/alternatives/java \
&& ln -s $JAVA_HOME/bin/java /etc/alternatives/java
RUN rm /etc/shibboleth/sp-key.pem /etc/shibboleth/sp-cert.pem