From 43e7846fd03587c142d723cdaf138e894e1a0cb1 Mon Sep 17 00:00:00 2001 From: iFargle Date: Sat, 11 Feb 2023 08:34:14 +0900 Subject: [PATCH 1/4] Sanitize BASE_PATH in server.py --- server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server.py b/server.py index 4f427f5..046e9cc 100644 --- a/server.py +++ b/server.py @@ -21,7 +21,7 @@ app.logger.setLevel(logging.DEBUG) # Colors: https://materializecss.com/color.html COLOR_NAV = "blue-grey darken-1" COLOR_BTN = "blue-grey darken-3" -BASE_PATH = os.environ["BASE_PATH"] +BASE_PATH = env(os.environ["BASE_PATH"]) APP_VERSION = os.environ["APP_VERSION"] GIT_COMMIT = os.environ["GIT_COMMIT"] GIT_BRANCH = os.environ["GIT_BRANCH"] From 6c1767476f7ebda420d7412b1b49fa6e9dff9153 Mon Sep 17 00:00:00 2001 From: iFargle Date: Sat, 11 Feb 2023 08:41:27 +0900 Subject: [PATCH 2/4] Test --- server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server.py b/server.py index 046e9cc..e9b956f 100644 --- a/server.py +++ b/server.py @@ -21,7 +21,7 @@ app.logger.setLevel(logging.DEBUG) # Colors: https://materializecss.com/color.html COLOR_NAV = "blue-grey darken-1" COLOR_BTN = "blue-grey darken-3" -BASE_PATH = env(os.environ["BASE_PATH"]) +BASE_PATH = eval(os.environ["BASE_PATH"]) APP_VERSION = os.environ["APP_VERSION"] GIT_COMMIT = os.environ["GIT_COMMIT"] GIT_BRANCH = os.environ["GIT_BRANCH"] From 55e58a356c289bd271956506641b97fcb0ca506a Mon Sep 17 00:00:00 2001 From: iFargle Date: Sat, 11 Feb 2023 08:44:19 +0900 Subject: [PATCH 3/4] Test --- server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server.py b/server.py index e9b956f..7ee2e5c 100644 --- a/server.py +++ b/server.py @@ -21,7 +21,7 @@ app.logger.setLevel(logging.DEBUG) # Colors: https://materializecss.com/color.html COLOR_NAV = "blue-grey darken-1" COLOR_BTN = "blue-grey darken-3" -BASE_PATH = eval(os.environ["BASE_PATH"]) +BASE_PATH = os.environ["BASE_PATH"].replace('"', '') APP_VERSION = os.environ["APP_VERSION"] GIT_COMMIT = os.environ["GIT_COMMIT"] GIT_BRANCH = os.environ["GIT_BRANCH"] From 8f2471a69b84bddd8f7e4daab2beccb8dcd854ad Mon Sep 17 00:00:00 2001 From: iFargle Date: Sat, 11 Feb 2023 08:48:53 +0900 Subject: [PATCH 4/4] Update version --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 28c71e4..d62435a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,7 +5,7 @@ pipeline { label 'linux-x64' } environment { - APP_VERSION = 'v0.2.2' + APP_VERSION = 'v0.2.3' } options { buildDiscarder(logRotator(numToKeepStr: '100', artifactNumToKeepStr: '20'))