extern/workspaces-core-images
1
0
Fork 0
mirror of https://github.com/kasmtech/workspaces-core-images.git synced 2025-06-26 15:01:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/KASM-1992_game_mode' into 'develop'

Browse Source 
Resolve KASM-1992 "Feature/ game mode"

Closes KASM-1992

See merge request kasm-technologies/internal/workspaces-core-images!56
This commit is contained in:
Matthew McClaskey 2022-05-03 19:15:37 +00:00
commit 365237673f
2 changed files with 1 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
.gitlab-ci.yml
View File

@ -57,20 +57,6 @@ build_ubuntu_focal:
tags: tags:
- aws-autoscale - aws-autoscale
build_cuda_bionic:
stage: build
script:
- docker build -t ${ORG_NAME}/core-cuda-bionic-private:$SANITIZED_BRANCH -t ${ORG_NAME}/core-cuda-bionic-private:$SANITIZED_ROLLING_BRANCH -t ${ORG_NAME}/core-cuda-bionic:$SANITIZED_BRANCH -t ${ORG_NAME}/core-cuda-bionic:$SANITIZED_ROLLING_BRANCH --build-arg BASE_IMAGE="nvidia/cuda:11.3.0-devel-ubuntu18.04" --build-arg BG_IMG=bg_bionic.png -f dockerfile-kasm-core .
- docker push ${ORG_NAME}/core-cuda-bionic-private:$SANITIZED_BRANCH
- docker push ${ORG_NAME}/core-cuda-bionic-private:$SANITIZED_ROLLING_BRANCH
- docker push ${ORG_NAME}/core-cuda-bionic:$SANITIZED_BRANCH
- docker push ${ORG_NAME}/core-cuda-bionic:$SANITIZED_ROLLING_BRANCH
only:
- develop
- /^release\/.*$/
except:
- schedules
build_cuda_focal: build_cuda_focal:
stage: build stage: build
script: script:
@ -269,24 +255,6 @@ build_ubuntu_focal_dev:
matrix: matrix:
- TAG: [ aws-autoscale, aws-autoscale-arm64 ] - TAG: [ aws-autoscale, aws-autoscale-arm64 ]
build_cuda_bionic_dev:
stage: build
script:
- >
docker build
-t ${ORG_NAME}/core-cuda-bionic-private:$SANITIZED_BRANCH
--build-arg START_PULSEAUDIO=1
--build-arg START_XFCE4=1
--build-arg BASE_IMAGE="nvidia/cuda:11.3.0-devel-ubuntu18.04"
--build-arg BG_IMG=bg_bionic.png
-f dockerfile-kasm-core .
- docker push ${ORG_NAME}/core-cuda-bionic-private:$SANITIZED_BRANCH
except:
- develop
- /^release\/.*$/
tags:
- aws-autoscale
build_cuda_focal_dev: build_cuda_focal_dev:
stage: build stage: build
script: script:
@ -602,15 +570,6 @@ build_ubuntu_focal_scheduled:
tags: tags:
- aws-autoscale - aws-autoscale
build_cuda_bionic_schedules:
stage: build
script:
- docker build -t ${ORG_NAME}/core-cuda-bionic-private:$SANITIZED_ROLLING_BRANCH -t ${ORG_NAME}/core-cuda-bionic:$SANITIZED_ROLLING_BRANCH --build-arg BASE_IMAGE="nvidia/cuda:11.3.0-devel-ubuntu18.04" --build-arg BG_IMG=bg_bionic.png -f dockerfile-kasm-core .
- docker push ${ORG_NAME}/core-cuda-bionic-private:$SANITIZED_ROLLING_BRANCH
- docker push ${ORG_NAME}/core-cuda-bionic:$SANITIZED_ROLLING_BRANCH
only:
- schedules
build_cuda_focal_schedules: build_cuda_focal_schedules:
stage: build stage: build
script: script:

2
src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh
View File

@ -13,7 +13,7 @@ cd /tmp
BUILD_ARCH=$(uname -p) BUILD_ARCH=$(uname -p)
UBUNTU_CODENAME="" UBUNTU_CODENAME=""
COMMIT_ID="d829572a9c86535df9434adbb4ba696a43417d35" COMMIT_ID="2959156a25997290ec8a31d40990a421ecb0eb9d"
BRANCH="master" BRANCH="master"
COMMIT_ID_SHORT=$(echo "${COMMIT_ID}" | cut -c1-6) COMMIT_ID_SHORT=$(echo "${COMMIT_ID}" | cut -c1-6)