This is an automated email from the ASF dual-hosted git repository.
fgreg pushed a commit to branch 1.1.0-SNAPSHOT
in repository https://gitbox.apache.org/repos/asf/incubator-sdap-nexus.git
The following commit(s) were added to refs/heads/1.1.0-SNAPSHOT by this push:
new 98c5540 SDAP-203 Update docker build files (#80)
98c5540 is described below
commit 98c5540f5936afe37d3a958162d16d25a0386bdc
Author: fgreg <[email protected]>
AuthorDate: Wed Aug 21 13:24:18 2019 -0700
SDAP-203 Update docker build files (#80)
* SDAP-203 switch to using open jdk 8
* fix from syntax
---
.gitignore | 1 +
docker/nexus-webapp/install_java.sh | 20 ++++++++++++++------
docker/nexus-webapp/mesos/agent/Dockerfile | 2 +-
docker/nexus-webapp/mesos/base/Dockerfile | 2 +-
docker/nexus-webapp/mesos/base/install_mesos.sh | 1 +
docker/nexus-webapp/standalone/Dockerfile | 4 ++--
6 files changed, 20 insertions(+), 10 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/agent/Dockerfile
b/docker/nexus-webapp/mesos/agent/Dockerfile
index e4fef7f..23e6ef5 100644
--- a/docker/nexus-webapp/mesos/agent/Dockerfile
+++ b/docker/nexus-webapp/mesos/agent/Dockerfile
@@ -14,7 +14,7 @@
# limitations under the License.
ARG repo=sdap
ARG tag_version=1.0.0-SNAPSHOT
-FROM ${repo}//spark-mesos-base:${tag_version}
+FROM ${repo}/spark-mesos-base:${tag_version}
MAINTAINER Apache SDAP "[email protected]"
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
