LAB-linuxserver/docker-baseimage-kasmvnc
1
0
Fork 0
mirror of https://github.com/linuxserver/docker-baseimage-kasmvnc.git synced 2026-02-20 08:28:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

changes for 115 and add lang support (#41)

Browse Source
This commit is contained in:
Ryan Kuba 2024-02-06 07:56:29 -08:00 committed by GitHub
parent d776b64247
commit aef566c19d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Dockerfile
View File

@ -2,7 +2,7 @@
FROM node:12-buster as wwwstage
ARG KASMWEB_RELEASE="2b7e3321ae81cff99510738c2ecee1bcd2853d9b"
ARG KASMWEB_RELEASE="933d5b7505e1357af6c32eda7fbbfd620c02fa64"
RUN \
echo "**** build clientside ****" && \
@ -29,7 +29,7 @@ RUN \
FROM ghcr.io/linuxserver/baseimage-fedora:39 as buildstage
ARG KASMVNC_RELEASE="v1.2.0"
ARG KASMVNC_RELEASE="d49d07b88113d28eb183ca7c0ca59990fae1153c"
COPY --from=wwwstage /build-out /www
@ -224,7 +224,7 @@ FROM ghcr.io/linuxserver/baseimage-fedora:39
# set version label
ARG BUILD_DATE
ARG VERSION
ARG KASMBINS_RELEASE="1.14.0"
ARG KASMBINS_RELEASE="1.15.0"
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
LABEL maintainer="thelamer"
LABEL "com.kasmweb.image"="true"
@ -268,6 +268,10 @@ RUN \
docker-compose-plugin \
ffmpeg \
fuse-overlayfs \
glibc-all-langpacks \
glibc-locale-source \
google-noto-emoji-fonts \
google-noto-sans-fonts \
intel-media-driver \
libjpeg-turbo \
libstdc++ \
@ -351,6 +355,10 @@ RUN \
https://raw.githubusercontent.com/moby/moby/master/hack/dind && \
chmod +x /usr/local/bin/dind && \
usermod -aG docker abc && \
echo "**** configure locale ****" && \
for LOCALE in $(curl -sL https://raw.githubusercontent.com/thelamer/lang-stash/master/langs); do \
localedef -i $LOCALE -f UTF-8 $LOCALE.UTF-8; \
done && \
echo "**** cleanup ****" && \
dnf autoremove -y && \
dnf clean all && \

14
Dockerfile.aarch64
View File

@ -2,7 +2,7 @@
FROM node:12-buster as wwwstage
ARG KASMWEB_RELEASE="2b7e3321ae81cff99510738c2ecee1bcd2853d9b"
ARG KASMWEB_RELEASE="933d5b7505e1357af6c32eda7fbbfd620c02fa64"
RUN \
echo "**** install build deps ****" && \
@ -34,7 +34,7 @@ RUN \
FROM ghcr.io/linuxserver/baseimage-fedora:arm64v8-39 as buildstage
ARG KASMVNC_RELEASE="v1.2.0"
ARG KASMVNC_RELEASE="d49d07b88113d28eb183ca7c0ca59990fae1153c"
COPY --from=wwwstage /build-out /www
@ -229,7 +229,7 @@ FROM ghcr.io/linuxserver/baseimage-fedora:arm64v8-39
# set version label
ARG BUILD_DATE
ARG VERSION
ARG KASMBINS_RELEASE="1.14.0"
ARG KASMBINS_RELEASE="1.15.0"
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
LABEL maintainer="thelamer"
LABEL "com.kasmweb.image"="true"
@ -272,6 +272,10 @@ RUN \
docker-compose-plugin \
ffmpeg \
fuse-overlayfs \
glibc-all-langpacks \
glibc-locale-source \
google-noto-emoji-fonts \
google-noto-sans-fonts \
libjpeg-turbo \
libstdc++ \
libwebp \
@ -353,6 +357,10 @@ RUN \
https://raw.githubusercontent.com/moby/moby/master/hack/dind && \
chmod +x /usr/local/bin/dind && \
usermod -aG docker abc && \
echo "**** configure locale ****" && \
for LOCALE in $(curl -sL https://raw.githubusercontent.com/thelamer/lang-stash/master/langs); do \
localedef -i $LOCALE -f UTF-8 $LOCALE.UTF-8; \
done && \
echo "**** cleanup ****" && \
dnf autoremove -y && \
dnf clean all && \

6
root/etc/s6-overlay/s6-rc.d/init-kasmvnc-config/run
View File

@ -23,3 +23,9 @@ if [ ! -d "${HOME}/.XDG" ]; then
mkdir -p ${HOME}/.XDG
chown abc:abc ${HOME}/.XDG
fi
# Locale Support
if [ ! -z ${LC_ALL+x} ]; then
printf "${LC_ALL%.UTF-8}" > /run/s6/container_environment/LANGUAGE
printf "${LC_ALL}" > /run/s6/container_environment/LANG
fi

6
root/kasminit
View File

@ -8,6 +8,12 @@ function clean () {
trap clean SIGINT SIGTERM
clean
# Lang
if [ ! -z ${LC_ALL+x} ]; then
export LANGUAGE="${LC_ALL%.UTF-8}"
export LANG="${LC_ALL}"
fi
# Environment
export HOME=/home/kasm-user
export KASM_VNC_PATH=/usr/share/kasmvnc