Code cleanup

Dockerfile

@@ -50,11 +50,13 @@ ARG GIT_COMMIT_ARG=""
 ARG GIT_BRANCH_ARG=""
 ARG APP_VERSION_ARG=""
 ARG BUILD_DATE_ARG=""
+ARG HS_VERSION_ARG=""
 
 ENV GIT_COMMIT=$GIT_COMMIT_ARG
 ENV GIT_BRANCH=$GIT_BRANCH_ARG
 ENV APP_VERSION=$APP_VERSION_ARG
 ENV BUILD_DATE=$BUILD_DATE_ARG
+ENV HS_VERSION=$HS_VERSION_ARG
 
 VOLUME /etc/headscale
 VOLUME /data

Jenkinsfile

@@ -6,7 +6,8 @@ pipeline {
     }
     environment {
         APP_VERSION = 'v0.4.0'
-        BUILD_DATE = ''
+        HS_VERSION  = "v0.20.0" // Version of Headscale this is compatible with
+        BUILD_DATE  = ''
     }
     options {
         buildDiscarder(logRotator(numToKeepStr: '100', artifactNumToKeepStr: '20'))
@@ -29,6 +30,7 @@ pipeline {
                         + " --build-arg GIT_BRANCH_ARG=${env.BRANCH_NAME} "
                         + " --build-arg APP_VERSION_ARG=${APP_VERSION} "
                         + " --build-arg BUILD_DATE_ARG=${BUILD_DATE} "
+                        + " --build-arg HS_VERSION_ARG=${HS_VERSION} "
                         + " ."
                     )
                     ghcrImage = docker.build("ifargle/headscale-webui:${env.BRANCH_NAME}-${env.BUILD_ID}",
@@ -37,6 +39,7 @@ pipeline {
                         + " --build-arg GIT_BRANCH_ARG=${env.BRANCH_NAME} "
                         + " --build-arg APP_VERSION_ARG=${APP_VERSION} "
                         + " --build-arg BUILD_DATE_ARG=${BUILD_DATE} "
+                        + " --build-arg HS_VERSION_ARG=${HS_VERSION} "
                         + " ."
                     )
                 }

server.py

@@ -8,11 +8,6 @@ from flask_executor import Executor
 COLOR_NAV       = "blue-grey darken-1"
 COLOR_BTN       = "blue-grey darken-3"
 BASE_PATH       = os.environ["BASE_PATH"].replace('"', '')
-BUILD_DATE      = os.environ["BUILD_DATE"]
-APP_VERSION     = os.environ["APP_VERSION"]
-GIT_COMMIT      = os.environ["GIT_COMMIT"]
-GIT_BRANCH      = os.environ["GIT_BRANCH"]
-HS_VERSION      = "v0.20.0"
 DEBUG_STATE     = False
 AUTH_TYPE       = os.environ["AUTH_TYPE"].replace('"', '')
 STATIC_URL_PATH = BASE_PATH+"/static" if BASE_PATH != "/" else "/static"
@@ -112,13 +107,19 @@ def settings_page():
         url          = headscale.get_url(),
         COLOR_NAV    = COLOR_NAV,
         COLOR_BTN    = COLOR_BTN,
-        HS_VERSION   = HS_VERSION,
-        APP_VERSION  = APP_VERSION,
-        GIT_COMMIT   = GIT_COMMIT,
-        GIT_BRANCH   = GIT_BRANCH,
-        BUILD_DATE   = BUILD_DATE
+        BUILD_DATE   = os.environ["BUILD_DATE"],
+        APP_VERSION  = os.environ["APP_VERSION"],
+        GIT_COMMIT   = os.environ["GIT_COMMIT"],
+        GIT_BRANCH   = os.environ["GIT_BRANCH"],
+        HS_VERSION   = os.environ["HS_VERSION"]
     )
 
+
+
+
+
+
+
 @app.route(BASE_PATH+'/error')
 def error_page():
     if helper.access_checks() == "Pass":