mirror of
https://github.com/linuxserver/docker-kasm.git
synced 2026-01-23 02:24:38 +00:00
Merge pull request #99 from linuxserver/maintainer-version
This commit is contained in:
commit
95ec2cbdf1
4 changed files with 8 additions and 12 deletions
|
|
@ -7,15 +7,14 @@ ARG BUILD_DATE
|
||||||
ARG KASM_VERSION
|
ARG KASM_VERSION
|
||||||
ARG VERSION
|
ARG VERSION
|
||||||
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
|
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
|
||||||
LABEL maintainer="thelamer"
|
LABEL maintainer="thespad"
|
||||||
|
|
||||||
# Env
|
# Env
|
||||||
ENV DOCKER_TLS_CERTDIR=""
|
ENV DOCKER_TLS_CERTDIR=""
|
||||||
ENV TINI_SUBREAPER=true
|
ENV TINI_SUBREAPER=true
|
||||||
|
|
||||||
#Add needed nvidia environment variables for https://github.com/NVIDIA/nvidia-docker
|
#Add needed nvidia environment variables for https://github.com/NVIDIA/nvidia-docker
|
||||||
ENV NVIDIA_DRIVER_CAPABILITIES="compute,graphics,video,utility" \
|
ENV NVIDIA_DRIVER_CAPABILITIES="compute,graphics,video,utility"
|
||||||
VERSION="develop"
|
|
||||||
|
|
||||||
# Container setup
|
# Container setup
|
||||||
RUN \
|
RUN \
|
||||||
|
|
|
||||||
|
|
@ -7,15 +7,14 @@ ARG BUILD_DATE
|
||||||
ARG KASM_VERSION
|
ARG KASM_VERSION
|
||||||
ARG VERSION
|
ARG VERSION
|
||||||
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
|
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
|
||||||
LABEL maintainer="thelamer"
|
LABEL maintainer="thespad"
|
||||||
|
|
||||||
# Env
|
# Env
|
||||||
ENV DOCKER_TLS_CERTDIR=""
|
ENV DOCKER_TLS_CERTDIR=""
|
||||||
ENV TINI_SUBREAPER=true
|
ENV TINI_SUBREAPER=true
|
||||||
|
|
||||||
#Add needed nvidia environment variables for https://github.com/NVIDIA/nvidia-docker
|
#Add needed nvidia environment variables for https://github.com/NVIDIA/nvidia-docker
|
||||||
ENV NVIDIA_DRIVER_CAPABILITIES="compute,graphics,video,utility" \
|
ENV NVIDIA_DRIVER_CAPABILITIES="compute,graphics,video,utility"
|
||||||
VERSION="develop"
|
|
||||||
|
|
||||||
# Container setup
|
# Container setup
|
||||||
RUN \
|
RUN \
|
||||||
|
|
|
||||||
5
Jenkinsfile
vendored
5
Jenkinsfile
vendored
|
|
@ -19,7 +19,6 @@ pipeline {
|
||||||
DOCKERHUB_TOKEN=credentials('docker-hub-ci-pat')
|
DOCKERHUB_TOKEN=credentials('docker-hub-ci-pat')
|
||||||
QUAYIO_API_TOKEN=credentials('quayio-repo-api-token')
|
QUAYIO_API_TOKEN=credentials('quayio-repo-api-token')
|
||||||
GIT_SIGNING_KEY=credentials('484fbca6-9a4f-455e-b9e3-97ac98785f5f')
|
GIT_SIGNING_KEY=credentials('484fbca6-9a4f-455e-b9e3-97ac98785f5f')
|
||||||
EXT_GIT_BRANCH = 'develop'
|
|
||||||
EXT_USER = 'kasmtech'
|
EXT_USER = 'kasmtech'
|
||||||
EXT_REPO = 'kasm-install-wizard'
|
EXT_REPO = 'kasm-install-wizard'
|
||||||
BUILD_VERSION_ARG = 'KASM_VERSION'
|
BUILD_VERSION_ARG = 'KASM_VERSION'
|
||||||
|
|
@ -36,8 +35,8 @@ pipeline {
|
||||||
CI_PORT='3000'
|
CI_PORT='3000'
|
||||||
CI_SSL='true'
|
CI_SSL='true'
|
||||||
CI_DELAY='120'
|
CI_DELAY='120'
|
||||||
CI_DOCKERENV='TEST=true'
|
CI_DOCKERENV=''
|
||||||
CI_AUTH='user:password'
|
CI_AUTH=''
|
||||||
CI_WEBPATH=''
|
CI_WEBPATH=''
|
||||||
}
|
}
|
||||||
stages {
|
stages {
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,6 @@ release_type: stable
|
||||||
release_tag: latest
|
release_tag: latest
|
||||||
ls_branch: master
|
ls_branch: master
|
||||||
repo_vars:
|
repo_vars:
|
||||||
- EXT_GIT_BRANCH = 'develop'
|
|
||||||
- EXT_USER = 'kasmtech'
|
- EXT_USER = 'kasmtech'
|
||||||
- EXT_REPO = 'kasm-install-wizard'
|
- EXT_REPO = 'kasm-install-wizard'
|
||||||
- BUILD_VERSION_ARG = 'KASM_VERSION'
|
- BUILD_VERSION_ARG = 'KASM_VERSION'
|
||||||
|
|
@ -24,6 +23,6 @@ repo_vars:
|
||||||
- CI_PORT='3000'
|
- CI_PORT='3000'
|
||||||
- CI_SSL='true'
|
- CI_SSL='true'
|
||||||
- CI_DELAY='120'
|
- CI_DELAY='120'
|
||||||
- CI_DOCKERENV='TEST=true'
|
- CI_DOCKERENV=''
|
||||||
- CI_AUTH='user:password'
|
- CI_AUTH=''
|
||||||
- CI_WEBPATH=''
|
- CI_WEBPATH=''
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue