Merge branch 'dev' into 363_DOC_PRTemplate

hackforla · Mar 9, 2020 · eacc412 · eacc412
2 parents 9c71897 + a57d590
commit eacc412
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/server/Dockerfile b/server/Dockerfile
@@ -6,6 +6,7 @@ RUN apt-get update && apt-get install -yq \
 
 ENV DB_CONNECTION_STRING=REDACTED
 ENV PORT=5000
+ENV TOKEN=None
 COPY requirements.txt .
 
 RUN pip install --no-cache-dir -r requirements.txt

diff --git a/server/src/app.py b/server/src/app.py
@@ -28,6 +28,9 @@ def environment_overrides():
     if os.environ.get('PORT', None):
         app.config['Settings']['Server']['PORT'] =\
             os.environ.get('PORT')
+    if os.environ.get('TOKEN', None):
+        app.config['Settings']['Socrata']['TOKEN'] =\
+            os.environ.get('TOKEN')
 
 
 def configure_app():