Merge branch 'master' of https://github.com/alexbelgium/hassio-addons

webtop_kde/CHANGELOG.md

@@ -1,19 +1,12 @@
-### 4.16-r0-ls89-xfce10 (05-09-2023)
+### 4.16-r0-ls89-xfce12 (08-09-2023)
 - Minor bugs fixed
-### 4.16-r0-ls89-xfce9 (05-09-2023)
-- Minor bugs fixed
-### 4.16-r0-ls89-xfce8 (05-09-2023)
+### 4.16-r0-ls89-xfce11 (05-09-2023)
 - Minor bugs fixed
 
 ### 4.16-r0-ls89-xfce3 (04-09-2023)
-- Minor bugs fixed
 - Ingress enabled
 
-### 4.16-r0-ls89-xfce2 (03-09-2023)
-- Minor bugs fixed
-
 ### 4.16-r0-ls89-xfce (03-09-2023)
-- Minor bugs fixed
 - MAJOR REWORK : is now operational with Webtop 2.0
 - Based on Ubuntu XFCE
 

webtop_kde/Dockerfile

@@ -25,9 +25,8 @@ FROM ${BUILD_FROM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # load volume
 VOLUME [ "/sys/fs/cgroup" ]
@@ -96,7 +95,8 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
-ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Entrypoint modifications
 RUN \

webtop_kde/config.json

@@ -110,6 +110,6 @@
   "slug": "webtop-kde",
   "tmpfs": true,
   "url": "https://github.com/alexbelgium/hassio-addons",
-  "version": "4.16-r0-ls89-xfce10",
+  "version": "4.16-r0-ls89-xfce12",
   "video": true
-}
+}

webtop_kde/rootfs/etc/cont-init.d/80-configuration.sh

@@ -31,7 +31,6 @@ fi || (bashio::log.fatal "Error : $TIMEZONE not found. Here is a list of valid t
 if bashio::config.has_value 'KEYBOARD'; then
     KEYBOARD=$(bashio::config 'KEYBOARD')
     bashio::log.info "Setting keyboard to $KEYBOARD"
-    sed -i "1a export KEYBOARD=$KEYBOARD" /etc/s6-overlay/s6-rc.d/svc-web/run
     if [ -d /var/run/s6/container_environment ]; then printf "%s" "$KEYBOARD" > /var/run/s6/container_environment/KEYBOARD; fi
     printf "%s" "KEYBOARD=\"$KEYBOARD\"" >> ~/.bashrc
 fi || true