From 010fd1b34a004ba28dc8ec73db63be03c4c4eb0e Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sun, 22 Jan 2023 07:59:29 +0100 Subject: [PATCH 1/7] Allow custom fonts directory Co-Authored-By: @fischer-felix https://github.com/alexbelgium/hassio-addons/issues/656 --- guacamole/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/guacamole/Dockerfile b/guacamole/Dockerfile index 7361f969f..23a7bb0cf 100644 --- a/guacamole/Dockerfile +++ b/guacamole/Dockerfile @@ -49,7 +49,9 @@ RUN \ # Allow syslog && mkdir -p /tmp \ && python3 -c "import socket as s; sock = s.socket(s.AF_UNIX); sock.bind('/tmp/syslog')" \ - && sed -i "s|s6-socklog -d3 -U -t3000|s6-socklog -d3 -U -t3000 -x /tmp/syslog|g" /etc/s6-overlay/s6-rc.d/syslogd/run + && sed -i "s|s6-socklog -d3 -U -t3000|s6-socklog -d3 -U -t3000 -x /tmp/syslog|g" /etc/s6-overlay/s6-rc.d/syslogd/run \ + # Allow custom fonts + && sed -i '\|/usr/share/fonts|a\ \ \ \ \ \ \ \ /config/addons_config/guacamole/fonts' /etc/fonts/fonts.conf ################## # 3 Install apps # From 9e3592a3966678ea41e0385f3c9cf6244ba987dc Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sun, 22 Jan 2023 08:04:16 +0100 Subject: [PATCH 2/7] Create fonts dir --- guacamole/rootfs/etc/cont-init.d/30-folders.sh | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 guacamole/rootfs/etc/cont-init.d/30-folders.sh diff --git a/guacamole/rootfs/etc/cont-init.d/30-folders.sh b/guacamole/rootfs/etc/cont-init.d/30-folders.sh new file mode 100644 index 000000000..b5c5a9e36 --- /dev/null +++ b/guacamole/rootfs/etc/cont-init.d/30-folders.sh @@ -0,0 +1,4 @@ +#!/usr/bin/with-contenv bashio +# shellcheck = bash + +mkdir -p /config/addons_config/guacamole/fonts From 208557920d916aa4ca7034024f6ba14063c67fe5 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sun, 22 Jan 2023 08:05:02 +0100 Subject: [PATCH 3/7] New version --- guacamole/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guacamole/config.json b/guacamole/config.json index 56583b488..903f9f1f6 100644 --- a/guacamole/config.json +++ b/guacamole/config.json @@ -26,6 +26,6 @@ }, "slug": "guacamole", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "1.4.2-7_test10", + "version": "1.4.2-7_11", "video": true } From 83185a4318225f2c31459c0d228d4d17593f2cfc Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sun, 22 Jan 2023 08:06:33 +0100 Subject: [PATCH 4/7] Update CHANGELOG.md --- guacamole/CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/guacamole/CHANGELOG.md b/guacamole/CHANGELOG.md index 8a147fd85..fdf28cc8c 100644 --- a/guacamole/CHANGELOG.md +++ b/guacamole/CHANGELOG.md @@ -1,3 +1,5 @@ +- Switch upstream image to abesnier/guacamole +- Allow custom fonts (thanks @fischer-felix) - WARNING : update to supervisor 2022.11 before installing ## 1.4.2 (14-05-2022) From b8ecf00eb114a97cecc4e540e974619927d50447 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sun, 22 Jan 2023 08:07:54 +0100 Subject: [PATCH 5/7] Update README.md --- guacamole/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guacamole/README.md b/guacamole/README.md index cd6e3b549..6fcedd05d 100644 --- a/guacamole/README.md +++ b/guacamole/README.md @@ -21,7 +21,7 @@ _Thanks to everyone having starred my repo! To star it click on the image below, [Apache Guacamole](https://guacamole.apache.org/) is a clientless remote desktop gateway. It supports standard protocols like VNC, RDP, and SSH. This container is only the backend server component needed to use The official or 3rd party HTML5 frontends. -This addon is based on the docker image https://github.com/maxwaldorf/guacamole +This addon is based on the docker image here https://hub.docker.com/r/abesnier/guacamole ## Configuration From 726ae8373177214e9854edf6d58e01fdec823f3e Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sun, 22 Jan 2023 08:09:37 +0100 Subject: [PATCH 6/7] Update README.md --- guacamole/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guacamole/README.md b/guacamole/README.md index 6fcedd05d..c58369dd4 100644 --- a/guacamole/README.md +++ b/guacamole/README.md @@ -21,7 +21,7 @@ _Thanks to everyone having starred my repo! To star it click on the image below, [Apache Guacamole](https://guacamole.apache.org/) is a clientless remote desktop gateway. It supports standard protocols like VNC, RDP, and SSH. This container is only the backend server component needed to use The official or 3rd party HTML5 frontends. -This addon is based on the docker image here https://hub.docker.com/r/abesnier/guacamole +This addon is based on the docker image here : https://github.com/abesnier/docker-guacamole ## Configuration From 4446e3fd3a8f6c6aa149cada2ec8479ea0595488 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sun, 22 Jan 2023 08:14:47 +0100 Subject: [PATCH 7/7] Update 30-folders.sh --- guacamole/rootfs/etc/cont-init.d/30-folders.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guacamole/rootfs/etc/cont-init.d/30-folders.sh b/guacamole/rootfs/etc/cont-init.d/30-folders.sh index b5c5a9e36..0597afdac 100644 --- a/guacamole/rootfs/etc/cont-init.d/30-folders.sh +++ b/guacamole/rootfs/etc/cont-init.d/30-folders.sh @@ -1,4 +1,4 @@ #!/usr/bin/with-contenv bashio -# shellcheck = bash +# shellcheck shell=bash mkdir -p /config/addons_config/guacamole/fonts