moved CMDs to startServer to allow logging and more control

Author: Dan Kelley

src/server/Dockerfile

@@ -38,18 +38,10 @@ RUN chmod -R 777 /app/static
 COPY . /paws-data-pipeline/server
 
 RUN chmod 777 /paws-data-pipeline/server
+
+RUN chmod +x  bin/startServer.sh
 # RUN ufw allow 5000
 WORKDIR /app
 
-# --uid uwsgi
-CMD uwsgi --http-socket :5000 --plugin python38 --module wsgi:app --chdir /app --pythonpath .
-# we may want to switch this to a script which logs output, etc?
-
-RUN set FLASK_APP=server/app.py
-RUN export FLASK_APP
-
-# This abomination ensures that the PG server has finished its restart cycle
-CMD echo "SLEEPING 10"; sleep 10; echo "WAKING"; alembic upgrade head ; python -m flask run --host=0.0.0.0 --no-reload
-
-# --no-reload prevents Flask restart, which usually happens in middle of create_base_users()
-#TODO: SECURITY - ensure we are not running in debug mode in production
+CMD bin/startServer.sh
+#>> start.log 2>&1 

src/server/app.py

@@ -13,7 +13,6 @@
 jwt = JWTManager(app)
 
 
-# def create_app():
 app.secret_key = APP_SECRET_KEY
 app.config["MAX_CONTENT_LENGTH"] = 500 * 1024 * 1024  # 500 Megs
 app.config["SEND_FILE_MAX_AGE_DEFAULT"] = 0

src/server/bin/startServer.sh

@@ -0,0 +1,13 @@
+
+# we may want to switch this to a script which logs output, etc?
+echo "------------STARTING `date` ------------------"
+set FLASK_APP=server/app.py
+export FLASK_APP
+
+# This abomination ensures that the PG server has finished its restart cycle
+echo "SLEEPING.. WAITING FOR DB"; sleep 5; echo "WAKING"; alembic upgrade head; echo "DB SETUP";
+#; python -m flask run --host=0.0.0.0 --no-reload
+
+# --no-reload prevents Flask restart, which usually happens in middle of create_base_users()
+#TODO: SECURITY - ensure we are not running in debug mode in production
+uwsgi --http-socket :5000 --plugin python38 --module wsgi:app --chdir /app --pythonpath .

src/server/wsgi.py

@@ -1,6 +1,4 @@
-from app import create_app
-
-app = create_app()
+from app import app
 
 if __name__ == "__main__":
     app.run()