Skip to content
Snippets Groups Projects
Commit 900e32f6 authored by Jeremy M Fee's avatar Jeremy M Fee
Browse files

Update pipenv install command, add ssl_cert environment vars, add git environment vars/args

parent 5f548d4f
No related branches found
No related tags found
No related merge requests found
...@@ -3,12 +3,19 @@ ARG FROM_IMAGE=usgs/centos:latest ...@@ -3,12 +3,19 @@ ARG FROM_IMAGE=usgs/centos:latest
FROM ${FROM_IMAGE} FROM ${FROM_IMAGE}
LABEL maintainer="Jeremy Fee <jmfee@usgs.gov>" LABEL maintainer="Jeremy Fee <jmfee@usgs.gov>"
ARG GIT_BRANCH_NAME=none
ARG GIT_COMMIT_SHA=none
# set environment variables # set environment variables
ENV LANG='en_US.UTF-8' \ ENV GIT_BRANCH_NAME=${GIT_BRANCH_NAME} \
GIT_COMMIT_SHA=${GIT_COMMIT_SHA} \
LANG='en_US.UTF-8' \
LC_ALL='en_US.UTF-8' \ LC_ALL='en_US.UTF-8' \
PATH=/conda/bin:$PATH \ PATH=/conda/bin:$PATH \
PIP_CERT=${SSL_CERT_FILE} \
PYTHONDONTWRITEBYTECODE=1 \ PYTHONDONTWRITEBYTECODE=1 \
PYTHONUNBUFFERED=1 PYTHONUNBUFFERED=1 \
REQUESTS_CA_BUNDLE=${SSL_CERT_FILE}
# install conda # install conda
RUN echo 'export PATH=/conda/bin:$PATH' > /etc/profile.d/conda.sh \ RUN echo 'export PATH=/conda/bin:$PATH' > /etc/profile.d/conda.sh \
...@@ -41,8 +48,8 @@ USER geomag_user ...@@ -41,8 +48,8 @@ USER geomag_user
# install dependencies via pipenv # install dependencies via pipenv
WORKDIR /data WORKDIR /data
COPY Pipfile Pipfile.lock /data/ COPY Pipfile /data/
RUN pipenv install --site-packages RUN pipenv --site-packages install --skip-lock
# copy library (ignores set in .dockerignore) # copy library (ignores set in .dockerignore)
COPY . /geomag-algorithms COPY . /geomag-algorithms
......
...@@ -13,7 +13,7 @@ webtest = "*" ...@@ -13,7 +13,7 @@ webtest = "*"
[packages] [packages]
numpy = "*" numpy = "*"
scipy = "*" scipy = "*"
obspy = ">1.2.0" obspy = "*"
pycurl = "*" pycurl = "*"
authlib = "*" authlib = "*"
cryptography = "*" cryptography = "*"
......
This diff is collapsed.
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