Skip to content
Snippets Groups Projects
Unverified Commit 1dc8c7f3 authored by Claycomb, Abram Earl's avatar Claycomb, Abram Earl Committed by GitHub
Browse files

Merge pull request #206 from jmfee-usgs/docker-update

Switch base image, use conda-forge channel, remove version label
parents f5338dfb c615098d
No related branches found
No related tags found
No related merge requests found
FROM usgs/hazdev-base-images:latest-centos AS pycurl-build FROM usgs/centos:latest AS pycurl-build
# install conda dependencies # install conda dependencies
RUN yum install -y \ RUN yum install -y \
...@@ -18,7 +18,7 @@ RUN echo 'export PATH=/conda/bin:$PATH' > /etc/profile.d/conda.sh && \ ...@@ -18,7 +18,7 @@ RUN echo 'export PATH=/conda/bin:$PATH' > /etc/profile.d/conda.sh && \
# install algorithms and dependencies via conda # install algorithms and dependencies via conda
RUN conda config --set ssl_verify $SSL_CERT_FILE && \ 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 install --yes jupyter obspy && \
conda clean -i -l -t -y && \ conda clean -i -l -t -y && \
# build pycurl with SFTP support # build pycurl with SFTP support
...@@ -27,9 +27,8 @@ RUN conda config --set ssl_verify $SSL_CERT_FILE && \ ...@@ -27,9 +27,8 @@ RUN conda config --set ssl_verify $SSL_CERT_FILE && \
pip install pycurl pip install pycurl
FROM usgs/hazdev-base-images:latest-centos FROM usgs/centos:latest
LABEL maintainer="Jeremy Fee <jmfee@usgs.gov>" LABEL maintainer="Jeremy Fee <jmfee@usgs.gov>"
LABEL usgs.geomag-algorithms.version=0.4.0
# use conda install from build container # use conda install from build container
ENV PATH /conda/bin:$PATH ENV PATH /conda/bin:$PATH
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment