From c615098d1ffc2ebcc2f86f70940700d3fd111d18 Mon Sep 17 00:00:00 2001
From: Jeremy Fee <jmfee@usgs.gov>
Date: Fri, 15 Jun 2018 13:45:10 -0600
Subject: [PATCH] Switch base image, use conda-forge channel, remove version
label
---
Dockerfile | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index b8bbe848..ab993d1e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM usgs/hazdev-base-images:latest-centos AS pycurl-build
+FROM usgs/centos:latest AS pycurl-build
# install conda dependencies
RUN yum install -y \
@@ -18,7 +18,7 @@ RUN echo 'export PATH=/conda/bin:$PATH' > /etc/profile.d/conda.sh && \
# install algorithms and dependencies via conda
RUN conda config --set ssl_verify $SSL_CERT_FILE && \
- conda config --add channels obspy && \
+ conda config --add channels conda-forge && \
conda install --yes jupyter obspy && \
conda clean -i -l -t -y && \
# build pycurl with SFTP support
@@ -27,9 +27,8 @@ RUN conda config --set ssl_verify $SSL_CERT_FILE && \
pip install pycurl
-FROM usgs/hazdev-base-images:latest-centos
+FROM usgs/centos:latest
LABEL maintainer="Jeremy Fee <jmfee@usgs.gov>"
-LABEL usgs.geomag-algorithms.version=0.4.0
# use conda install from build container
ENV PATH /conda/bin:$PATH
--
GitLab