From 71806877b46480d44887c1168e987492b8f7dd62 Mon Sep 17 00:00:00 2001
From: Matt Fisher <matt.fisher@nsidc.org>
Date: Mon, 31 Jul 2023 12:13:24 -0600
Subject: [PATCH] Use a production webserver by default

---
 Dockerfile             | 13 ++++++-----
 conda-lock.yml         | 50 +++++++++++++++++++++++++++++++++---------
 docker-compose.dev.yml |  2 ++
 environment.yml        | 10 ++++-----
 4 files changed, 55 insertions(+), 20 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b153b0b5..e8f8c9e5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -39,8 +39,11 @@ RUN python -c "import flask"
 RUN which flask
 
 # Start a flask server
-# WARNING: Using CMD is key; using ENTRYPOINT overrides the micromamba
-#          entrypoint and prevents env activation.
-# TODO: Move this to dev docker-compose and use a production ready server
-#       option in non-dev
-CMD ["flask", "run", "--cert=adhoc", "-h", "0.0.0.0"]
+#
+# WARNING: Be careful not to change this CMD to an ENTRYPOINT without reading
+# the docs!
+#     https://micromamba-docker.readthedocs.io/en/latest/advanced_usage.html#use-of-the-entrypoint-command-within-a-dockerfile
+#
+# For gunicorn, the recommended number of workers is (2*CPU)+1. This config
+# assumes dual-core CPU.
+CMD ["gunicorn", "usaon_vta_survey:app", "--workers", "5", "--bind", "0.0.0.0:5000"]
diff --git a/conda-lock.yml b/conda-lock.yml
index 6096cbcc..33ce2bd0 100644
--- a/conda-lock.yml
+++ b/conda-lock.yml
@@ -13,8 +13,8 @@
 version: 1
 metadata:
   content_hash:
-    linux-64: d783fcea3e9b78e720249c8cf8d39bfc3e1117e1a3a5963d844ee9fb126045ab
-    osx-64: c4382710a53451567375d8e3fea0025f76a6e31c6d0b89dfd3e7dd06b32c46e6
+    linux-64: 4b404884cd24332267b06e92905c4d42a4c15317225092ba0f8c0b9d755221dc
+    osx-64: cc9fe5af9235e137eb76990357aa63f490768ba668ad8ed6339f47fa5cb08896
   channels:
   - url: conda-forge
     used_env_vars: []
@@ -772,6 +772,21 @@ package:
     sha256: f223c8782195f19dbe7cfd27e329de8b0e2205a090ee2a6891e0695d4d634854
   category: main
   optional: false
+- name: gunicorn
+  version: 21.2.0
+  manager: conda
+  platform: linux-64
+  dependencies:
+    packaging: ''
+    python: '>=3.10,<3.11.0a0'
+    python_abi: 3.10.*
+    setuptools: '>=3.0'
+  url: https://conda.anaconda.org/conda-forge/linux-64/gunicorn-21.2.0-py310hff52083_0.conda
+  hash:
+    md5: 4a35b3cfaead26e3a164de3314a3c458
+    sha256: e67103c7761eca4a5a216193583e3e33f34077b8b3fcc20e508ae4699c1072c6
+  category: main
+  optional: false
 - name: importlib-metadata
   version: 6.8.0
   manager: conda
@@ -978,16 +993,16 @@ package:
   category: main
   optional: false
 - name: platformdirs
-  version: 3.9.1
+  version: 3.10.0
   manager: conda
   platform: linux-64
   dependencies:
     python: '>=3.7'
     typing-extensions: '>=4.6.3'
-  url: https://conda.anaconda.org/conda-forge/noarch/platformdirs-3.9.1-pyhd8ed1ab_0.conda
+  url: https://conda.anaconda.org/conda-forge/noarch/platformdirs-3.10.0-pyhd8ed1ab_0.conda
   hash:
-    md5: 044e7a1e0ad42c4e67110bd078150a63
-    sha256: 885611bd528abaf3e31bc0bfaad3a619cfe89db61d886b53c2a9ec9ff50edebe
+    md5: 0809187ef9b89a3d94a5c24d13936236
+    sha256: 1b5c0ca2f4260c7dd8cfccd8a641c1e41876c79dc594506be379cde08f5b471e
   category: main
   optional: false
 - name: requests
@@ -1829,6 +1844,21 @@ package:
     sha256: 67aa2bf58a98ed9e5bd693233f1de3cf7d499e9520dec7cbea0ee71e4d8f6895
   category: main
   optional: false
+- name: gunicorn
+  version: 21.2.0
+  manager: conda
+  platform: osx-64
+  dependencies:
+    packaging: ''
+    python: '>=3.10,<3.11.0a0'
+    python_abi: 3.10.*
+    setuptools: '>=3.0'
+  url: https://conda.anaconda.org/conda-forge/osx-64/gunicorn-21.2.0-py310h2ec42d9_0.conda
+  hash:
+    md5: 67e06cc92a1b8360539f7739b39e887c
+    sha256: 75937a1d5364f6ea5a262b237c5338bc815620e6a4012226e922330cf83fa369
+  category: main
+  optional: false
 - name: importlib-metadata
   version: 6.8.0
   manager: conda
@@ -2032,16 +2062,16 @@ package:
   category: main
   optional: false
 - name: platformdirs
-  version: 3.9.1
+  version: 3.10.0
   manager: conda
   platform: osx-64
   dependencies:
     python: '>=3.7'
     typing-extensions: '>=4.6.3'
-  url: https://conda.anaconda.org/conda-forge/noarch/platformdirs-3.9.1-pyhd8ed1ab_0.conda
+  url: https://conda.anaconda.org/conda-forge/noarch/platformdirs-3.10.0-pyhd8ed1ab_0.conda
   hash:
-    md5: 044e7a1e0ad42c4e67110bd078150a63
-    sha256: 885611bd528abaf3e31bc0bfaad3a619cfe89db61d886b53c2a9ec9ff50edebe
+    md5: 0809187ef9b89a3d94a5c24d13936236
+    sha256: 1b5c0ca2f4260c7dd8cfccd8a641c1e41876c79dc594506be379cde08f5b471e
   category: main
   optional: false
 - name: requests
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index c2735858..5ad491ca 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -4,6 +4,8 @@ services:
 
   usaon-vta-survey:
     image: "nsidc/usaon-vta-survey:dev"
+    # Flask development server with live debugger and hot reloading:
+    command: "flask run --cert=adhoc -h 0.0.0.0"
     build: "."
     ports:
       - "5000:5000"
diff --git a/environment.yml b/environment.yml
index ced56e1c..71db092a 100644
--- a/environment.yml
+++ b/environment.yml
@@ -2,6 +2,9 @@ name: usaon-vta-survey
 channels:
   - conda-forge
   - nodefaults
+platforms:
+  - linux-64
+  - osx-64
 dependencies:
   - python ~=3.10.6
 
@@ -17,7 +20,8 @@ dependencies:
   # Runtime dependencies:
   - flask ~=2.2
   - flask-wtf ~=1.0
-  - flask-login
+  - flask-login ~=0.6.2
+  - gunicorn ~=21.2
   
   - requests 
   - oauthlib
@@ -35,7 +39,3 @@ dependencies:
   - pip:
     - wtforms-sqlalchemy
     - flask-dance
-
-platforms:
-  - linux-64
-  - osx-64