You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sdap.apache.org by fg...@apache.org on 2019/08/21 01:14:18 UTC
[incubator-sdap-nexus] branch SDAP-203 created (now 848bb30)
This is an automated email from the ASF dual-hosted git repository.
fgreg pushed a change to branch SDAP-203
in repository https://gitbox.apache.org/repos/asf/incubator-sdap-nexus.git.
at 848bb30 SDAP-203 switch to using open jdk 8
This branch includes the following new commits:
new 848bb30 SDAP-203 switch to using open jdk 8
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[incubator-sdap-nexus] 01/01: SDAP-203 switch to using open jdk 8
Posted by fg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fgreg pushed a commit to branch SDAP-203
in repository https://gitbox.apache.org/repos/asf/incubator-sdap-nexus.git
commit 848bb30e9a7c3e07e50d957fab95a167b0b5f1bd
Author: Frank Greguska <fg...@gmail.com>
AuthorDate: Tue Aug 20 18:13:42 2019 -0700
SDAP-203 switch to using open jdk 8
---
.gitignore | 1 +
docker/nexus-webapp/install_java.sh | 20 ++++++++++++++------
docker/nexus-webapp/mesos/base/Dockerfile | 2 +-
docker/nexus-webapp/mesos/base/install_mesos.sh | 1 +
docker/nexus-webapp/standalone/Dockerfile | 4 ++--
5 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..485dee6
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.idea
diff --git a/docker/nexus-webapp/install_java.sh b/docker/nexus-webapp/install_java.sh
index b9ce92b..240f296 100755
--- a/docker/nexus-webapp/install_java.sh
+++ b/docker/nexus-webapp/install_java.sh
@@ -16,10 +16,18 @@
set -ebx
-URL=${1:-"http://download.oracle.com/otn-pub/java/jdk/8u191-b12/2787e4a523244c269598db4e85c51e0c/jdk-8u191-linux-x64.rpm"}
-RPM_PACKAGE=${URL##*/}
-# Install Oracle JDK
-wget -q --no-cookies --no-check-certificate --header "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie" ${URL}
-yum install -y ${RPM_PACKAGE}
-rm ${RPM_PACKAGE}
+yum -y install \
+ java-1.8.0-openjdk \
+ java-1.8.0-openjdk-devel
+yum clean all
+
+export JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk
+
+cat >> /etc/profile.d/openjdk_path.sh << EOF
+ JAVA_HOME=${JAVA_HOME}
+ PATH=${JAVA_HOME}/bin:${PATH}
+EOF
+
+mkdir -p /usr/java
+ln -s ${JAVA_HOME} /usr/java/default
diff --git a/docker/nexus-webapp/mesos/base/Dockerfile b/docker/nexus-webapp/mesos/base/Dockerfile
index 095cece..c62a986 100644
--- a/docker/nexus-webapp/mesos/base/Dockerfile
+++ b/docker/nexus-webapp/mesos/base/Dockerfile
@@ -67,7 +67,7 @@ ENV PYTHONPATH=${PYTHONPATH}:${SPARK_HOME}/python:${SPARK_HOME}/python/lib/py4j-
# Install Oracle JDK
COPY install_java.sh ./install_java.sh
-RUN ./install_java.sh "https://download.oracle.com/otn-pub/java/jdk/8u201-b09/42970487e3af4f5aa5bca3f542482c60/jdk-8u201-linux-x64.rpm"
+RUN ./install_java.sh
# Set up Mesos
COPY mesos/base/install_mesos.sh ./install_mesos.sh
diff --git a/docker/nexus-webapp/mesos/base/install_mesos.sh b/docker/nexus-webapp/mesos/base/install_mesos.sh
index fc0c475..f7c10f5 100755
--- a/docker/nexus-webapp/mesos/base/install_mesos.sh
+++ b/docker/nexus-webapp/mesos/base/install_mesos.sh
@@ -63,6 +63,7 @@ mkdir -p ${MESOS_HOME}
pushd ${MESOS_HOME}
mkdir build
pushd build
+echo ${JAVA_HOME}
../configure
make
# Can't run make check until this is fixed: https://issues.apache.org/jira/browse/MESOS-8608
diff --git a/docker/nexus-webapp/standalone/Dockerfile b/docker/nexus-webapp/standalone/Dockerfile
index 5b6a956..5570938 100644
--- a/docker/nexus-webapp/standalone/Dockerfile
+++ b/docker/nexus-webapp/standalone/Dockerfile
@@ -48,9 +48,9 @@ ENV SPARK_LOCAL_IP=127.0.0.1 \
WORKDIR /tmp
-# Install Oracle JDK
+# Install Open JDK
COPY install_java.sh ./install_java.sh
-RUN ./install_java.sh "https://download.oracle.com/otn-pub/java/jdk/8u201-b09/42970487e3af4f5aa5bca3f542482c60/jdk-8u201-linux-x64.rpm"
+RUN ./install_java.sh
# Install Spark
COPY install_spark.sh ./install_spark.sh