mirror of
https://github.com/kasmtech/kasm-workspaces-dind.git
synced 2026-01-23 02:35:11 +00:00
Merge branch 'feature/KASM-5642-115-updates' into 'develop'
Resolve KASM-5642 "Feature/ 115 updates" Closes KASM-5642 See merge request kasm-technologies/internal/kasm_workspaces_dind!8
This commit is contained in:
commit
f47015afcc
3 changed files with 19 additions and 11 deletions
|
|
@ -6,6 +6,10 @@ stages:
|
||||||
- build
|
- build
|
||||||
- manifest
|
- manifest
|
||||||
|
|
||||||
|
variables:
|
||||||
|
DOCKER_HOST: tcp://docker:2375
|
||||||
|
DOCKER_TLS_CERTDIR: ""
|
||||||
|
|
||||||
before_script:
|
before_script:
|
||||||
- docker login --username $DOCKER_HUB_USERNAME --password $DOCKER_HUB_PASSWORD
|
- docker login --username $DOCKER_HUB_USERNAME --password $DOCKER_HUB_PASSWORD
|
||||||
- export SANITIZED_BRANCH="$(echo $CI_COMMIT_REF_NAME | sed -r 's#^release/##' | sed 's/\//_/g')"
|
- export SANITIZED_BRANCH="$(echo $CI_COMMIT_REF_NAME | sed -r 's#^release/##' | sed 's/\//_/g')"
|
||||||
|
|
@ -30,7 +34,7 @@ build:
|
||||||
- ${TAG}
|
- ${TAG}
|
||||||
parallel:
|
parallel:
|
||||||
matrix:
|
matrix:
|
||||||
- TAG: [ aws-autoscale, aws-autoscale-arm64 ]
|
- TAG: [ oci-fixed-amd, oci-fixed-arm ]
|
||||||
|
|
||||||
build_dev:
|
build_dev:
|
||||||
stage: build
|
stage: build
|
||||||
|
|
@ -47,7 +51,7 @@ build_dev:
|
||||||
- ${TAG}
|
- ${TAG}
|
||||||
parallel:
|
parallel:
|
||||||
matrix:
|
matrix:
|
||||||
- TAG: [ aws-autoscale, aws-autoscale-arm64 ]
|
- TAG: [ oci-fixed-amd, oci-fixed-arm ]
|
||||||
|
|
||||||
build_scheduled:
|
build_scheduled:
|
||||||
stage: build
|
stage: build
|
||||||
|
|
@ -64,7 +68,7 @@ build_scheduled:
|
||||||
- ${TAG}
|
- ${TAG}
|
||||||
parallel:
|
parallel:
|
||||||
matrix:
|
matrix:
|
||||||
- TAG: [ aws-autoscale, aws-autoscale-arm64 ]
|
- TAG: [ oci-fixed-amd, oci-fixed-arm ]
|
||||||
|
|
||||||
manifest:
|
manifest:
|
||||||
stage: manifest
|
stage: manifest
|
||||||
|
|
@ -81,7 +85,7 @@ manifest:
|
||||||
except:
|
except:
|
||||||
- schedules
|
- schedules
|
||||||
tags:
|
tags:
|
||||||
- aws-autoscale
|
- oci-fixed-amd
|
||||||
|
|
||||||
manifest_dev:
|
manifest_dev:
|
||||||
stage: manifest
|
stage: manifest
|
||||||
|
|
@ -96,7 +100,7 @@ manifest_dev:
|
||||||
- develop
|
- develop
|
||||||
- /^release\/.*$/
|
- /^release\/.*$/
|
||||||
tags:
|
tags:
|
||||||
- aws-autoscale
|
- oci-fixed-amd
|
||||||
|
|
||||||
manifest_scheduled:
|
manifest_scheduled:
|
||||||
stage: manifest
|
stage: manifest
|
||||||
|
|
@ -110,4 +114,4 @@ manifest_scheduled:
|
||||||
only:
|
only:
|
||||||
- schedules
|
- schedules
|
||||||
tags:
|
tags:
|
||||||
- aws-autoscale
|
- oci-fixed-amd
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,7 @@ RUN \
|
||||||
curl -s -L https://nvidia.github.io/libnvidia-container/ubuntu22.04/libnvidia-container.list | \
|
curl -s -L https://nvidia.github.io/libnvidia-container/ubuntu22.04/libnvidia-container.list | \
|
||||||
sed 's#deb https://#deb [signed-by=/usr/share/keyrings/nvidia-container-toolkit-keyring.gpg] https://#g' | \
|
sed 's#deb https://#deb [signed-by=/usr/share/keyrings/nvidia-container-toolkit-keyring.gpg] https://#g' | \
|
||||||
tee /etc/apt/sources.list.d/nvidia-container-toolkit.list && \
|
tee /etc/apt/sources.list.d/nvidia-container-toolkit.list && \
|
||||||
curl -fsSL https://deb.nodesource.com/setup_16.x | bash - && \
|
curl -fsSL https://deb.nodesource.com/setup_18.x | bash - && \
|
||||||
apt-get install -y --no-install-recommends \
|
apt-get install -y --no-install-recommends \
|
||||||
bash \
|
bash \
|
||||||
btrfs-progs \
|
btrfs-progs \
|
||||||
|
|
@ -92,12 +92,16 @@ RUN \
|
||||||
tar xf \
|
tar xf \
|
||||||
/tmp/kasm.tar.gz -C \
|
/tmp/kasm.tar.gz -C \
|
||||||
/ && \
|
/ && \
|
||||||
|
ALVERSION=$(cat /kasm_release/conf/database/seed_data/default_properties.yaml |awk '/alembic_version/ {print $2}') && \
|
||||||
curl -o \
|
curl -o \
|
||||||
/tmp/images.tar.gz -L \
|
/tmp/images.tar.gz -L \
|
||||||
"https://kasm-ci.s3.amazonaws.com/1.14.0-images-combined.tar.gz" && \
|
"https://kasm-ci.s3.amazonaws.com/1.15.0-images-combined.tar.gz" && \
|
||||||
tar xf \
|
tar xf \
|
||||||
/tmp/images.tar.gz -C \
|
/tmp/images.tar.gz -C \
|
||||||
/ && \
|
/ && \
|
||||||
|
sed -i \
|
||||||
|
'/alembic_version/s/.*/alembic_version: '${ALVERSION}'/' \
|
||||||
|
/kasm_release/conf/database/seed_data/default_images_a* && \
|
||||||
sed -i 's/-N -e -H/-N -B -e -H/g' /kasm_release/upgrade.sh && \
|
sed -i 's/-N -e -H/-N -B -e -H/g' /kasm_release/upgrade.sh && \
|
||||||
echo "exit 0" > /kasm_release/install_dependencies.sh && \
|
echo "exit 0" > /kasm_release/install_dependencies.sh && \
|
||||||
echo "**** copy assets ****" && \
|
echo "**** copy assets ****" && \
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,7 @@ It has a few core principles:
|
||||||
version: "2.1"
|
version: "2.1"
|
||||||
services:
|
services:
|
||||||
kasm:
|
kasm:
|
||||||
image: kasmweb/workspaces:1.14.0
|
image: kasmweb/workspaces:1.15.0
|
||||||
privileged: true
|
privileged: true
|
||||||
container_name: kasm
|
container_name: kasm
|
||||||
environment:
|
environment:
|
||||||
|
|
@ -51,7 +51,7 @@ docker run -d \
|
||||||
-v /path/to/profiles:/profiles `#optional` \
|
-v /path/to/profiles:/profiles `#optional` \
|
||||||
-v /dev/input:/dev/input `#optional` \
|
-v /dev/input:/dev/input `#optional` \
|
||||||
-v /run/udev/data:/run/udev/data `#optional` \
|
-v /run/udev/data:/run/udev/data `#optional` \
|
||||||
kasmweb/workspaces:1.14.0
|
kasmweb/workspaces:1.15.0
|
||||||
```
|
```
|
||||||
|
|
||||||
| Parameter | Function |
|
| Parameter | Function |
|
||||||
|
|
@ -71,7 +71,7 @@ docker run -d \
|
||||||
|
|
||||||
| Tag | Description |
|
| Tag | Description |
|
||||||
| :----: | --- |
|
| :----: | --- |
|
||||||
| 1.14.0 | Latest stable release |
|
| 1.15.0 | Latest stable release |
|
||||||
| develop | Development head |
|
| develop | Development head |
|
||||||
|
|
||||||
| Architecture | Tag |
|
| Architecture | Tag |
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue