Switching to Zulu Java, and removed latest tag from centos

docker · Jun 22, 2018 · 6ae5c03 · 6ae5c03
1 parent 8e5c4db
commit 6ae5c03
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,21 +1,24 @@
-FROM centos:latest
+FROM centos:centos7
 MAINTAINER  ethan@unc.edu ekromhout@gmail.com
 RUN yum -y install epel-release && yum -y update && yum -y install pwgen rabbitmq-server supervisor wget
 ENV RABBITMQ_LOGS=- RABBITMQ_SASL_LOGS=-
 RUN /usr/lib/rabbitmq/bin/rabbitmq-plugins enable rabbitmq_management
 RUN /usr/lib/rabbitmq/bin/rabbitmq-plugins enable rabbitmq_tracing
 RUN sed -i s/'%% {load_definitions, .*"},'/'{load_definitions, "\/etc\/rabbitmq\/rabbitmq.json"}'/ /etc/rabbitmq/rabbitmq.config
-
-ENV JAVA_VERSION=8u171
-ENV BUILD_VERSION=b11
-ENV JAVA_BUNDLE_ID=512cd62ec5174c3487ac17c61aaa89e8
+# Installing Zulu Java
+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
+#ENV JAVA_VERSION=8u171
+#ENV BUILD_VERSION=b11
+#ENV JAVA_BUNDLE_ID=512cd62ec5174c3487ac17c61aaa89e8
 #     ==> By uncommenting these next 6 lines, you agree to the Oracle Binary Code License Agreement for Java SE (http://www.oracle.com/technetwork/java/javase/terms/license/index.html)
-RUN wget -nv --no-cookies --no-check-certificate --header "Cookie: oraclelicense=accept-securebackup-cookie" "http://download.oracle.com/otn-pub/java/jdk/$JAVA_VERSION-$BUILD_VERSION/$JAVA_BUNDLE_ID/jdk-$JAVA_VERSION-linux-x64.rpm" -O /tmp/jdk-$JAVA_VERSION-$BUILD_VERSION-linux-x64.rpm && \
-     yum -y install /tmp/jdk-$JAVA_VERSION-$BUILD_VERSION-linux-x64.rpm && \
-     rm -f /tmp/jdk-$JAVA_VERSION-$BUILD_VERSION-linux-x64.rpm && \
-     alternatives --install /usr/bin/java jar $JAVA_HOME/bin/java 200000 && \
-     alternatives --install /usr/bin/javaws javaws $JAVA_HOME/bin/javaws 200000 && \
-     alternatives --install /usr/bin/javac javac $JAVA_HOME/bin/javac 200000
+#RUN wget -nv --no-cookies --no-check-certificate --header "Cookie: oraclelicense=accept-securebackup-cookie" "http://download.oracle.com/otn-pub/java/jdk/$JAVA_VERSION-$BUILD_VERSION/$JAVA_BUNDLE_ID/jdk-$JAVA_VERSION-linux-x64.rpm" -O /tmp/jdk-$JAVA_VERSION-$BUILD_VERSION-linux-x64.rpm && \
+#     yum -y install /tmp/jdk-$JAVA_VERSION-$BUILD_VERSION-linux-x64.rpm && \
+#     rm -f /tmp/jdk-$JAVA_VERSION-$BUILD_VERSION-linux-x64.rpm && \
+#     alternatives --install /usr/bin/java jar $JAVA_HOME/bin/java 200000 && \
+#     alternatives --install /usr/bin/javaws javaws $JAVA_HOME/bin/javaws 200000 && \
+#     alternatives --install /usr/bin/javac javac $JAVA_HOME/bin/javac 200000
 
 RUN sed -i s/'nodaemon=false'/'nodaemon=true'/ /etc/supervisord.conf
 COPY rabbitmqctl.sh /root/

diff --git a/trace.ini b/trace.ini
@@ -1,5 +1,5 @@
 [program:trace]
-command=/usr/java/latest/bin/java -cp rabbittrace-0.1-jar-with-dependencies.jar edu.unc.tier.rabbittrace.Trace '#'
+command=/usr/lib/jvm/zulu-8/bin/java -cp rabbittrace-0.1-jar-with-dependencies.jar edu.unc.tier.rabbittrace.Trace '#'
 directory=/root
 priority=2
 redirect_stderr=true