avm/hassio-addons
1
0
Fork 0
mirror of https://github.com/alexbelgium/hassio-addons.git synced 2026-06-15 11:59:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

New version

Browse Source
This commit is contained in:
Alexandre
2023-07-21 16:40:32 +02:00
parent f919ffa630
commit a67df23423
7 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nextcloud/Dockerfile
View File

@@ -53,11 +53,11 @@ RUN \
# Run custom scripts after installation # Run custom scripts after installation
echo "touch /runfile" >> /etc/s6-overlay/s6-rc.d/init-nextcloud-config/run && \ 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 && \ 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 # Ensure correct data mount first
sed -i "1a /./scripts2/00-banner.sh" /etc/s6-overlay/s6-rc.d/init-adduser/run && \ 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-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 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 \ RUN \
# Avoid using legacy cont-init.d # Avoid using legacy cont-init.d
mkdir -p /scripts && mv /etc/cont-init.d/* /scripts && \ 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 && \ sed -i "s|/etc/cont-init.d|/scripts|g" /etc/entrypoint.sh && \
\ \
# Give permissions # Give permissions

2
nextcloud/config.json
View File

@@ -124,6 +124,6 @@
"slug": "nextcloud_ocr", "slug": "nextcloud_ocr",
"uart": true, "uart": true,
"url": "https://github.com/alexbelgium/hassio-addons/tree/master/nextcloud", "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]" "webui": "https://[HOST]:[PORT:443]"
} }

4
nextcloud/rootfs/etc/cont-init.d/02-mariadb_discovery.sh
View File

@@ -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.blue "Host-name : $(bashio::services "mysql" "host"):$(bashio::services "mysql" "port")"
bashio::log.green "---" bashio::log.green "---"
# Clean if needed
#for var in dbtype dbname dbuser dbhost; do
# sed -i "/$var/d" /defaults/config.php
#done
fi fi

1
nextcloud/rootfs/etc/cont-init.d/99-add_packages.sh
View File

@@ -1,7 +1,6 @@
#!/usr/bin/with-contenv bashio #!/usr/bin/with-contenv bashio
# shellcheck shell=bash # shellcheck shell=bash
# Only execute if installed # Only execute if installed
if [ -f /notinstalled ]; then exit 0; fi if [ -f /notinstalled ]; then exit 0; fi

1
nextcloud/rootfs/etc/cont-init.d/99-elasticsearch.sh
View File

@@ -2,7 +2,6 @@
# shellcheck shell=bash # shellcheck shell=bash
# shellcheck disable=SC2086 # shellcheck disable=SC2086
# Only execute if installed # Only execute if installed
if [ -f /notinstalled ]; then exit 0; fi if [ -f /notinstalled ]; then exit 0; fi

1
nextcloud/rootfs/etc/cont-init.d/99-ocr.sh
View File

@@ -1,7 +1,6 @@
#!/usr/bin/with-contenv bashio #!/usr/bin/with-contenv bashio
# shellcheck shell=bash # shellcheck shell=bash
# Only execute if installed # Only execute if installed
if [ -f /notinstalled ]; then exit 0; fi if [ -f /notinstalled ]; then exit 0; fi

1
nextcloud/rootfs/etc/cont-init.d/99-trusted_domains.sh
View File

@@ -1,7 +1,6 @@
#!/usr/bin/with-contenv bashio #!/usr/bin/with-contenv bashio
# shellcheck shell=bash # shellcheck shell=bash
# Only execute if installed # Only execute if installed
if [ -f /notinstalled ]; then exit 0; fi if [ -f /notinstalled ]; then exit 0; fi