diff --git a/Jenkinsfile b/Jenkinsfile index b583eb0..2415524 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,7 +5,7 @@ pipeline { label 'linux-x64' } environment { - APP_VERSION = '0.2.1' + APP_VERSION = 'v0.2.1' } options { buildDiscarder(logRotator(numToKeepStr: '100', artifactNumToKeepStr: '20')) @@ -22,11 +22,15 @@ pipeline { steps { script { forgejoImage = docker.build("albert/headscale-webui:${env.BRANCH_NAME}-${env.BUILD_ID}", - "--label \"GIT_COMMIT=${env.GIT_COMMIT}\" --build-arg \"GIT_COMMIT=${env.GIT_COMMIT}\" " + "--label \"GIT_COMMIT=${env.GIT_COMMIT}\" " + + " --build-arg \"GIT_COMMIT=${env.GIT_COMMIT}\" " + + " --build-arg \"GIT_BRANCH=${env.BRANCH_NAME}\" " + " ." ) ghcrImage = docker.build("ifargle/headscale-webui:${env.BRANCH_NAME}-${env.BUILD_ID}", - "--label \"GIT_COMMIT=${env.GIT_COMMIT}\" --build-arg \"GIT_COMMIT=${env.GIT_COMMIT}\" " + "--label \"GIT_COMMIT=${env.GIT_COMMIT}\" " + + " --build-arg \"GIT_COMMIT=${env.GIT_COMMIT}\" " + + " --build-arg \"GIT_BRANCH=${env.BRANCH_NAME}\" " + " ." ) } diff --git a/server.py b/server.py index a8bd7a1..b2fb2a0 100644 --- a/server.py +++ b/server.py @@ -22,9 +22,9 @@ app.logger.setLevel(logging.DEBUG) COLOR_NAV = "blue-grey darken-1" COLOR_BTN = "blue-grey darken-3" BASE_PATH = os.environ["BASE_PATH"] -APP_VERSION = "0.2.1" +APP_VERSION = "v0.2.1" GIT_COMMIT = os.environ["GIT_COMMIT"] -HS_VERSION = "0.20.0" +HS_VERSION = "v0.20.0" DEBUG_STATE = False @app.route('/') diff --git a/templates/settings.html b/templates/settings.html index d21d7d9..b591137 100644 --- a/templates/settings.html +++ b/templates/settings.html @@ -35,6 +35,7 @@
Developed with Flask, Python, MaterializeCSS, and jQuery.
Version: {{ APP_VERSION }}
Commit: {{ GIT_COMMIT }}
+Branch: {{ GIT_BRANCH }}
Tested on Headscale {{ HS_VERSION }}
Repository: Github.