diff --git a/nextcloud/Dockerfile b/nextcloud/Dockerfile index 89e444cdf..b91fed5b8 100644 --- a/nextcloud/Dockerfile +++ b/nextcloud/Dockerfile @@ -53,11 +53,11 @@ RUN \ # Run custom scripts after installation echo "touch /runfile" >> /etc/s6-overlay/s6-rc.d/init-nextcloud-config/run && \ echo "/./etc/entrypoint.sh" >> /etc/s6-overlay/s6-rc.d/init-nextcloud-config/run && \ - chmod 777 /migrations/02-default-location && \ - sed -i "1a /./defaults/nextcloud-perms.sh" /migrations/02-default-location && \ \ # Ensure correct data mount first sed -i "1a /./scripts2/00-banner.sh" /etc/s6-overlay/s6-rc.d/init-adduser/run && \ + sed -i "2a /./defaults/nextcloud-perms.sh" /etc/s6-overlay/s6-rc.d/init-adduser/run && \ + echo "/./01-custom_script.sh" >> /etc/s6-overlay/s6-rc.d/init-adduser/run && \ echo "/./scripts2/00-smb_mounts.sh" >> /etc/s6-overlay/s6-rc.d/init-adduser/run && \ echo "/./scripts2/00-local_mounts.sh" >> /etc/s6-overlay/s6-rc.d/init-adduser/run @@ -130,7 +130,7 @@ ARG CONFIGLOCATION="/www/nextcloud/config" RUN \ # Avoid using legacy cont-init.d mkdir -p /scripts && mv /etc/cont-init.d/* /scripts && \ - mkdir -p /scripts2 && mv /scripts/00-local_mounts.sh /scripts2 && mv /scripts/00-smb_mounts.sh /scripts2 && mv /scripts/00-banner.sh /scripts2 && \ + for file in 00-local_mounts.sh 00-smb_mounts.sh 00-banner.sh 01-custom_script.sh; do mkdir -p /scripts2 && mv /scripts/"$file" /scripts2; done && \ sed -i "s|/etc/cont-init.d|/scripts|g" /etc/entrypoint.sh && \ \ # Give permissions diff --git a/nextcloud/config.json b/nextcloud/config.json index 2f4fc498a..210e2b2ce 100644 --- a/nextcloud/config.json +++ b/nextcloud/config.json @@ -124,6 +124,6 @@ "slug": "nextcloud_ocr", "uart": true, "url": "https://github.com/alexbelgium/hassio-addons/tree/master/nextcloud", - "version": "27.0.0-test_DO_NOT_INSTALL3", + "version": "27.0.0-2", "webui": "https://[HOST]:[PORT:443]" } \ No newline at end of file diff --git a/nextcloud/rootfs/etc/cont-init.d/02-mariadb_discovery.sh b/nextcloud/rootfs/etc/cont-init.d/02-mariadb_discovery.sh index 8543762c5..de2a90aa7 100755 --- a/nextcloud/rootfs/etc/cont-init.d/02-mariadb_discovery.sh +++ b/nextcloud/rootfs/etc/cont-init.d/02-mariadb_discovery.sh @@ -12,8 +12,4 @@ if bashio::services.available 'mysql'; then bashio::log.blue "Host-name : $(bashio::services "mysql" "host"):$(bashio::services "mysql" "port")" bashio::log.green "---" - # Clean if needed - #for var in dbtype dbname dbuser dbhost; do - # sed -i "/$var/d" /defaults/config.php - #done fi diff --git a/nextcloud/rootfs/etc/cont-init.d/99-add_packages.sh b/nextcloud/rootfs/etc/cont-init.d/99-add_packages.sh index 155a8314d..66909d2ba 100755 --- a/nextcloud/rootfs/etc/cont-init.d/99-add_packages.sh +++ b/nextcloud/rootfs/etc/cont-init.d/99-add_packages.sh @@ -1,7 +1,6 @@ #!/usr/bin/with-contenv bashio # shellcheck shell=bash - # Only execute if installed if [ -f /notinstalled ]; then exit 0; fi diff --git a/nextcloud/rootfs/etc/cont-init.d/99-elasticsearch.sh b/nextcloud/rootfs/etc/cont-init.d/99-elasticsearch.sh index 216eaf8a1..7f3b988bb 100755 --- a/nextcloud/rootfs/etc/cont-init.d/99-elasticsearch.sh +++ b/nextcloud/rootfs/etc/cont-init.d/99-elasticsearch.sh @@ -2,7 +2,6 @@ # shellcheck shell=bash # shellcheck disable=SC2086 - # Only execute if installed if [ -f /notinstalled ]; then exit 0; fi diff --git a/nextcloud/rootfs/etc/cont-init.d/99-ocr.sh b/nextcloud/rootfs/etc/cont-init.d/99-ocr.sh index b6699fb95..d984beafe 100755 --- a/nextcloud/rootfs/etc/cont-init.d/99-ocr.sh +++ b/nextcloud/rootfs/etc/cont-init.d/99-ocr.sh @@ -1,7 +1,6 @@ #!/usr/bin/with-contenv bashio # shellcheck shell=bash - # Only execute if installed if [ -f /notinstalled ]; then exit 0; fi diff --git a/nextcloud/rootfs/etc/cont-init.d/99-trusted_domains.sh b/nextcloud/rootfs/etc/cont-init.d/99-trusted_domains.sh index 3f1a37fde..47932b1af 100755 --- a/nextcloud/rootfs/etc/cont-init.d/99-trusted_domains.sh +++ b/nextcloud/rootfs/etc/cont-init.d/99-trusted_domains.sh @@ -1,7 +1,6 @@ #!/usr/bin/with-contenv bashio # shellcheck shell=bash - # Only execute if installed if [ -f /notinstalled ]; then exit 0; fi