Update environment, use root_path instead of openapi_path, update gunicorn config

Dockerfile

@@ -4,11 +4,11 @@ FROM ${FROM_IMAGE}
 LABEL maintainer="Jeremy Fee <jmfee@usgs.gov>"
 
 # set environment variables
-ENV PATH /conda/bin:$PATH \
+ENV LANG='en_US.UTF-8' \
     LC_ALL='en_US.UTF-8' \
-    LANG='en_US.UTF-8' \
-    PYTHONDONTWRITEBYTECODE 1 \
-    PYTHONUNBUFFERED 1
+    PATH=/conda/bin:$PATH \
+    PYTHONDONTWRITEBYTECODE=1 \
+    PYTHONUNBUFFERED=1
 
 # install conda
 RUN echo 'export PATH=/conda/bin:$PATH' > /etc/profile.d/conda.sh \
@@ -24,8 +24,9 @@ RUN conda config --set ssl_verify $SSL_CERT_FILE \
     && conda install --yes jupyter obspy pycurl \
     && conda clean --all -y \
     && export PIP_CERT=$SSL_CERT_FILE \
-    && pip install pipenv \
-    && yum install -y which && yum clean all
+    && pip install pipenv 'virtualenv!=20.0.22' \
+    && yum install -y which \
+    && yum clean all
 
 RUN useradd \
     -c 'Docker image user' \

docker-compose.yml

 version: '3'
 services:
   web:
-    image: usgs/geomag-algorithms:latest
+    build: .
     environment:
-      - DATA_HOST=cwbpub.cr.usgs.gov
-      - DATA_PORT=2060
-      - DATA_TYPE=edge
-      - GEOMAG_WEBSERVICE_PORT=8000
-      - GEOMAG_VERSION=0.3.1
+      # - DATA_HOST=cwbpub.cr.usgs.gov
+      # - DATA_PORT=2060
+      # - DATA_TYPE=edge
+      # - GEOMAG_WEBSERVICE_PORT=8000
+      # - GEOMAG_VERSION=0.3.1
       - WEBSERVICE=true
     ports:
       - '8000:8000'

docker-entrypoint.sh

 #! /bin/bash
+
 # Environment variable to determine whether to start webservice
 export WEBSERVICE=${WEBSERVICE:-false}
 
 # add geomagio to notebook path
 export PYTHONPATH=/geomag-algorithms
 
+
 if [ $WEBSERVICE = 'false' ]; then
-    # run jupyter notebook server
-    exec jupyter notebook \
-        --ip='*' \
-        --notebook-dir=/data \
-        --no-browser \
-        --port=8000
+  # run jupyter notebook server
+  exec jupyter notebook \
+      --ip='*' \
+      --notebook-dir=/data \
+      --no-browser \
+      --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
+  # run gunicorn server for web service
+  exec pipenv run gunicorn \
+      --access-logfile - \
+      --bind 0.0.0.0:8000 \
+      --threads 2 \
+      --workers 2 \
+      --worker-class uvicorn.workers.UvicornWorker \
+      --worker-tmp-dir /dev/shm \
+      geomagio.api:app
 fi

geomagio/api/secure/app.py

@@ -11,7 +11,7 @@ from .metadata import router as metadata_router
 from .SessionMiddleware import SessionMiddleware
 
 
-app = FastAPI()
+app = FastAPI(root_path="/ws/secure")
 
 # NOTE: database used for sessions is started by ..app.app,
 # which mounts this application at /ws/secure

geomagio/api/ws/app.py

+import os
 from typing import Dict, Union
 
 from fastapi import FastAPI, Request, Response
@@ -19,10 +20,10 @@ ERROR_CODE_MESSAGES = {
     503: "Service Unavailable",
 }
 
-VERSION = "version"
+VERSION = os.getenv("GEOMAG_VERSION", "version")
 
 
-app = FastAPI(docs_url="/docs", openapi_prefix="/ws")
+app = FastAPI(docs_url="/docs", root_path="/ws")
 
 app.add_middleware(CORSMiddleware, allow_origins=["*"], max_age=86400)