Mirrors/docker-kasm
1
0
Fork 0
mirror of https://github.com/linuxserver/docker-kasm.git synced 2026-01-23 02:24:38 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #97 from linuxserver/1.18.0

Browse source
This commit is contained in:
Adam 2025-10-25 10:19:10 +01:00 • committed by GitHub
commit cfdb797fdf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Dockerfile
View file

@ -83,7 +83,7 @@ RUN \
ALVERSION=$(cat /kasm_release/conf/database/seed_data/default_properties.yaml |awk '/alembic_version/ {print $2}') && \ 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.17.0-images-combined.tar.gz" && \ "https://kasm-ci.s3.amazonaws.com/${KASM_VERSION}-images-combined.tar.gz" && \
tar xf \ tar xf \
/tmp/images.tar.gz -C \ /tmp/images.tar.gz -C \
/ && \ / && \
@ -104,6 +104,7 @@ RUN \
/wizard/ && \ /wizard/ && \
useradd -u 70 kasm_db && \ useradd -u 70 kasm_db && \
useradd kasm && \ useradd kasm && \
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
echo "**** cleanup ****" && \ echo "**** cleanup ****" && \
apt-get remove -y g++ gcc make && \ apt-get remove -y g++ gcc make && \
apt-get -y autoremove && \ apt-get -y autoremove && \

3
Dockerfile.aarch64
View file

@ -83,7 +83,7 @@ RUN \
ALVERSION=$(cat /kasm_release/conf/database/seed_data/default_properties.yaml |awk '/alembic_version/ {print $2}') && \ 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.17.0-images-combined.tar.gz" && \ "https://kasm-ci.s3.amazonaws.com/${KASM_VERSION}-images-combined.tar.gz" && \
tar xf \ tar xf \
/tmp/images.tar.gz -C \ /tmp/images.tar.gz -C \
/ && \ / && \
@ -104,6 +104,7 @@ RUN \
/wizard/ && \ /wizard/ && \
useradd -u 70 kasm_db && \ useradd -u 70 kasm_db && \
useradd kasm && \ useradd kasm && \
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
echo "**** cleanup ****" && \ echo "**** cleanup ****" && \
apt-get remove -y g++ gcc make && \ apt-get remove -y g++ gcc make && \
apt-get -y autoremove && \ apt-get -y autoremove && \

1
README.md
View file

@ -313,6 +313,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
## Versions ## Versions
* **22.10.25:** - Update for 1.18.0 release.
* **08.06.25:** - Deprecate develop branch. * **08.06.25:** - Deprecate develop branch.
* **03.06.25:** - Rebase to Ubuntu Noble. Update for 1.17.0 release. * **03.06.25:** - Rebase to Ubuntu Noble. Update for 1.17.0 release.
* **09.11.24:** - Update base image for 1.16.1 release. * **09.11.24:** - Update base image for 1.16.1 release.

1
readme-vars.yml
View file

@ -126,6 +126,7 @@ init_diagram: |
"kasm:latest" <- Base Images "kasm:latest" <- Base Images
# changelog # changelog
changelogs: changelogs:
- {date: "22.10.25:", desc: "Update for 1.18.0 release."}
- {date: "08.06.25:", desc: "Deprecate develop branch."} - {date: "08.06.25:", desc: "Deprecate develop branch."}
- {date: "03.06.25:", desc: "Rebase to Ubuntu Noble. Update for 1.17.0 release."} - {date: "03.06.25:", desc: "Rebase to Ubuntu Noble. Update for 1.17.0 release."}
- {date: "09.11.24:", desc: "Update base image for 1.16.1 release."} - {date: "09.11.24:", desc: "Update base image for 1.16.1 release."}

5
root/etc/s6-overlay/s6-rc.d/init-config-kasm/run
View file

@ -5,9 +5,12 @@ if [[ ! -d "/opt/docker" ]]; then
mkdir -p /opt/docker mkdir -p /opt/docker
fi fi
# Workaround for running in a rootless docker environment
sed -i '/set -e/d' /etc/init.d/docker
# Login to Dockerhub # Login to Dockerhub
if [[ -n "${DOCKER_HUB_USERNAME}" ]]; then if [[ -n "${DOCKER_HUB_USERNAME}" ]]; then
docker login --username $DOCKER_HUB_USERNAME --password $DOCKER_HUB_PASSWORD docker login --username "${DOCKER_HUB_USERNAME}" --password "${DOCKER_HUB_PASSWORD}"
fi fi
# Generate self cert for wizard # Generate self cert for wizard

6
root/etc/s6-overlay/s6-rc.d/svc-kasm-wizard/run
View file

@ -2,16 +2,16 @@
# Wait for docker to be up # Wait for docker to be up
while true; do while true; do
if [ -S "/var/run/docker.sock" ]; then if [[ -S "/var/run/docker.sock" ]]; then
break break
fi fi
sleep 1 sleep 1
done done
# Don't do anything if wizard is disabled # Don't do anything if wizard is disabled
if [ -f "/opt/NO_WIZARD" ]; then if [[ -f "/opt/NO_WIZARD" ]]; then
sleep infinity sleep infinity
fi fi
cd /wizard cd /wizard || exit 1
/usr/bin/node index.js /usr/bin/node index.js