From c1b02b808095ea7126885b471646d2f60261fd1c Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Thu, 23 Mar 2023 17:55:49 +0100 Subject: [PATCH] Allow custom config.yaml https://github.com/alexbelgium/hassio-addons/issues/768 --- nextcloud/Dockerfile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/nextcloud/Dockerfile b/nextcloud/Dockerfile index 9aece0181..7b5985818 100644 --- a/nextcloud/Dockerfile +++ b/nextcloud/Dockerfile @@ -91,7 +91,7 @@ RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -f /entrypoint.sh ]; then chmod 755 /entrypoint.sh; fi # Modules -ARG MODULES="00-banner.sh 01-custom_script.sh 92-local_mounts.sh 92-smb_mounts.sh" +ARG MODULES="00-banner.sh 01-custom_script.sh 90-config_yaml.sh 92-local_mounts.sh 92-smb_mounts.sh" # Automatic modules download RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ @@ -128,8 +128,11 @@ RUN \ # Correct nginx files sed -i "/Strict-Transport-Security/d" /defaults/nginx/site-confs/default.conf.sample && \ sed -i '1h;1!H;$!d;g;s/\(.*\)}/\1/' /defaults/nginx/site-confs/default.conf.sample && \ - cat /defaults/nginx_addition >> /defaults/nginx/site-confs/default.conf.sample - + cat /defaults/nginx_addition >> /defaults/nginx/site-confs/default.conf.sample \ + \ + # Correct config.yaml + sed -i 's|CONFIGSOURCE=$(bashio::config "CONFIG_LOCATION")|CONFIGSOURCE=/config/addons_config/nextcloud/config.yaml|g' /etc/cont-init.d/90-config_yaml.sh + #RUN chmod 777 /entrypoint.sh #WORKDIR / #ENTRYPOINT [ "/usr/bin/env" ]