From f23e41dfe33972b5ccfcfa7f192f7865f7479f9c Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Tue, 1 Mar 2022 14:10:13 +0100 Subject: feat(dash): Terraform AWS Beanstalk Signed-off-by: Peter Mikus Change-Id: Ib89677de3818b46aa622f56f28b7bbb54458dbe0 --- resources/tools/dash/app/Procfile | 1 + resources/tools/dash/app/app.ini | 2 -- resources/tools/dash/app/config.py | 16 ++++++---------- resources/tools/dash/app/wsgi.py | 1 + resources/tools/dash/docker-compose.yaml | 6 ------ 5 files changed, 8 insertions(+), 18 deletions(-) create mode 100644 resources/tools/dash/app/Procfile (limited to 'resources/tools/dash') diff --git a/resources/tools/dash/app/Procfile b/resources/tools/dash/app/Procfile new file mode 100644 index 0000000000..c79d502390 --- /dev/null +++ b/resources/tools/dash/app/Procfile @@ -0,0 +1 @@ +uwsgi: uwsgi app.ini diff --git a/resources/tools/dash/app/app.ini b/resources/tools/dash/app/app.ini index bbf2943193..0df9d8366e 100644 --- a/resources/tools/dash/app/app.ini +++ b/resources/tools/dash/app/app.ini @@ -12,6 +12,4 @@ master = true http-socket = :5000 socket = /tmp/app.sock chmod-socket = 666 -vacuum = true -die-on-term = true \ No newline at end of file diff --git a/resources/tools/dash/app/config.py b/resources/tools/dash/app/config.py index 55f92cc36b..76f66419a7 100644 --- a/resources/tools/dash/app/config.py +++ b/resources/tools/dash/app/config.py @@ -13,24 +13,20 @@ # See the License for the specific language governing permissions and # limitations under the License. -from os import environ - - class Config: """Flask configuration variables. """ # General Config - FLASK_APP = environ.get("FLASK_APP") - FLASK_ENV = environ.get("FLASK_ENV") - SECRET_KEY = environ.get("SECRET_KEY") + FLASK_APP = "wsgi.py" + FLASK_ENV = "production" # Assets - LESS_BIN = environ.get("LESS_BIN") - ASSETS_DEBUG = environ.get("ASSETS_DEBUG") - LESS_RUN_IN_DEBUG = environ.get("LESS_RUN_IN_DEBUG") + LESS_BIN = "/usr/local/bin/lessc" + ASSETS_DEBUG = "False" + LESS_RUN_IN_DEBUG = "False" # Static Assets STATIC_FOLDER = "static" TEMPLATES_FOLDER = "templates" - COMPRESSOR_DEBUG = environ.get("COMPRESSOR_DEBUG") + COMPRESSOR_DEBUG ="True" diff --git a/resources/tools/dash/app/wsgi.py b/resources/tools/dash/app/wsgi.py index 316901c707..ab18bbfbc7 100644 --- a/resources/tools/dash/app/wsgi.py +++ b/resources/tools/dash/app/wsgi.py @@ -17,4 +17,5 @@ from pal import app if __name__ == "__main__": # Main entry point. + app.debug = True app.run(host="0.0.0.0") diff --git a/resources/tools/dash/docker-compose.yaml b/resources/tools/dash/docker-compose.yaml index 4fe12bd11e..155678ae65 100644 --- a/resources/tools/dash/docker-compose.yaml +++ b/resources/tools/dash/docker-compose.yaml @@ -6,12 +6,6 @@ services: environment: AWS_ACCESS_KEY_ID: "" AWS_SECRET_ACCESS_KEY: "" - FLASK_APP: "wsgi.py" - FLASK_ENV: "production" - LESS_BIN: "/usr/local/bin/lessc" - ASSETS_DEBUG: "False" - LESS_RUN_IN_DEBUG: "False" - COMPRESSOR_DEBUG: "True" ports: - "5000:5000" volumes: -- cgit 1.2.3-korg