feat(cdash): Environement fixes

Signed-off-by: pmikus <peter.mikus@protonmail.ch>
Change-Id: I6bdb30c7313b909fe29e10b20bd21957433bda87

diff --git a/csit.infra.dash/app/.ebextensions/env-flask.config b/csit.infra.dash/app/.ebextensions/env-flask.config
new file mode 100644 (file)
index 0000000..f7ae7c5
--- /dev/null
+++ b/csit.infra.dash/app/.ebextensions/env-flask.config
@@ -0,0 +1,4 @@
+option_settings:
+  aws:elasticbeanstalk:application:environment:
+    FLASK_DEBUG: 0
+    FLASK_ENV: production
\ No newline at end of file

diff --git a/csit.infra.dash/app/cdash/__init__.py b/csit.infra.dash/app/cdash/__init__.py
index 20023ec..b315950 100644 (file)
--- a/csit.infra.dash/app/cdash/__init__.py
+++ b/csit.infra.dash/app/cdash/__init__.py
@@ -31,9 +31,8 @@ def init_app():
         level=C.LOG_LEVEL
     )
 
-    logging.info("Application started.")
-
     app = Flask(__name__, instance_relative_config=False)
+    app.logger.info("Application started.")
     app.config.from_object("config.Config")
 
     with app.app_context():

diff --git a/csit.infra.dash/app/config.py b/csit.infra.dash/app/config.py
index 559864b..ae8e83c 100644 (file)
--- a/csit.infra.dash/app/config.py
+++ b/csit.infra.dash/app/config.py
@@ -13,18 +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 = "wsgi.py"
-    FLASK_ENV = "production"
+    FLASK_ENV = environ.get("FLASK_ENV", "production")
 
     # Assets
-    ASSETS_DEBUG = False
-    ASSETS_AUTO_BUILD = True
+    ASSETS_DEBUG = environ.get("ASSETS_DEBUG", False)
+    ASSETS_AUTO_BUILD = environ.get("ASSETS_AUTO_BUILD", True)
 
     # Static Assets
     STATIC_FOLDER = "static"
     TEMPLATES_FOLDER = "templates"
-    COMPRESSOR_DEBUG = "True"
+    COMPRESSOR_DEBUG = environ.get("COMPRESSOR_DEBUG", False)

diff --git a/csit.infra.dash/app/wsgi.py b/csit.infra.dash/app/wsgi.py
index 101b6e2..3eb1d23 100644 (file)
--- a/csit.infra.dash/app/wsgi.py
+++ b/csit.infra.dash/app/wsgi.py
@@ -17,5 +17,4 @@ from cdash import app
 
 if __name__ == "__main__":
     # Main entry point.
-    app.debug = True
     app.run(host="0.0.0.0")

diff --git a/csit.infra.dash/do_release.sh b/csit.infra.dash/do_release.sh
index ddf0eae..e4d7e3a 100755 (executable)
--- a/csit.infra.dash/do_release.sh
+++ b/csit.infra.dash/do_release.sh
@@ -1,13 +1,13 @@
 #!/usr/bin/env bash
 
-set -exuo pipefail
+set -xuo pipefail
 
 command -v zip || exit 1
 
 rm -f app.zip
 
 pushd app
-find . -type d -name "__pycache__" -exec rm -rf "{}" \; || true
-find . -type d -name ".webassets-cache" -exec rm -rf "{}" \; || true
+find . -type d -name "__pycache__" -exec rm -rf "{}" \;
+find . -type d -name ".webassets-cache" -exec rm -rf "{}" \;
 zip -r ../app.zip .
 popd

diff --git a/csit.infra.dash/do_run.sh b/csit.infra.dash/do_run.sh
index 843156b..c87e434 100755 (executable)
--- a/csit.infra.dash/do_run.sh
+++ b/csit.infra.dash/do_run.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -exuo pipefail
+set -xuo pipefail
 
 command -v docker || exit 1
 

diff --git a/csit.infra.dash/docker-compose.yaml b/csit.infra.dash/docker-compose.yaml
index 7a5288b..4ec4f21 100644 (file)
--- a/csit.infra.dash/docker-compose.yaml
+++ b/csit.infra.dash/docker-compose.yaml
@@ -6,6 +6,9 @@ services:
     depends_on:
       - "minio"
       - "mc"
+    environment:
+      FLASK_DEBUG: 1
+      FLASK_ENV: "development"
     mem_limit: "4g"
     ports:
       - "5000:5000"
@@ -15,13 +18,13 @@ services:
       - "${PWD}/../resources/libraries/python/jumpavg/:/app/cdash/jumpavg"
       - "${HOME}/.aws:/.aws"
   minio:
-    image: "quay.io/minio/minio:RELEASE.2022-11-08T05-27-07Z"
+    image: "quay.io/minio/minio:latest"
     command: server --console-address ":9001" /data
-    expose:
-      - "9000"
     environment:
       MINIO_ROOT_USER: "minioadmin"
       MINIO_ROOT_PASSWORD: "minioadmin"
+    expose:
+      - "9000"
     healthcheck:
       test: [ "CMD", "curl", "-f", "http://localhost:9000/minio/health/live" ]
       interval: "30s"
@@ -32,7 +35,7 @@ services:
     volumes:
       - "data:/data"
   mc:
-    image: "quay.io/minio/mc:RELEASE.2022-11-07T23-47-39Z"
+    image: "quay.io/minio/mc:latest"
     depends_on:
       - "minio"
     entrypoint: >
@@ -42,6 +45,8 @@ services:
       /usr/bin/mc mb --quiet --ignore-existing local/fdio-docs-s3-cloudfront-index/;
       /usr/bin/mc anonymous set public local/fdio-docs-s3-cloudfront-index;
       "
+    # mc alias set aws https://s3.amazon.com/endpoint ACCESS_KEY SECRET KEY
+    # mc admin info aws
 volumes:
   data:
 #    external: true