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 5420866 Make repo a build argument
5420866 is described below
commit 54208669ffd2e5f823b6ec03b24708910ad15487
Author: Frank Greguska <[email protected]>
AuthorDate: Mon Jul 15 11:11:11 2019 -0700
Make repo a build argument
---
docker/nexus-webapp/mesos/agent/Dockerfile | 4 ++--
docker/nexus-webapp/mesos/base/Dockerfile | 25 +++++++++++++------------
docker/nexus-webapp/mesos/master/Dockerfile | 3 ++-
docker/nexus-webapp/mesos/webapp/Dockerfile | 4 ++--
docker/nexus-webapp/standalone/Dockerfile | 24 +++++++++++++-----------
5 files changed, 32 insertions(+), 28 deletions(-)
diff --git a/docker/nexus-webapp/mesos/agent/Dockerfile
b/docker/nexus-webapp/mesos/agent/Dockerfile
index feca35f..e4fef7f 100644
--- a/docker/nexus-webapp/mesos/agent/Dockerfile
+++ b/docker/nexus-webapp/mesos/agent/Dockerfile
@@ -12,9 +12,9 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-
+ARG repo=sdap
ARG tag_version=1.0.0-SNAPSHOT
-FROM sdap/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 2cce5d1..095cece 100644
--- a/docker/nexus-webapp/mesos/base/Dockerfile
+++ b/docker/nexus-webapp/mesos/base/Dockerfile
@@ -36,7 +36,7 @@ RUN yum -y update && \
ENV INSTALL_LOC=/usr/local \
HADOOP_VERSION=2.7.3 \
SPARK_VERSION=2.2.0 \
- MESOS_VER=1.5.1 \
+ MESOS_VER=1.5.2 \
MESOS_MASTER_PORT=5050 \
MESOS_AGENT_PORT=5051 \
MESOS_WORKDIR=/var/lib/mesos \
@@ -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
"http://download.oracle.com/otn-pub/java/jdk/8u191-b12/2787e4a523244c269598db4e85c51e0c/jdk-8u191-linux-x64.rpm";
+RUN ./install_java.sh
"https://download.oracle.com/otn-pub/java/jdk/8u201-b09/42970487e3af4f5aa5bca3f542482c60/jdk-8u201-linux-x64.rpm";
# Set up Mesos
COPY mesos/base/install_mesos.sh ./install_mesos.sh
@@ -82,16 +82,17 @@ COPY install_conda.sh ./install_conda.sh
RUN ./install_conda.sh
"https://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh";
${CONDA_HOME}
# Conda dependencies for nexus
-RUN conda install -c conda-forge -y netCDF4 && \
- conda install -y numpy cython mpld3 scipy basemap gdal matplotlib && \
- pip install shapely==1.5.16 cassandra-driver==3.5.0 && \
- conda install -c conda-forge backports.functools_lru_cache=1.3 && \
- cd /usr/lib64 && ln -s libcom_err.so.2 libcom_err.so.3 && \
- cd /usr/local/anaconda2/lib && \
- ln -s libnetcdf.so.11 libnetcdf.so.7 && \
- ln -s libkea.so.1.4.6 libkea.so.1.4.5 && \
- ln -s libhdf5_cpp.so.12 libhdf5_cpp.so.10 && \
- ln -s libjpeg.so.9 libjpeg.so.8
+RUN conda config --add channels conda-forge && \
+ conda install -y netCDF4 \
+ backports.functools_lru_cache \
+ numpy \
+ cython \
+ mpld3 \
+ scipy \
+ basemap \
+ gdal \
+ matplotlib && \
+ pip install shapely==1.5.16 cassandra-driver==3.5.0
# Install nexusproto and nexus
ARG APACHE_NEXUSPROTO=https://github.com/apache/incubator-sdap-nexusproto.git
diff --git a/docker/nexus-webapp/mesos/master/Dockerfile
b/docker/nexus-webapp/mesos/master/Dockerfile
index a6f7f91..034e12f 100644
--- a/docker/nexus-webapp/mesos/master/Dockerfile
+++ b/docker/nexus-webapp/mesos/master/Dockerfile
@@ -13,8 +13,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+ARG repo=sdap
ARG tag_version=1.0.0-SNAPSHOT
-FROM sdap/spark-mesos-base:${tag_version}
+FROM ${repo}/spark-mesos-base:${tag_version}
MAINTAINER Apache SDAP "[email protected]"
diff --git a/docker/nexus-webapp/mesos/webapp/Dockerfile
b/docker/nexus-webapp/mesos/webapp/Dockerfile
index aaa64b2..fe6decc 100644
--- a/docker/nexus-webapp/mesos/webapp/Dockerfile
+++ b/docker/nexus-webapp/mesos/webapp/Dockerfile
@@ -12,9 +12,9 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-
+ARG repo=sdap
ARG tag_version=1.0.0-SNAPSHOT
-FROM sdap/spark-mesos-base:${tag_version}
+FROM ${repo}/spark-mesos-base:${tag_version}
MAINTAINER Apache SDAP "[email protected]"
diff --git a/docker/nexus-webapp/standalone/Dockerfile
b/docker/nexus-webapp/standalone/Dockerfile
index 06073fc..5b6a956 100644
--- a/docker/nexus-webapp/standalone/Dockerfile
+++ b/docker/nexus-webapp/standalone/Dockerfile
@@ -50,7 +50,7 @@ WORKDIR /tmp
# Install Oracle JDK
COPY install_java.sh ./install_java.sh
-RUN ./install_java.sh
"http://download.oracle.com/otn-pub/java/jdk/8u191-b12/2787e4a523244c269598db4e85c51e0c/jdk-8u191-linux-x64.rpm";
+RUN ./install_java.sh
"https://download.oracle.com/otn-pub/java/jdk/8u201-b09/42970487e3af4f5aa5bca3f542482c60/jdk-8u201-linux-x64.rpm";
# Install Spark
COPY install_spark.sh ./install_spark.sh
@@ -61,16 +61,18 @@ COPY install_conda.sh ./install_conda.sh
RUN ./install_conda.sh
"https://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh";
/usr/local/anaconda2
# Conda dependencies for nexus
-RUN conda install -c conda-forge -y netCDF4 && \
- conda install -y numpy cython mpld3 scipy basemap gdal matplotlib && \
- pip install shapely==1.5.16 cassandra-driver==3.5.0 && \
- conda install -c conda-forge backports.functools_lru_cache=1.3 && \
- cd /usr/lib64 && ln -s libcom_err.so.2 libcom_err.so.3 && \
- cd /usr/local/anaconda2/lib && \
- ln -s libnetcdf.so.11 libnetcdf.so.7 && \
- ln -s libkea.so.1.4.6 libkea.so.1.4.5 && \
- ln -s libhdf5_cpp.so.12 libhdf5_cpp.so.10 && \
- ln -s libjpeg.so.9 libjpeg.so.8
+# RUN conda install -c conda-forge -y netCDF4
backports.functools_lru_cache=1.3 && \
+RUN conda config --add channels conda-forge && \
+ conda install -y netCDF4 \
+ backports.functools_lru_cache \
+ numpy \
+ cython \
+ mpld3 \
+ scipy \
+ basemap \
+ gdal \
+ matplotlib && \
+ pip install shapely==1.5.16 cassandra-driver==3.5.0
# Install nexusproto and nexus
ARG APACHE_NEXUSPROTO=https://github.com/apache/incubator-sdap-nexusproto.git
