add PWA icon , update readme, rebase to 3.19

Author: thelamer

.github/workflows/external_trigger.yml

@@ -20,7 +20,7 @@ jobs:
           echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_KRITA_MASTER\". ****"
           echo "External trigger running off of master branch. To disable this trigger, set a Github secret named \`PAUSE_EXTERNAL_TRIGGER_KRITA_MASTER\`" >> $GITHUB_STEP_SUMMARY
           echo "**** Retrieving external version ****"
-          EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.18/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
+          EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.19/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
             && awk '/^P:'"krita"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://')
           if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
             echo "**** Can't retrieve external version, exiting ****"
@@ -74,7 +74,7 @@ jobs:
             echo "**** Version ${EXT_RELEASE} already pushed, exiting ****"
             echo "Version ${EXT_RELEASE} already pushed, exiting" >> $GITHUB_STEP_SUMMARY
             exit 0
-          elif [[ $(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.18/community/aarch64/APKINDEX.tar.gz" | tar -xz -C /tmp && awk '/^P:'"krita"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://') != "${EXT_RELEASE}" ]]; then
+          elif [[ $(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.19/community/aarch64/APKINDEX.tar.gz" | tar -xz -C /tmp && awk '/^P:'"krita"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://') != "${EXT_RELEASE}" ]]; then
             echo "**** New version ${EXT_RELEASE} found; but not all arch repos updated yet; exiting ****"
             echo "New version ${EXT_RELEASE} found; but not all arch repos updated yet; exiting" >> $GITHUB_STEP_SUMMARY
             FAILURE_REASON="New version ${EXT_RELEASE} for krita tag latest is detected, however not all arch repos are updated yet. Will try again later."

Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-kasmvnc:alpine318
+FROM ghcr.io/linuxserver/baseimage-kasmvnc:alpine319
 
 # set version label
 ARG BUILD_DATE
@@ -11,14 +11,17 @@ LABEL maintainer="thelamer"
 ENV TITLE=Krita
 
 RUN \
+  echo "**** add icon ****" && \
+  curl -o \
+    /kclient/public/icon.png \
+    https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/krita-logo.png && \
   echo "**** install packages ****" && \
   if [ -z ${KRITA_VERSION+x} ]; then \
-    KRITA_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.18/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
+    KRITA_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.19/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
     && awk '/^P:krita$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
   fi && \
   apk add --no-cache \
     krita==${KRITA_VERSION} && \
-  sed -i 's|</applications>|  <application title="Krita*" type="normal">\n    <maximized>yes</maximized>\n  </application>\n</applications>|' /etc/xdg/openbox/rc.xml && \
   echo "**** cleanup ****" && \
   rm -rf \
     /tmp/*

Dockerfile.aarch64

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-kasmvnc:arm64v8-alpine318
+FROM ghcr.io/linuxserver/baseimage-kasmvnc:arm64v8-alpine319
 
 # set version label
 ARG BUILD_DATE
@@ -11,14 +11,17 @@ LABEL maintainer="thelamer"
 ENV TITLE=Krita
 
 RUN \
+  echo "**** add icon ****" && \
+  curl -o \
+    /kclient/public/icon.png \
+    https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/krita-logo.png && \
   echo "**** install packages ****" && \
   if [ -z ${KRITA_VERSION+x} ]; then \
-    KRITA_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.18/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
+    KRITA_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.19/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
     && awk '/^P:krita$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
   fi && \
   apk add --no-cache \
     krita==${KRITA_VERSION} && \
-  sed -i 's|</applications>|  <application title="Krita*" type="normal">\n    <maximized>yes</maximized>\n  </application>\n</applications>|' /etc/xdg/openbox/rc.xml && \
   echo "**** cleanup ****" && \
   rm -rf \
     /tmp/*

Jenkinsfile

@@ -25,8 +25,8 @@ pipeline {
     DEV_DOCKERHUB_IMAGE = 'lsiodev/krita'
     PR_DOCKERHUB_IMAGE = 'lspipepr/krita'
     DIST_IMAGE = 'alpine'
-    DIST_TAG = '3.18'
-    DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.18/community/'
+    DIST_TAG = '3.19'
+    DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.19/community/'
     DIST_REPO_PACKAGES = 'krita'
     MULTIARCH = 'true'
     CI = 'true'

README.md

@@ -81,6 +81,9 @@ This container is based on [Docker Baseimage KasmVNC](https://github.com/linuxse
 | FM_HOME | This is the home directory (landing) for the file manager, default "/config". |
 | START_DOCKER | If set to false a container with privilege will not automatically start the DinD Docker setup. |
 | DRINODE | If mounting in /dev/dri for [DRI3 GPU Acceleration](https://www.kasmweb.com/kasmvnc/docs/master/gpu_acceleration.html) allows you to specify the device to use IE `/dev/dri/renderD128` |
+| LC_ALL | Set the Language for the container to run as IE `fr_FR.UTF-8` `ar_AE.UTF-8` |
+| NO_DECOR | If set the application will run without window borders for use as a PWA. |
+| NO_FULL | Do not autmatically fullscreen applications when using openbox. |
 
 #### Optional run configurations
 
@@ -90,6 +93,20 @@ This container is based on [Docker Baseimage KasmVNC](https://github.com/linuxse
 | `-v /var/run/docker.sock:/var/run/docker.sock` | Mount in the host level Docker socket to either interact with it via CLI or use Docker enabled applications. |
 | `--device /dev/dri:/dev/dri` | Mount a GPU into the container, this can be used in conjunction with the `DRINODE` environment variable to leverage a host video card for GPU accelerated appplications. Only **Open Source** drivers are supported IE (Intel,AMDGPU,Radeon,ATI,Nouveau) |
 
+### Language Support - Internationalization
+
+The environment variable `LC_ALL` can be used to start this image in a different language than English simply pass for example to launch the Desktop session in French `LC_ALL=fr_FR.UTF-8`. Some languages like Chinese, Japanese, or Korean will be missing fonts needed to render properly known as cjk fonts, but others may exist and not be installed. We only ensure fonts for Latin characters are present. Fonts can be installed with a mod on startup.
+
+To install cjk fonts on startup as an example pass the environment variables:
+
+```
+-e DOCKER_MODS=linuxserver/mods:universal-package-install
+-e INSTALL_PACKAGES=font-noto-cjk
+-e LC_ALL=zh_CN.UTF-8
+```
+
+The web interface has the option for "IME Input Mode" in Settings which will allow non english characters to be used from a non en_US keyboard on the client. Once enabled it will perform the same as a local Linux installation set to your locale.
+
 ### Lossless mode
 
 This container is capable of delivering a true lossless image at a high framerate to your web browser by changing the Stream Quality preset to "Lossless", more information [here](https://www.kasmweb.com/docs/latest/how_to/lossless.html#technical-background). In order to use this mode from a non localhost endpoint the HTTPS port on 3001 needs to be used. If using a reverse proxy to port 3000 specific headers will need to be set as outlined [here](https://github.com/linuxserver/docker-baseimage-kasmvnc#lossless).
@@ -311,4 +328,5 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **10.02.24:** - Rebase to Alpine 3.19, update Readme with new env vars, and ingest proper PWA icon.
 * **07.12.23:** - Initial Release.

jenkins-vars.yml

@@ -16,8 +16,8 @@ repo_vars:
   - DEV_DOCKERHUB_IMAGE = 'lsiodev/krita'
   - PR_DOCKERHUB_IMAGE = 'lspipepr/krita'
   - DIST_IMAGE = 'alpine'
-  - DIST_TAG = '3.18'
-  - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.18/community/'
+  - DIST_TAG = '3.19'
+  - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.19/community/'
   - DIST_REPO_PACKAGES = 'krita'
   - MULTIARCH = 'true'
   - CI = 'true'

readme-vars.yml

@@ -58,6 +58,9 @@ app_setup_block: |
   | FM_HOME | This is the home directory (landing) for the file manager, default "/config". |
   | START_DOCKER | If set to false a container with privilege will not automatically start the DinD Docker setup. |
   | DRINODE | If mounting in /dev/dri for [DRI3 GPU Acceleration](https://www.kasmweb.com/kasmvnc/docs/master/gpu_acceleration.html) allows you to specify the device to use IE `/dev/dri/renderD128` |
+  | LC_ALL | Set the Language for the container to run as IE `fr_FR.UTF-8` `ar_AE.UTF-8` |
+  | NO_DECOR | If set the application will run without window borders for use as a PWA. |
+  | NO_FULL | Do not autmatically fullscreen applications when using openbox. |
 
   #### Optional run configurations
 
@@ -67,10 +70,25 @@ app_setup_block: |
   | `-v /var/run/docker.sock:/var/run/docker.sock` | Mount in the host level Docker socket to either interact with it via CLI or use Docker enabled applications. |
   | `--device /dev/dri:/dev/dri` | Mount a GPU into the container, this can be used in conjunction with the `DRINODE` environment variable to leverage a host video card for GPU accelerated appplications. Only **Open Source** drivers are supported IE (Intel,AMDGPU,Radeon,ATI,Nouveau) |
 
+  ### Language Support - Internationalization
+
+  The environment variable `LC_ALL` can be used to start this image in a different language than English simply pass for example to launch the Desktop session in French `LC_ALL=fr_FR.UTF-8`. Some languages like Chinese, Japanese, or Korean will be missing fonts needed to render properly known as cjk fonts, but others may exist and not be installed. We only ensure fonts for Latin characters are present. Fonts can be installed with a mod on startup.
+
+  To install cjk fonts on startup as an example pass the environment variables:
+
+  ```
+  -e DOCKER_MODS=linuxserver/mods:universal-package-install
+  -e INSTALL_PACKAGES=font-noto-cjk
+  -e LC_ALL=zh_CN.UTF-8
+  ```
+
+  The web interface has the option for "IME Input Mode" in Settings which will allow non english characters to be used from a non en_US keyboard on the client. Once enabled it will perform the same as a local Linux installation set to your locale.
+
   ### Lossless mode
 
   This container is capable of delivering a true lossless image at a high framerate to your web browser by changing the Stream Quality preset to "Lossless", more information [here](https://www.kasmweb.com/docs/latest/how_to/lossless.html#technical-background). In order to use this mode from a non localhost endpoint the HTTPS port on 3001 needs to be used. If using a reverse proxy to port 3000 specific headers will need to be set as outlined [here](https://github.com/linuxserver/docker-baseimage-kasmvnc#lossless).
 
 # changelog
 changelogs:
+  - { date: "10.02.24:", desc: "Rebase to Alpine 3.19, update Readme with new env vars, and ingest proper PWA icon." }
   - { date: "07.12.23:", desc: "Initial Release." }