From 86ae3fef8575240f59353b46278b3c90c2c1a331 Mon Sep 17 00:00:00 2001
From: Travis Rivers <trivers@contractor.usgs.gov>
Date: Wed, 10 Jun 2020 15:52:27 -0600
Subject: [PATCH] add comments, clean up
---
Dockerfile | 3 ++-
docker-entrypoint.sh | 2 ++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 81231993..523a940d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,13 +3,14 @@ ARG FROM_IMAGE=usgs/centos:8
FROM ${FROM_IMAGE}
LABEL maintainer="Jeremy Fee <jmfee@usgs.gov>"
-# install conda
+# set environment variables
ENV PATH /conda/bin:$PATH
ENV LC_ALL='en_US.UTF-8'
ENV LANG='en_US.UTF-8'
ENV PYTHONDONTWRITEBYTECODE 1
ENV PYTHONUNBUFFERED 1
+# install conda
RUN echo 'export PATH=/conda/bin:$PATH' > /etc/profile.d/conda.sh \
&& curl \
https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh \
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 008ff9a3..d4287ae6 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -1,6 +1,7 @@
#! /bin/bash
# Environment variable to determine whether to start webservice
export WEBSERVICE=${WEBSERVICE:-false}
+
# add geomagio to notebook path
export PYTHONPATH=/geomag-algorithms
@@ -14,5 +15,6 @@ if [ $WEBSERVICE = 'false' ]; then
--port=8000
else
+# run gunicorn server for web service
exec pipenv run gunicorn --bind 0.0.0.0:8000 -w 4 -k uvicorn.workers.UvicornWorker geomagio.api.app:app
fi
--
GitLab