aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpmikus <peter.mikus@protonmail.ch>2022-11-11 11:57:26 +0100
committerPeter Mikus <peter.mikus@protonmail.ch>2022-11-14 12:06:22 +0000
commitabbc3a9aac22427a50c45adddf4307bab6d8a3ef (patch)
tree7e5f31cdd7b50fdb075d892811152e55375f05d9
parent8cddfb3bfd02675b78f7c71cb88900ca1d6460b1 (diff)
feat(cdash): Environement fixes
Signed-off-by: pmikus <peter.mikus@protonmail.ch> Change-Id: I6bdb30c7313b909fe29e10b20bd21957433bda87
-rw-r--r--csit.infra.dash/app/.ebextensions/env-flask.config4
-rw-r--r--csit.infra.dash/app/cdash/__init__.py3
-rw-r--r--csit.infra.dash/app/config.py10
-rw-r--r--csit.infra.dash/app/wsgi.py1
-rwxr-xr-xcsit.infra.dash/do_release.sh6
-rwxr-xr-xcsit.infra.dash/do_run.sh2
-rw-r--r--csit.infra.dash/docker-compose.yaml13
7 files changed, 24 insertions, 15 deletions
diff --git a/csit.infra.dash/app/.ebextensions/env-flask.config b/csit.infra.dash/app/.ebextensions/env-flask.config
new file mode 100644
index 0000000000..f7ae7c500c
--- /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 20023ec157..b315950d5b 100644
--- 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 559864bebb..ae8e83c9e4 100644
--- 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 101b6e25ac..3eb1d23181 100644
--- 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 ddf0eae6e6..e4d7e3a3a6 100755
--- 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 843156b1c8..c87e434416 100755
--- 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 7a5288b3f7..4ec4f21eb6 100644
--- 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