You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by mi...@apache.org on 2018/11/08 16:19:07 UTC

[trafficcontrol] 02/02: update traffic_router builder Dockerfile to build w/ openjdk

This is an automated email from the ASF dual-hosted git repository.

mitchell852 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git

commit 0b347032d5070be4036cef1c2f383e1880751d61
Author: Dan Kirkwood <da...@apache.org>
AuthorDate: Mon Nov 5 12:44:14 2018 -0700

    update traffic_router builder Dockerfile to build w/ openjdk
---
 infrastructure/docker/build/Dockerfile-traffic_router | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/infrastructure/docker/build/Dockerfile-traffic_router b/infrastructure/docker/build/Dockerfile-traffic_router
index 72a5422..3b168e6 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_router
+++ b/infrastructure/docker/build/Dockerfile-traffic_router
@@ -32,22 +32,15 @@ RUN	yum -y install \
 ### traffic_router specific requirements
 RUN	yum -y install \
 		which  \
-                curl && \
+                curl \
+                java-1.8.0-openjdk \
+                java-1.8.0-openjdk-devel && \
 	yum -y clean all
 
-
+ENV JAVA_HOME=/usr/lib/jvm/java
 WORKDIR /opt
-RUN curl -L -b "oraclelicense=a" http://download.oracle.com/otn-pub/java/jdk/8u131-b11/d54c1d3a095b4ff2b6607d096fa80163/jdk-8u131-linux-x64.tar.gz | tar xzf - && \
-    curl -L https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.3.9/apache-maven-3.3.9-bin.tar.gz | tar xzf -
-RUN ln -s jdk* java && ln -s apache-maven* maven
-
-RUN alternatives --install /usr/bin/java java /opt/java/bin/java 2 && \
-    alternatives --install /usr/bin/jar jar /opt/java/bin/jar 2 && \
-    alternatives --install /usr/bin/javac javac /opt/java/bin/javac 2 && \
-    alternatives --set java /opt/java/bin/java && \
-    alternatives --set jar /opt/java/bin/jar && \
-    alternatives --set javac /opt/java/bin/javac && \
-    alternatives --install /usr/bin/mvn mvn /opt/maven/bin/mvn 1
+RUN curl -L https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.0/apache-maven-3.6.0-bin.tar.gz | tar xzf - && \
+    alternatives --install /usr/bin/mvn mvn /opt/apache-maven*/bin/mvn 1
 
 ###