avm/hassio-addons
1
0
Fork 0
mirror of https://github.com/alexbelgium/hassio-addons.git synced 2026-07-03 20:48:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert config location to /config

Browse Source 
https://github.com/alexbelgium/hassio-addons/issues/1309
This commit is contained in:
Alexandre
2024-03-17 20:25:56 +01:00
committed by GitHub
parent 2c6e087f64
commit da3aa2ae8b
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
guacamole/Dockerfile
View File

@@ -28,16 +28,12 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
S6_SERVICES_GRACETIME=0 S6_SERVICES_GRACETIME=0
ENV PGDATA=/config/addons_config/guacamole/postgres ENV PGDATA=/config/postgres
ENV GUACAMOLE_HOME=/config/addons_config/guacamole ENV GUACAMOLE_HOME=/config
WORKDIR /config/addons_config/guacamole WORKDIR /config
# hadolint ignore=SC2016 # hadolint ignore=SC2016
RUN \ RUN \
# Change config location
sed -i 's|/config|/config/addons_config/guacamole|g' /etc/cont-init.d/* \
&& sed -i 's|/config|/config/addons_config/guacamole|g' /etc/services.d/*/run \
\
# Enable extensions # Enable extensions
&& sed -i 's|#!/usr/bin/with-contenv sh|#!/usr/bin/with-contenv bashio|g' /etc/cont-init.d/50-extensions.sh \ && sed -i 's|#!/usr/bin/with-contenv sh|#!/usr/bin/with-contenv bashio|g' /etc/cont-init.d/50-extensions.sh \
&& sed -i 's|$EXTENSIONS|$(bashio::config "EXTENSIONS")|g' /etc/cont-init.d/50-extensions.sh \ && sed -i 's|$EXTENSIONS|$(bashio::config "EXTENSIONS")|g' /etc/cont-init.d/50-extensions.sh \
@@ -55,7 +51,7 @@ RUN \
&& sed -i "s|s6-socklog -d3 -U -t3000|s6-socklog -d3 -U -t3000 -x /tmpsock/syslog|g" /etc/s6-overlay/s6-rc.d/syslogd/run \ && sed -i "s|s6-socklog -d3 -U -t3000|s6-socklog -d3 -U -t3000 -x /tmpsock/syslog|g" /etc/s6-overlay/s6-rc.d/syslogd/run \
\ \
# Allow custom fonts # Allow custom fonts
&& sed -i '\|<dir>/usr/share/fonts</dir>|a\ \ \ \ \ \ \ \ <dir>/config/addons_config/guacamole/fonts</dir>' /etc/fonts/fonts.conf \ && sed -i '\|<dir>/usr/share/fonts</dir>|a\ \ \ \ \ \ \ \ <dir>/config/fonts</dir>' /etc/fonts/fonts.conf \
\ \
# Avoid https://github.com/alexbelgium/hassio-addons/issues/659 # Avoid https://github.com/alexbelgium/hassio-addons/issues/659
&& rm -r /run/shm && rm -r /run/shm