From f9c2779277c24271f5006606d7d53eda374e1801 Mon Sep 17 00:00:00 2001 From: thelamer Date: Thu, 8 Feb 2024 11:10:14 -0800 Subject: [PATCH 1/2] bump kasmvnc and add NO_DECOR option to baseimage --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- README.md | 18 +----------------- readme-vars.yml | 18 +----------------- .../s6-overlay/s6-rc.d/init-kasmvnc-config/run | 8 ++++++++ 5 files changed, 12 insertions(+), 36 deletions(-) diff --git a/Dockerfile b/Dockerfile index 85c74f1..b615f08 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM node:12-buster as wwwstage -ARG KASMWEB_RELEASE="933d5b7505e1357af6c32eda7fbbfd620c02fa64" +ARG KASMWEB_RELEASE="3d7047e54607011f86647889d3dbd3b98d2210d3" RUN \ echo "**** build clientside ****" && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index cca682c..8556070 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -2,7 +2,7 @@ FROM node:12-buster as wwwstage -ARG KASMWEB_RELEASE="933d5b7505e1357af6c32eda7fbbfd620c02fa64" +ARG KASMWEB_RELEASE="3d7047e54607011f86647889d3dbd3b98d2210d3" RUN \ echo "**** install build deps ****" && \ diff --git a/README.md b/README.md index 2a5be9b..70cb7d0 100644 --- a/README.md +++ b/README.md @@ -1,19 +1,3 @@ -[linuxserverurl]: https://linuxserver.io -[forumurl]: https://forum.linuxserver.io -[ircurl]: https://www.linuxserver.io/irc/ -[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png?v=4&s=4000)][linuxserverurl] -## Contact information:- -| Type | Address/Details | -| :---: | --- | -| Discord | [Discord](https://discord.gg/YWrKVTn) | -| IRC | freenode at `#linuxserver.io` more information at:- [IRC][ircurl] -| Forum | [LinuxServer.io forum][forumurl] | -  -  -[![](https://images.microbadger.com/badges/image/lsiobase/kasmvnc.svg)](https://microbadger.com/images/lsiobase/kasmvnc "Get your own image badge on microbadger.com") -[![](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/Dockerfile-Link-green.png)](https://github.com/linuxserver/docker-baseimage-kasmvnc/blob/master/Dockerfile) -A custom base image built with [Alpine Linux](https://www.ubuntu.com/) and [KasmVNC](https://github.com/kasmtech/KasmVNC) -The following line is only in this repo for loop testing: -- { date: "01.01.50:", desc: "I am the release message for this internal repo." } +Up to date documentation is available [here](https://github.com/linuxserver/docker-baseimage-kasmvnc/blob/master/README.md). diff --git a/readme-vars.yml b/readme-vars.yml index 7d8b8a6..257c19d 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -4,21 +4,5 @@ project_name: baseimage-kasmvnc full_custom_readme: | {% raw -%} - [linuxserverurl]: https://linuxserver.io - [forumurl]: https://forum.linuxserver.io - [ircurl]: https://www.linuxserver.io/irc/ - [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png?v=4&s=4000)][linuxserverurl] - ## Contact information:- - | Type | Address/Details | - | :---: | --- | - | Discord | [Discord](https://discord.gg/YWrKVTn) | - | IRC | freenode at `#linuxserver.io` more information at:- [IRC][ircurl] - | Forum | [LinuxServer.io forum][forumurl] | -   -   - [![](https://images.microbadger.com/badges/image/lsiobase/kasmvnc.svg)](https://microbadger.com/images/lsiobase/kasmvnc "Get your own image badge on microbadger.com") - [![](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/Dockerfile-Link-green.png)](https://github.com/linuxserver/docker-baseimage-kasmvnc/blob/master/Dockerfile) - A custom base image built with [Alpine Linux](https://www.ubuntu.com/) and [KasmVNC](https://github.com/kasmtech/KasmVNC) - The following line is only in this repo for loop testing: - - { date: "01.01.50:", desc: "I am the release message for this internal repo." } + Up to date documentation is available [here](https://github.com/linuxserver/docker-baseimage-kasmvnc/blob/master/README.md). {%- endraw %} diff --git a/root/etc/s6-overlay/s6-rc.d/init-kasmvnc-config/run b/root/etc/s6-overlay/s6-rc.d/init-kasmvnc-config/run index 9c149a7..b416c52 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-kasmvnc-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-kasmvnc-config/run @@ -29,3 +29,11 @@ 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 + +# Remove window borders +if [[ ! -z ${NO_DECOR+x} ]] && [[ ! -f /decorlock ]]; then + sed -i \ + 's|| no \n|' \ + /etc/xdg/openbox/rc.xml + touch /decorlock +fi From 1cdf86f796be1d9e40563663ff8e46f64c2e9b92 Mon Sep 17 00:00:00 2001 From: thelamer Date: Sat, 10 Feb 2024 11:11:11 -0800 Subject: [PATCH 2/2] add theme and default to fullscreen unless the user passes an environment variable --- Dockerfile | 5 ++++- Dockerfile.aarch64 | 5 ++++- root/etc/s6-overlay/s6-rc.d/init-kasmvnc-config/run | 8 ++++++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index b615f08..77c8394 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM node:12-buster as wwwstage -ARG KASMWEB_RELEASE="3d7047e54607011f86647889d3dbd3b98d2210d3" +ARG KASMWEB_RELEASE="75d4f9c57c1a0e99f045270006376f75be44f609" RUN \ echo "**** build clientside ****" && \ @@ -390,6 +390,9 @@ RUN \ 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 "**** theme ****" && \ + curl -s https://raw.githubusercontent.com/thelamer/lang-stash/master/theme.tar.gz \ + | tar xzvf - -C /usr/share/themes/Clearlooks/openbox-3/ && \ echo "**** cleanup ****" && \ apt-get autoclean && \ rm -rf \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 8556070..2ccb0db 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -2,7 +2,7 @@ FROM node:12-buster as wwwstage -ARG KASMWEB_RELEASE="3d7047e54607011f86647889d3dbd3b98d2210d3" +ARG KASMWEB_RELEASE="75d4f9c57c1a0e99f045270006376f75be44f609" RUN \ echo "**** install build deps ****" && \ @@ -391,6 +391,9 @@ RUN \ 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 "**** theme ****" && \ + curl -s https://raw.githubusercontent.com/thelamer/lang-stash/master/theme.tar.gz \ + | tar xzvf - -C /usr/share/themes/Clearlooks/openbox-3/ && \ echo "**** cleanup ****" && \ apt-get autoclean && \ rm -rf \ diff --git a/root/etc/s6-overlay/s6-rc.d/init-kasmvnc-config/run b/root/etc/s6-overlay/s6-rc.d/init-kasmvnc-config/run index b416c52..935f643 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-kasmvnc-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-kasmvnc-config/run @@ -37,3 +37,11 @@ if [[ ! -z ${NO_DECOR+x} ]] && [[ ! -f /decorlock ]]; then /etc/xdg/openbox/rc.xml touch /decorlock fi + +# Fullscreen everything in openbox unless the user explicitly disables it +if [[ -z ${NO_FULL+x} ]] && [[ ! -f /fulllock ]]; then + sed -i \ + 's|| yes\n|' \ + /etc/xdg/openbox/rc.xml + touch /fulllock +fi