From 0e7c148a8ff1aec22a986f41d5d9ff671e2e6587 Mon Sep 17 00:00:00 2001 From: thespad Date: Sun, 2 Nov 2025 21:24:48 +0000 Subject: [PATCH 1/2] Update build version output and maintainer --- Dockerfile | 5 ++--- Dockerfile.aarch64 | 5 ++--- Jenkinsfile | 5 ++--- jenkins-vars.yml | 5 ++--- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index 77b4acb..3cff6cb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,15 +7,14 @@ ARG BUILD_DATE ARG KASM_VERSION ARG VERSION LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" -LABEL maintainer="thelamer" +LABEL maintainer="thespad" # Env ENV DOCKER_TLS_CERTDIR="" ENV TINI_SUBREAPER=true #Add needed nvidia environment variables for https://github.com/NVIDIA/nvidia-docker -ENV NVIDIA_DRIVER_CAPABILITIES="compute,graphics,video,utility" \ - VERSION="develop" +ENV NVIDIA_DRIVER_CAPABILITIES="compute,graphics,video,utility" # Container setup RUN \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 23207d6..dd8864c 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -7,15 +7,14 @@ ARG BUILD_DATE ARG KASM_VERSION ARG VERSION LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" -LABEL maintainer="thelamer" +LABEL maintainer="thespad" # Env ENV DOCKER_TLS_CERTDIR="" ENV TINI_SUBREAPER=true #Add needed nvidia environment variables for https://github.com/NVIDIA/nvidia-docker -ENV NVIDIA_DRIVER_CAPABILITIES="compute,graphics,video,utility" \ - VERSION="develop" +ENV NVIDIA_DRIVER_CAPABILITIES="compute,graphics,video,utility" # Container setup RUN \ diff --git a/Jenkinsfile b/Jenkinsfile index e3985cb..8dc508b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -19,7 +19,6 @@ pipeline { DOCKERHUB_TOKEN=credentials('docker-hub-ci-pat') QUAYIO_API_TOKEN=credentials('quayio-repo-api-token') GIT_SIGNING_KEY=credentials('484fbca6-9a4f-455e-b9e3-97ac98785f5f') - EXT_GIT_BRANCH = 'develop' EXT_USER = 'kasmtech' EXT_REPO = 'kasm-install-wizard' BUILD_VERSION_ARG = 'KASM_VERSION' @@ -32,11 +31,11 @@ pipeline { DIST_IMAGE = 'ubuntu' MULTIARCH='true' CI='true' - CI_WEB='false' + CI_WEB='true' CI_PORT='3000' CI_SSL='true' CI_DELAY='120' - CI_DOCKERENV='TEST=true' + CI_DOCKERENV='' CI_AUTH='user:password' CI_WEBPATH='' } diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 429bb53..ba22158 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -7,7 +7,6 @@ release_type: stable release_tag: latest ls_branch: master repo_vars: - - EXT_GIT_BRANCH = 'develop' - EXT_USER = 'kasmtech' - EXT_REPO = 'kasm-install-wizard' - BUILD_VERSION_ARG = 'KASM_VERSION' @@ -20,10 +19,10 @@ repo_vars: - DIST_IMAGE = 'ubuntu' - MULTIARCH='true' - CI='true' - - CI_WEB='false' + - CI_WEB='true' - CI_PORT='3000' - CI_SSL='true' - CI_DELAY='120' - - CI_DOCKERENV='TEST=true' + - CI_DOCKERENV='' - CI_AUTH='user:password' - CI_WEBPATH='' From 289e17847c5485fa9dda448e22ad64a8eb972afa Mon Sep 17 00:00:00 2001 From: thespad Date: Sun, 2 Nov 2025 21:36:23 +0000 Subject: [PATCH 2/2] Don't run web CI as wizard cannot start --- Jenkinsfile | 4 ++-- jenkins-vars.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8dc508b..0642db7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -31,12 +31,12 @@ pipeline { DIST_IMAGE = 'ubuntu' MULTIARCH='true' CI='true' - CI_WEB='true' + CI_WEB='false' CI_PORT='3000' CI_SSL='true' CI_DELAY='120' CI_DOCKERENV='' - CI_AUTH='user:password' + CI_AUTH='' CI_WEBPATH='' } stages { diff --git a/jenkins-vars.yml b/jenkins-vars.yml index ba22158..49c7488 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -19,10 +19,10 @@ repo_vars: - DIST_IMAGE = 'ubuntu' - MULTIARCH='true' - CI='true' - - CI_WEB='true' + - CI_WEB='false' - CI_PORT='3000' - CI_SSL='true' - CI_DELAY='120' - CI_DOCKERENV='' - - CI_AUTH='user:password' + - CI_AUTH='' - CI_WEBPATH=''