From 98bf3c9eb39a3136c948afba3f663685323f1174 Mon Sep 17 00:00:00 2001 From: ahmed531998 Date: Wed, 30 Aug 2023 12:08:23 +0200 Subject: [PATCH] version_number --- Dockerfile | 3 +++ Jenkinsfile | 2 +- main_simple.py | 9 +++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 994fdd0..03c5016 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,6 +4,9 @@ WORKDIR /backend_janet COPY requirements_simple.txt . +ARG version_info +ENV FLASK_APP_VERSION_INFO=${version_info} + RUN pip install -r requirements_simple.txt RUN rm -fr /root/.cache/* diff --git a/Jenkinsfile b/Jenkinsfile index c1b3062..d3a8281 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -18,7 +18,7 @@ pipeline { stage('Building image') { steps{ script { - dockerImage = docker.build imagename + dockerImage = docker.build(imagename, '--build-arg version_info=${GIT_COMMIT} .') } } } diff --git a/main_simple.py b/main_simple.py index ac2ea92..4b3660d 100644 --- a/main_simple.py +++ b/main_simple.py @@ -10,10 +10,11 @@ from DM import DM import threading app = Flask(__name__) url = os.getenv("FRONTEND_URL_WITH_PORT") +version = os.getenv("FLASK_APP_VERSION_INFO") #first 3 were url -cors = CORS(app, resources={r"/api/predict": {"origins": "*"}, - r"/api/feedback": {"origins": "*"}, - r"/api/dm": {"origins": "*"}, +cors = CORS(app, resources={r"/api/predict": {"origins": url}, + r"/api/feedback": {"origins": url}, + r"/api/dm": {"origins": url}, r"/health": {"origins": "*"} }) users = {} @@ -32,7 +33,7 @@ def user_interest_decay(token): @app.route("/health", methods=['GET']) def health(): if alive=="alive": - return "Success", 200 + return "Success \n" + "version number: " + version, 200 else: return alive, 500