diff --git a/.templates/92-local_mounts.sh b/.templates/92-local_mounts.sh index 02bc248cf..6996884e2 100644 --- a/.templates/92-local_mounts.sh +++ b/.templates/92-local_mounts.sh @@ -12,13 +12,13 @@ if bashio::config.has_value 'localdisks'; then echo "Local Disks mounting..." # Mount using UID/GID values - if bashio::config.has_value 'PUID' && bashio::config.has_value 'PGID'; then + if bashio::config.has_value 'PUID' && bashio::config.has_value 'PGID' && [ -z ${ROOTMOUNT+x} ]; then echo "Using PUID $(bashio::config 'PUID') and PGID $(bashio::config 'PGID')" PUID="$(bashio::config 'PUID')" PGID="$(bashio::config 'PGID')" else - PUID="$(id -u)" - PGID="$(id -g)" + PUID="0" + PGID="0" fi # Separate comma separated values @@ -35,7 +35,7 @@ if bashio::config.has_value 'localdisks'; then # Creates dir mkdir -p /mnt/"$disk" - chown -R "$PUID:$PGID" /mnt/"$disk" + chown "$PUID:$PGID" /mnt/"$disk" # Legacy mounting : mount to share if still exists (avoid breaking changes) # shellcheck disable=SC2015 [ -d /share/"$disk" ] && mount "$devpath"/"$disk" /share/"$disk" || true diff --git a/.templates/92-smb_mounts.sh b/.templates/92-smb_mounts.sh index 049627399..3d8c601df 100644 --- a/.templates/92-smb_mounts.sh +++ b/.templates/92-smb_mounts.sh @@ -26,7 +26,7 @@ if bashio::config.has_value 'networkdisks'; then fi # Mount using UID/GID values - if bashio::config.has_value 'PUID' && bashio::config.has_value 'PGID'; then + if bashio::config.has_value 'PUID' && bashio::config.has_value 'PGID' && [ -z ${ROOTMOUNT+x} ]; then echo "Using PUID $(bashio::config 'PUID') and PGID $(bashio::config 'PGID')" PUID=",uid=$(bashio::config 'PUID')" PGID=",gid=$(bashio::config 'PGID')" diff --git a/arpspoof/config.json b/arpspoof/config.json index b467876d3..d796f7e91 100644 --- a/arpspoof/config.json +++ b/arpspoof/config.json @@ -30,4 +30,4 @@ "url": "https://github.com/alexbelgium/hassio-addons/tree/master/arpspoof", "version": "1.0.0", "webui": "[PROTO:ssl]://[HOST]:[PORT:7022]" -} \ No newline at end of file +} diff --git a/bazarr/Dockerfile b/bazarr/Dockerfile index 3ba53f02f..4f4c89d06 100644 --- a/bazarr/Dockerfile +++ b/bazarr/Dockerfile @@ -34,14 +34,14 @@ RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ \ - # Create new config folder if needed - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ - \ # Allow UID and GID setting && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \ \ # Correct config location - && for file in $(grep -Esril '/config[ /]|/config$' /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ + \ + # Create new config folder if needed + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done diff --git a/bazarr/README.md b/bazarr/README.md index e49959f15..10fad7765 100644 --- a/bazarr/README.md +++ b/bazarr/README.md @@ -31,7 +31,6 @@ This addon is based on the docker image https://github.com/linuxserver/docker-ba --- Webui can be found at . -The default username/password : described in the startup log. Configurations can be done through the app webUI, except for the following options ```yaml diff --git a/bazarr/config.json b/bazarr/config.json index 41cdd6851..e14e82d31 100644 --- a/bazarr/config.json +++ b/bazarr/config.json @@ -95,4 +95,4 @@ "url": "https://github.com/alexbelgium/hassio-addons/tree/master/bazarr", "version": "1.1.1-bugfix", "webui": "[PROTO:ssl]://[HOST]:[PORT:6767]" -} \ No newline at end of file +} diff --git a/booksonic_air/Dockerfile b/booksonic_air/Dockerfile index 21254c4e7..5f1451b2c 100644 --- a/booksonic_air/Dockerfile +++ b/booksonic_air/Dockerfile @@ -36,14 +36,14 @@ RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ \ - # Create new config folder if needed - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ - \ # Allow UID and GID setting && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \ \ # Correct config location - && for file in $(grep -Esril '/config[ /]|/config$' /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ + \ + # Create new config folder if needed + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done diff --git a/booksonic_air/config.json b/booksonic_air/config.json index 318e3c078..5da956ba6 100644 --- a/booksonic_air/config.json +++ b/booksonic_air/config.json @@ -80,4 +80,4 @@ "url": "https://github.com/alexbelgium/hassio-addons/tree/master/booksonic_air", "version": "v2201.1.0-ls68-bugfix", "webui": "[PROTO:ssl]://[HOST]:[PORT:4040]" -} \ No newline at end of file +} diff --git a/calibre/CHANGELOG.md b/calibre/CHANGELOG.md index 9584b8bf5..fa6a79700 100644 --- a/calibre/CHANGELOG.md +++ b/calibre/CHANGELOG.md @@ -1,4 +1,7 @@ +## v6.5.0-ls179 (17-09-2022) +- Update to latest version from linuxserver/docker-calibre + ## v6.4.0-ls178 (02-09-2022) - Update to latest version from linuxserver/docker-calibre diff --git a/calibre/Dockerfile b/calibre/Dockerfile index 7825963d7..fb0e4d7ac 100644 --- a/calibre/Dockerfile +++ b/calibre/Dockerfile @@ -35,14 +35,14 @@ RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ \ - # Create new config folder if needed - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ - \ # Allow UID and GID setting && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \ \ # Correct config location - && for file in $(grep -Esril '/config[ /]|/config$' /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ + \ + # Create new config folder if needed + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done diff --git a/calibre/config.json b/calibre/config.json index 378cb4a0e..6f0e52247 100644 --- a/calibre/config.json +++ b/calibre/config.json @@ -89,6 +89,6 @@ }, "slug": "calibre", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/calibre", - "version": "v6.4.0-ls178-bugfix", + "version": "v6.5.0-ls179", "video": true } diff --git a/calibre/updater.json b/calibre/updater.json index 75309584b..4e956a3e9 100644 --- a/calibre/updater.json +++ b/calibre/updater.json @@ -1,10 +1,10 @@ { "github_fulltag": "true", - "last_update": "02-09-2022", + "last_update": "17-09-2022", "paused": false, "repository": "alexbelgium/hassio-addons", "slug": "calibre", "source": "github", "upstream_repo": "linuxserver/docker-calibre", - "upstream_version": "v6.4.0-ls178" + "upstream_version": "v6.5.0-ls179" } diff --git a/calibre_web/CHANGELOG.md b/calibre_web/CHANGELOG.md index 9669e81bf..492ca12c5 100644 --- a/calibre_web/CHANGELOG.md +++ b/calibre_web/CHANGELOG.md @@ -1,4 +1,7 @@ +## 0.6.19-ls174 (15-09-2022) +- Update to latest version from linuxserver/docker-calibre-web + ## 0.6.19-ls173 (09-09-2022) - Update to latest version from linuxserver/docker-calibre-web diff --git a/calibre_web/Dockerfile b/calibre_web/Dockerfile index a0fce927b..cca72b0b2 100644 --- a/calibre_web/Dockerfile +++ b/calibre_web/Dockerfile @@ -35,14 +35,14 @@ RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ \ - # Create new config folder if needed - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ - \ # Allow UID and GID setting && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \ \ # Correct config location - && for file in $(grep -Esril '/config[ /]|/config$' /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ + \ + # Create new config folder if needed + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done diff --git a/calibre_web/config.json b/calibre_web/config.json index ecfd96803..3433799a4 100644 --- a/calibre_web/config.json +++ b/calibre_web/config.json @@ -90,6 +90,6 @@ }, "slug": "calibre-web", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/calibre-web", - "version": "0.6.19-ls173-bugfix", + "version": "0.6.19-ls174", "video": true } diff --git a/calibre_web/updater.json b/calibre_web/updater.json index e5a58e305..714ef2bb6 100644 --- a/calibre_web/updater.json +++ b/calibre_web/updater.json @@ -1,10 +1,10 @@ { "github_fulltag": "true", - "last_update": "09-09-2022", + "last_update": "15-09-2022", "paused": false, "repository": "alexbelgium/hassio-addons", "slug": "calibre-web", "source": "github", "upstream_repo": "linuxserver/docker-calibre-web", - "upstream_version": "0.6.19-ls173" + "upstream_version": "0.6.19-ls174" } diff --git a/code-server/Dockerfile b/code-server/Dockerfile index 24e762802..5f197fe44 100644 --- a/code-server/Dockerfile +++ b/code-server/Dockerfile @@ -34,14 +34,14 @@ RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ \ - # Create new config folder if needed - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ - \ # Allow UID and GID setting && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \ \ # Correct config location - && for file in $(grep -Esril '/config[ /]|/config$' /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ + \ + # Create new config folder if needed + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done diff --git a/code-server/config.json b/code-server/config.json index 1212b7d04..e6d39f3d4 100644 --- a/code-server/config.json +++ b/code-server/config.json @@ -76,4 +76,4 @@ "url": "https://github.com/alexbelgium/hassio-addons/tree/master/coder-server", "version": "4.7.0-bugfix", "webui": "[PROTO:ssl]://[HOST]:[PORT:8443]" -} \ No newline at end of file +} diff --git a/emby/Dockerfile b/emby/Dockerfile index 39fe537f3..6ffa284b0 100644 --- a/emby/Dockerfile +++ b/emby/Dockerfile @@ -34,14 +34,14 @@ RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ \ - # Create new config folder if needed - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ - \ # Allow UID and GID setting && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \ \ # Correct config location - && for file in $(grep -Esril '/config[ /]|/config$' /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ + \ + # Create new config folder if needed + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done diff --git a/epicgamesfree/config.json b/epicgamesfree/config.json index ec0447703..223fe3795 100644 --- a/epicgamesfree/config.json +++ b/epicgamesfree/config.json @@ -19,6 +19,6 @@ }, "slug": "epicgamesfree", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "9531608362dc8c1232c1e12005541796610d2af7-2021-12-17", + "version": "938a9653ffd08b8284ea32cf01ac8727d25c5d4c", "webui": "[PROTO:ssl]://[HOST]:[PORT:3000]" -} \ No newline at end of file +} diff --git a/fireflyiii/CHANGELOG.md b/fireflyiii/CHANGELOG.md index 935ecd7d1..382e51ce8 100644 --- a/fireflyiii/CHANGELOG.md +++ b/fireflyiii/CHANGELOG.md @@ -1,4 +1,7 @@ +## 5.7.12 (13-09-2022) +- Update to latest version from firefly-iii/firefly-iii + ## 5.7.11 (09-09-2022) - Update to latest version from firefly-iii/firefly-iii diff --git a/fireflyiii/Dockerfile b/fireflyiii/Dockerfile index 518d8fcee..fbdd9f1ca 100644 --- a/fireflyiii/Dockerfile +++ b/fireflyiii/Dockerfile @@ -33,12 +33,12 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # # Change data location # grep -rl "/var/www/html" /etc/ | xargs sed -i 's|/var/www/html|/data/firefly|g' -ARG BUILD_UPSTREAM="5.7.11" +ARG BUILD_UPSTREAM="5.7.12" RUN \ ################# # Fix for 5.7.5 # ################# - if [ "$BUILD_UPSTREAM" = "5.7.11" ] ; then \ + if [ "$BUILD_UPSTREAM" = "5.7.12" ] ; then \ sed -i "s|, \$transaction\[\x27amount\x27\] ?? \x270\x27);|, (string)(\$transaction\[\x27amount\x27\] ?? \x270\x27));|g" /var/www/html/app/Helpers/Collector/GroupCollector.php; else echo "not 5.7.5"; fi ################## diff --git a/fireflyiii/config.json b/fireflyiii/config.json index 072bd04a4..9e01f189b 100644 --- a/fireflyiii/config.json +++ b/fireflyiii/config.json @@ -46,6 +46,6 @@ "slug": "fireflyiii", "startup": "services", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "5.7.11", + "version": "5.7.12", "webui": "[PROTO:ssl]://[HOST]:[PORT:8080]" } diff --git a/fireflyiii/updater.json b/fireflyiii/updater.json index ff96629c9..214247104 100644 --- a/fireflyiii/updater.json +++ b/fireflyiii/updater.json @@ -1,8 +1,8 @@ { - "last_update": "09-09-2022", + "last_update": "13-09-2022", "repository": "alexbelgium/hassio-addons", "slug": "fireflyiii", "source": "github", "upstream_repo": "firefly-iii/firefly-iii", - "upstream_version": "5.7.11" + "upstream_version": "5.7.12" } diff --git a/fireflyiii_data_importer/CHANGELOG.md b/fireflyiii_data_importer/CHANGELOG.md index 6ca6a6a43..e185bae65 100644 --- a/fireflyiii_data_importer/CHANGELOG.md +++ b/fireflyiii_data_importer/CHANGELOG.md @@ -1,4 +1,7 @@ +## version-0.9.16 (13-09-2022) +- Update to latest version from fireflyiii/data-importer + ## version-0.9.15 (26-07-2022) - Update to latest version from fireflyiii/data-importer diff --git a/fireflyiii_data_importer/Dockerfile b/fireflyiii_data_importer/Dockerfile index 24c558b13..baf7ee14f 100644 --- a/fireflyiii_data_importer/Dockerfile +++ b/fireflyiii_data_importer/Dockerfile @@ -16,7 +16,7 @@ ARG BUILD_FROM ARG BUILD_VERSION -ARG BUILD_UPSTREAM="version-0.9.15" +ARG BUILD_UPSTREAM="version-0.9.16" FROM ${BUILD_FROM} ################## diff --git a/fireflyiii_data_importer/config.json b/fireflyiii_data_importer/config.json index d4f293466..9405f89fe 100644 --- a/fireflyiii_data_importer/config.json +++ b/fireflyiii_data_importer/config.json @@ -39,6 +39,6 @@ }, "slug": "fireflyiii_data_importer", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "version-0.9.15", + "version": "version-0.9.16", "webui": "[PROTO:ssl]://[HOST]:[PORT:8080]" } diff --git a/fireflyiii_data_importer/updater.json b/fireflyiii_data_importer/updater.json index e09c20f47..a982fbcb7 100644 --- a/fireflyiii_data_importer/updater.json +++ b/fireflyiii_data_importer/updater.json @@ -1,8 +1,8 @@ { - "last_update": "26-07-2022", + "last_update": "13-09-2022", "repository": "alexbelgium/hassio-addons", "slug": "fireflyiii_data_importer", "source": "dockerhub", "upstream_repo": "fireflyiii/data-importer", - "upstream_version": "version-0.9.15" + "upstream_version": "version-0.9.16" } diff --git a/flaresolverr/CHANGELOG.md b/flaresolverr/CHANGELOG.md index a04e3fd42..471670b56 100644 --- a/flaresolverr/CHANGELOG.md +++ b/flaresolverr/CHANGELOG.md @@ -1,4 +1,7 @@ +## 2.2.7 (13-09-2022) +- Update to latest version from FlareSolverr/FlareSolverr + ## 2.2.6 (04-08-2022) - Update to latest version from FlareSolverr/FlareSolverr diff --git a/flaresolverr/config.json b/flaresolverr/config.json index 61ff823ee..c221ecf96 100644 --- a/flaresolverr/config.json +++ b/flaresolverr/config.json @@ -15,6 +15,6 @@ }, "slug": "flaresolverr", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "2.2.6", + "version": "2.2.7", "webui": "[PROTO:ssl]://[HOST]:[PORT:8191]" } diff --git a/flaresolverr/updater.json b/flaresolverr/updater.json index 28ef11d81..799f8fb85 100644 --- a/flaresolverr/updater.json +++ b/flaresolverr/updater.json @@ -1,8 +1,8 @@ { - "last_update": "04-08-2022", + "last_update": "13-09-2022", "repository": "alexbelgium/hassio-addons", "slug": "flaresolverr", "source": "github", "upstream_repo": "FlareSolverr/FlareSolverr", - "upstream_version": "2.2.6" + "upstream_version": "2.2.7" } diff --git a/flexget/Dockerfile b/flexget/Dockerfile index f8b3c9374..8a82daf9a 100644 --- a/flexget/Dockerfile +++ b/flexget/Dockerfile @@ -44,14 +44,14 @@ RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ \ - # Create new config folder if needed - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ - \ # Allow UID and GID setting && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \ \ # Correct config location - && for file in $(grep -Esril '/config[ /]|/config$' /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ + \ + # Create new config folder if needed + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done diff --git a/flexget/config.json b/flexget/config.json index 20293455e..53f29465b 100644 --- a/flexget/config.json +++ b/flexget/config.json @@ -39,4 +39,4 @@ "url": "https://github.com/alexbelgium/hassio-addons", "version": "3.3.26-bugfix", "webui": "[PROTO:ssl]://[HOST]:[PORT:5050]" -} \ No newline at end of file +} diff --git a/grav/Dockerfile b/grav/Dockerfile index dc8d176d5..4b7b32c79 100644 --- a/grav/Dockerfile +++ b/grav/Dockerfile @@ -34,14 +34,14 @@ RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ \ - # Create new config folder if needed - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ - \ # Allow UID and GID setting && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \ \ # Correct config location - && for file in $(grep -Esril '/config[ /]|/config$' /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ + \ + # Create new config folder if needed + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done diff --git a/grav/config.json b/grav/config.json index 07cd18cda..518c8ad12 100644 --- a/grav/config.json +++ b/grav/config.json @@ -34,4 +34,4 @@ "url": "https://github.com/alexbelgium/hassio-addons", "version": "1.7.36-bugfix", "webui": "[PROTO:ssl]://[HOST]:[PORT:80]" -} \ No newline at end of file +} diff --git a/guacamole/config.json b/guacamole/config.json index 3d4c3fd3a..1ad7e1b76 100644 --- a/guacamole/config.json +++ b/guacamole/config.json @@ -27,4 +27,4 @@ "version": "1.4.2-7", "video": true, "webui": "[PROTO:ssl]://[HOST]:[PORT:8080]" -} \ No newline at end of file +} diff --git a/jackett/CHANGELOG.md b/jackett/CHANGELOG.md index 60fabd470..4e8ca5421 100644 --- a/jackett/CHANGELOG.md +++ b/jackett/CHANGELOG.md @@ -1,4 +1,13 @@ +## 0.20.1907 (17-09-2022) +- Update to latest version from linuxserver/docker-jackett + +## 0.20.1901 (15-09-2022) +- Update to latest version from linuxserver/docker-jackett + +## 0.20.1887 (13-09-2022) +- Update to latest version from linuxserver/docker-jackett + ## 0.20.1853 (09-09-2022) - Update to latest version from linuxserver/docker-jackett diff --git a/jackett/Dockerfile b/jackett/Dockerfile index 1a2e53533..4c1c3d80b 100644 --- a/jackett/Dockerfile +++ b/jackett/Dockerfile @@ -34,14 +34,14 @@ RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ \ - # Create new config folder if needed - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ - \ # Allow UID and GID setting && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \ \ # Correct config location - && for file in $(grep -Esril '/config[ /]|/config$' /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ + \ + # Create new config folder if needed + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done diff --git a/jackett/config.json b/jackett/config.json index a1c890268..420cdb3d8 100644 --- a/jackett/config.json +++ b/jackett/config.json @@ -43,6 +43,6 @@ }, "slug": "jackett_nas", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/jackett", - "version": "0.20.1853-bugfix", + "version": "0.20.1907", "webui": "[PROTO:ssl]://[HOST]:[PORT:9117]" -} \ No newline at end of file +} diff --git a/jackett/updater.json b/jackett/updater.json index 81ace3709..a7c9ffa0d 100644 --- a/jackett/updater.json +++ b/jackett/updater.json @@ -1,8 +1,8 @@ { - "last_update": "09-09-2022", + "last_update": "17-09-2022", "repository": "alexbelgium/hassio-addons", "slug": "jackett", "source": "github", "upstream_repo": "linuxserver/docker-jackett", - "upstream_version": "0.20.1853" + "upstream_version": "0.20.1907" } diff --git a/jellyfin/Dockerfile b/jellyfin/Dockerfile index 9d2498b73..204205515 100644 --- a/jellyfin/Dockerfile +++ b/jellyfin/Dockerfile @@ -35,14 +35,14 @@ RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ \ - # Create new config folder if needed - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ - \ # Allow UID and GID setting && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \ \ # Correct config location - && for file in $(grep -Esril '/config[ /]|/config$' /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ + \ + # Create new config folder if needed + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done diff --git a/lidarr/Dockerfile b/lidarr/Dockerfile index 9167c25a1..d4ed5a6d3 100644 --- a/lidarr/Dockerfile +++ b/lidarr/Dockerfile @@ -34,14 +34,14 @@ RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ \ - # Create new config folder if needed - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ - \ # Allow UID and GID setting && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \ \ # Correct config location - && for file in $(grep -Esril '/config[ /]|/config$' /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ + \ + # Create new config folder if needed + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done diff --git a/lidarr/config.json b/lidarr/config.json index ec7b8c331..d5af5862f 100644 --- a/lidarr/config.json +++ b/lidarr/config.json @@ -82,4 +82,4 @@ "url": "https://github.com/alexbelgium/hassio-addons/blob/master/lidarr/Readme.md", "version": "1.0.2.2592-ls96-bugfix", "webui": "[PROTO:ssl]://[HOST]:[PORT:8686]" -} \ No newline at end of file +} diff --git a/mylar3/Dockerfile b/mylar3/Dockerfile index 4e51e6b3f..f676ce357 100644 --- a/mylar3/Dockerfile +++ b/mylar3/Dockerfile @@ -34,14 +34,14 @@ RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ \ - # Create new config folder if needed - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ - \ # Allow UID and GID setting && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \ \ # Correct config location - && for file in $(grep -Esril '/config[ /]|/config$' /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ + \ + # Create new config folder if needed + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done diff --git a/mylar3/config.json b/mylar3/config.json index b9ef355c3..30a5ccec6 100644 --- a/mylar3/config.json +++ b/mylar3/config.json @@ -79,4 +79,4 @@ "url": "https://github.com/alexbelgium/hassio-addons", "version": "0.6.9-bugfix", "webui": "[PROTO:ssl]://[HOST]:[PORT:8090]" -} \ No newline at end of file +} diff --git a/nextcloud/README.md b/nextcloud/README.md index 4ae9ef3f2..819e88593 100644 --- a/nextcloud/README.md +++ b/nextcloud/README.md @@ -1,4 +1,3 @@ -## ⚠ Open Issue : [🐛 [Nextcloud] folder mounted in /mnt/Nextcloud does not exist, Nextcloud giving "Your data directory is readable by other users. Please change the permissions to 0770 so that the directory cannot be listed by other users." (opened 2022-09-11)](https://github.com/alexbelgium/hassio-addons/issues/473) by [@bobloadmire](https://github.com/bobloadmire) # Home assistant add-on: Nextcloud [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) diff --git a/nextcloud/config.json b/nextcloud/config.json index c8626ed25..3fd7aa547 100644 --- a/nextcloud/config.json +++ b/nextcloud/config.json @@ -103,6 +103,6 @@ "slug": "nextcloud_ocr", "uart": true, "url": "https://github.com/alexbelgium/hassio-addons/tree/master/nextcloud", - "version": "24.0.5-3", + "version": "24.0.5-6", "webui": "https://[HOST]:[PORT:443]" } diff --git a/nextcloud/rootfs/etc/cont-init.d/40-config.sh b/nextcloud/rootfs/etc/cont-init.d/93-config.sh similarity index 79% rename from nextcloud/rootfs/etc/cont-init.d/40-config.sh rename to nextcloud/rootfs/etc/cont-init.d/93-config.sh index acafe57fe..676c3f523 100644 --- a/nextcloud/rootfs/etc/cont-init.d/40-config.sh +++ b/nextcloud/rootfs/etc/cont-init.d/93-config.sh @@ -30,9 +30,9 @@ chmod -R 770 /data/config chmod -R 770 "$datadirectory" #Prevent permissions check -for files in /defaults/config.php /data/config/www/nextcloud/config/config.php -if [ -f "$files" ]; then -sed -i "/check_data_directory_permissions/d" "$files" -sed -i "/datadirectory/a 'check_data_directory_permissions' => true," "$files" -fi +for files in /defaults/config.php /data/config/www/nextcloud/config/config.php; do + if [ -f "$files" ]; then + sed -i "/check_data_directory_permissions/d" "$files" + sed -i "/datadirectory/a 'check_data_directory_permissions' => false," "$files" + fi done diff --git a/nextcloud/rootfs/etc/cont-init.d/50-install.sh b/nextcloud/rootfs/etc/cont-init.d/94-install.sh similarity index 100% rename from nextcloud/rootfs/etc/cont-init.d/50-install.sh rename to nextcloud/rootfs/etc/cont-init.d/94-install.sh diff --git a/nextcloud/rootfs/etc/cont-init.d/60-memcache.sh b/nextcloud/rootfs/etc/cont-init.d/94-memcache.sh similarity index 100% rename from nextcloud/rootfs/etc/cont-init.d/60-memcache.sh rename to nextcloud/rootfs/etc/cont-init.d/94-memcache.sh diff --git a/nzbget/Dockerfile b/nzbget/Dockerfile index f367feead..fdaaf2b44 100644 --- a/nzbget/Dockerfile +++ b/nzbget/Dockerfile @@ -38,14 +38,14 @@ RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ \ - # Create new config folder if needed - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ - \ # Allow UID and GID setting && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \ \ # Correct config location - && for file in $(grep -Esril '/config[ /]|/config$' /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ + \ + # Create new config folder if needed + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done diff --git a/omada/CHANGELOG.md b/omada/CHANGELOG.md index c37ef88b2..3219ee9ff 100644 --- a/omada/CHANGELOG.md +++ b/omada/CHANGELOG.md @@ -1,4 +1,13 @@ +## 5.5-chromium-amd64-2022-09-16 (2022-09-16) +- Update to latest version from mbentley/omada-controller + +## 5.5-chromium-amd64-2022-09-13 (2022-09-13) +- Update to latest version from mbentley/omada-controller + +## 5.5-chromium-amd64-2022-09-11 (2022-09-11) +- Update to latest version from mbentley/omada-controller + ## 5.5-chromium-amd64-2022-09-04 (2022-09-04) - Update to latest version from mbentley/omada-controller diff --git a/omada/Dockerfile b/omada/Dockerfile index 341f070bc..ad47300ed 100644 --- a/omada/Dockerfile +++ b/omada/Dockerfile @@ -16,7 +16,7 @@ ARG BUILD_FROM ARG BUILD_VERSION -ARG BUILD_UPSTREAM="5.5-chromium-amd64-2022-09-04" +ARG BUILD_UPSTREAM="5.5-chromium-amd64-2022-09-16" FROM ${BUILD_FROM} ################## diff --git a/omada/config.json b/omada/config.json index c20c769cc..0ed8d8db5 100644 --- a/omada/config.json +++ b/omada/config.json @@ -45,6 +45,6 @@ }, "slug": "omada", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "5.5-chromium-amd64-2022-09-04", + "version": "5.5-chromium-amd64-2022-09-16", "webui": "[PROTO:ssl]://[HOST]:[PORT:8088]" } diff --git a/omada/updater.json b/omada/updater.json index e6ff44447..6d92f4575 100644 --- a/omada/updater.json +++ b/omada/updater.json @@ -1,9 +1,9 @@ { "dockerhub_by_date": true, - "last_update": "2022-09-04", + "last_update": "2022-09-16", "repository": "alexbelgium/hassio-addons", "slug": "omada", "source": "dockerhub", "upstream_repo": "mbentley/omada-controller", - "upstream_version": "5.5-chromium-amd64-2022-09-04" + "upstream_version": "5.5-chromium-amd64-2022-09-16" } diff --git a/ombi/Dockerfile b/ombi/Dockerfile index 21b27c575..c8afeb003 100644 --- a/ombi/Dockerfile +++ b/ombi/Dockerfile @@ -34,14 +34,14 @@ RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ \ - # Create new config folder if needed - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ - \ # Allow UID and GID setting && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \ \ # Correct config location - && for file in $(grep -Esril '/config[ /]|/config$' /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ + \ + # Create new config folder if needed + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done diff --git a/ombi/config.json b/ombi/config.json index ac5c826f1..5053ea273 100644 --- a/ombi/config.json +++ b/ombi/config.json @@ -29,4 +29,4 @@ "url": "https://github.com/alexbelgium/hassio-addons/tree/master/ombi", "version": "4.22.5-bugfix", "webui": "[PROTO:ssl]://[HOST]:[PORT:3579]" -} \ No newline at end of file +} diff --git a/organizr/Dockerfile b/organizr/Dockerfile index 90e644627..276b53b6c 100644 --- a/organizr/Dockerfile +++ b/organizr/Dockerfile @@ -33,14 +33,14 @@ RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ \ - # Create new config folder if needed - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ - \ # Allow UID and GID setting && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \ \ # Correct config location - && for file in $(grep -Esril '/config[ /]|/config$' /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ + \ + # Create new config folder if needed + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done diff --git a/organizr/config.json b/organizr/config.json index c09540850..a8af4cf11 100644 --- a/organizr/config.json +++ b/organizr/config.json @@ -29,4 +29,4 @@ "url": "https://github.com/alexbelgium/hassio-addons", "version": "1.90-bugfix", "webui": "[PROTO:ssl]://[HOST]:[PORT:80]" -} \ No newline at end of file +} diff --git a/overseerr/Dockerfile b/overseerr/Dockerfile index 644606af0..da4324672 100644 --- a/overseerr/Dockerfile +++ b/overseerr/Dockerfile @@ -35,14 +35,14 @@ RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ \ - # Create new config folder if needed - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ - \ # Allow UID and GID setting && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \ \ # Correct config location - && for file in $(grep -Esril '/config[ /]|/config$' /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ + \ + # Create new config folder if needed + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done diff --git a/overseerr/README.md b/overseerr/README.md index 84c4a77c6..ce60d391d 100644 --- a/overseerr/README.md +++ b/overseerr/README.md @@ -1,3 +1,4 @@ +## ⚠ Open Issue : [🐛 Overseerr configfile location unwritable (opened 2022-09-13)](https://github.com/alexbelgium/hassio-addons/issues/478) by [@rjgout](https://github.com/rjgout) # Home assistant add-on: overseerr [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) diff --git a/overseerr/config.json b/overseerr/config.json index a1bd71eda..0151ad06a 100644 --- a/overseerr/config.json +++ b/overseerr/config.json @@ -17,9 +17,7 @@ ], "name": "Overseerr", "options": { - "CONFIG_LOCATION": "/config/addons_config/overseerr", - "PGID": 0, - "PUID": 0 + "CONFIG_LOCATION": "/config/addons_config/overseerr" }, "ports": { "5055/tcp": 5055 @@ -30,12 +28,10 @@ "privileged": [], "schema": { "CONFIG_LOCATION": "str", - "PGID": "int", - "PUID": "int", "TZ": "str?" }, "slug": "overseerr", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/overseerr", - "version": "1.29.1-bugfix", + "version": "1.29.1-3", "webui": "[PROTO:ssl]://[HOST]:[PORT:5055]" -} \ No newline at end of file +} diff --git a/overseerr/rootfs/etc/cont-init.d/00-config_location.sh b/overseerr/rootfs/etc/cont-init.d/00-config_location.sh index daf491450..6852da1a9 100644 --- a/overseerr/rootfs/etc/cont-init.d/00-config_location.sh +++ b/overseerr/rootfs/etc/cont-init.d/00-config_location.sh @@ -6,6 +6,8 @@ bashio::log.info "Config stored in $CONFIG_LOCATION" mkdir -p "$CONFIG_LOCATION" chown -R abc:abc "$CONFIG_LOCATION" +chmod -R 755 "$CONFIG_LOCATION" -sed -i "s|/config/addons_config/overseerr|$CONFIG_LOCATION|g" /etc/services.d/overseerr/run -sed -i "s|/config/addons_config/overseerr|$CONFIG_LOCATION|g" /etc/cont-init.d/30-config +for file in $(grep -Esril "/config/addons_config/overseerr" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do + sed -i "s=/config/addons_config/overseerr=$CONFIG_LOCATION=g" "$file" +done diff --git a/overseerr/rootfs/etc/cont-init.d/20-folders.sh b/overseerr/rootfs/etc/cont-init.d/20-folders.sh index e38c8a57d..7e2e4d168 100644 --- a/overseerr/rootfs/etc/cont-init.d/20-folders.sh +++ b/overseerr/rootfs/etc/cont-init.d/20-folders.sh @@ -5,4 +5,13 @@ if [ ! -d /config/addons_config/overseerr ]; then mkdir -p /config/addons_config/overseerr fi +if [ -d /config/addons_config/addons_config/overseerr ]; then + echo "Migrating data to /config/addons_config/overseerr" + mv /config/addons_config/addons_config/overseerr /config/addons_config/overseerr +fi + +for file in $(grep -Esril "/config/.config/yarn" /usr /etc /defaults); do + sed -i "s=/config/.config/yarn=/config/addons_config/overseerr/yarn=g" "$file" +done +yarn config set global-folder /config/addons_config/overseerr/yarn chown -R abc:abc /config/addons_config/overseerr diff --git a/paperless_ngx/CHANGELOG.md b/paperless_ngx/CHANGELOG.md index 649a4e2b4..53f4582ac 100644 --- a/paperless_ngx/CHANGELOG.md +++ b/paperless_ngx/CHANGELOG.md @@ -1,4 +1,7 @@ +## v1.8.0-ls29 (17-09-2022) +- Update to latest version from linuxserver/docker-paperless-ngx + ## v1.8.0-ls28 (09-09-2022) - Update to latest version from linuxserver/docker-paperless-ngx diff --git a/paperless_ngx/Dockerfile b/paperless_ngx/Dockerfile index d924262a1..37a25a4cd 100644 --- a/paperless_ngx/Dockerfile +++ b/paperless_ngx/Dockerfile @@ -34,14 +34,14 @@ RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ \ - # Create new config folder if needed - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ - \ # Allow UID and GID setting && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \ \ # Correct config location - && for file in $(grep -Esril '/config[ /]|/config$' /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ + \ + # Create new config folder if needed + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done diff --git a/paperless_ngx/config.json b/paperless_ngx/config.json index 484ea22d5..c8bef84cc 100644 --- a/paperless_ngx/config.json +++ b/paperless_ngx/config.json @@ -81,6 +81,6 @@ }, "slug": "paperless_ng", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "v1.8.0-ls28-bugfix", + "version": "v1.8.0-ls29", "webui": "[PROTO:ssl]://[HOST]:[PORT:8000]" -} \ No newline at end of file +} diff --git a/paperless_ngx/updater.json b/paperless_ngx/updater.json index 0c41edae3..816dd4e0e 100644 --- a/paperless_ngx/updater.json +++ b/paperless_ngx/updater.json @@ -1,9 +1,9 @@ { "github_fulltag": "true", - "last_update": "09-09-2022", + "last_update": "17-09-2022", "repository": "alexbelgium/hassio-addons", "slug": "paperless_ngx", "source": "github", "upstream_repo": "linuxserver/docker-paperless-ngx", - "upstream_version": "v1.8.0-ls28" + "upstream_version": "v1.8.0-ls29" } diff --git a/papermerge/Dockerfile b/papermerge/Dockerfile index 1c144ae30..456226fb4 100644 --- a/papermerge/Dockerfile +++ b/papermerge/Dockerfile @@ -41,14 +41,14 @@ RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ \ - # Create new config folder if needed - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ - \ # Allow UID and GID setting && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \ \ # Correct config location - && for file in $(grep -Esril '/config[ /]|/config$' /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ + \ + # Create new config folder if needed + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done diff --git a/papermerge/config.json b/papermerge/config.json index c4ea8fc5b..ef1e4452d 100644 --- a/papermerge/config.json +++ b/papermerge/config.json @@ -52,4 +52,4 @@ "url": "https://github.com/alexbelgium/hassio-addons", "version": "v2.0.1-ls60-bugfix", "webui": "[PROTO:ssl]://[HOST]:[PORT:8000]" -} \ No newline at end of file +} diff --git a/piwigo/Dockerfile b/piwigo/Dockerfile index a1d6455ce..42153cd7a 100644 --- a/piwigo/Dockerfile +++ b/piwigo/Dockerfile @@ -34,14 +34,14 @@ RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ \ - # Create new config folder if needed - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ - \ # Allow UID and GID setting && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \ \ # Correct config location - && for file in $(grep -Esril '/config[ /]|/config$' /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ + \ + # Create new config folder if needed + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done diff --git a/plex/Dockerfile b/plex/Dockerfile index ac412353e..3cb55bef0 100644 --- a/plex/Dockerfile +++ b/plex/Dockerfile @@ -43,14 +43,14 @@ RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ \ - # Create new config folder if needed - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ - \ # Allow UID and GID setting && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \ \ # Correct config location - && for file in $(grep -Esril '/config[ /]|/config$' /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ + \ + # Create new config folder if needed + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done diff --git a/plex/README.md b/plex/README.md index 1a500cd07..64032d893 100644 --- a/plex/README.md +++ b/plex/README.md @@ -1,4 +1,3 @@ -## ⚠ Open Issue : [🐛 [Plex] Upgrade failure (opened 2022-09-05)](https://github.com/alexbelgium/hassio-addons/issues/463) by [@pssc](https://github.com/pssc) # Home assistant add-on: plex [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) diff --git a/plex/config.json b/plex/config.json index fb0899ba5..710e7cae1 100644 --- a/plex/config.json +++ b/plex/config.json @@ -118,4 +118,4 @@ "version": "1.28.2.6151-914ddd2b3-ls131-2-bugfix", "video": true, "webui": "[PROTO:ssl]://[HOST]:[PORT:32400]/web" -} \ No newline at end of file +} diff --git a/plex_meta_manager/Dockerfile b/plex_meta_manager/Dockerfile index cdec87fee..64122d41c 100644 --- a/plex_meta_manager/Dockerfile +++ b/plex_meta_manager/Dockerfile @@ -42,14 +42,14 @@ RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ \ - # Create new config folder if needed - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ - \ # Allow UID and GID setting && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \ \ # Correct config location - && for file in $(grep -Esril '/config[ /]|/config$' /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ + \ + # Create new config folder if needed + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done diff --git a/portainer/CHANGELOG.md b/portainer/CHANGELOG.md index ca59cb697..07fe1094a 100644 --- a/portainer/CHANGELOG.md +++ b/portainer/CHANGELOG.md @@ -1,4 +1,7 @@ +## 2.15.1 (17-09-2022) +- Update to latest version from portainer/portainer + ## 2.15.0 (09-09-2022) - Update to latest version from portainer/portainer diff --git a/portainer/Dockerfile b/portainer/Dockerfile index 305899297..b8a0086db 100644 --- a/portainer/Dockerfile +++ b/portainer/Dockerfile @@ -30,7 +30,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ SHELL ["/bin/bash", "-o", "pipefail", "-c"] # Setup base -ARG BUILD_UPSTREAM="2.15.0" +ARG BUILD_UPSTREAM="2.15.1" # spellcheck disable=SC2015 # hadolint ignore=SC2015 diff --git a/portainer/config.json b/portainer/config.json index 4068201b4..ed1969962 100644 --- a/portainer/config.json +++ b/portainer/config.json @@ -44,5 +44,5 @@ }, "slug": "portainer", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "2.15.0" + "version": "2.15.1" } diff --git a/portainer/updater.json b/portainer/updater.json index 8a43d00f3..4e9eed07e 100644 --- a/portainer/updater.json +++ b/portainer/updater.json @@ -1,9 +1,9 @@ { "github_havingasset": "true", - "last_update": "09-09-2022", + "last_update": "17-09-2022", "repository": "alexbelgium/hassio-addons", "slug": "portainer", "source": "github", "upstream_repo": "portainer/portainer", - "upstream_version": "2.15.0" + "upstream_version": "2.15.1" } diff --git a/prowlarr/CHANGELOG.md b/prowlarr/CHANGELOG.md index 46cc3be15..a146da31f 100644 --- a/prowlarr/CHANGELOG.md +++ b/prowlarr/CHANGELOG.md @@ -1,3 +1,9 @@ + +## nightly-0.4.6.1969-ls408 (15-09-2022) +- Update to latest version from linuxserver/docker-prowlarr + +## nightly-0.4.6.1965-ls406 (13-09-2022) +- Update to latest version from linuxserver/docker-prowlarr - New feature : localdisks mounting added ## nightly-0.4.5.1960-ls404 (09-09-2022) diff --git a/prowlarr/Dockerfile b/prowlarr/Dockerfile index 2d906b5de..11314b1b7 100644 --- a/prowlarr/Dockerfile +++ b/prowlarr/Dockerfile @@ -34,14 +34,14 @@ RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ \ - # Create new config folder if needed - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ - \ # Allow UID and GID setting && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \ \ # Correct config location - && for file in $(grep -Esril '/config[ /]|/config$' /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ + \ + # Create new config folder if needed + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done diff --git a/prowlarr/README.md b/prowlarr/README.md index 02545cf50..4b3beebbd 100644 --- a/prowlarr/README.md +++ b/prowlarr/README.md @@ -1,5 +1,4 @@ ## ⚠ Open Request : [✨ [REQUEST] Prowlarr add localdisk (opened 2022-08-16)](https://github.com/alexbelgium/hassio-addons/issues/429) by [@crowley666x](https://github.com/crowley666x) -## ⚠ Open Issue : [🐛 [Prowlarr NAS] No install/install failure (opened 2022-09-05)](https://github.com/alexbelgium/hassio-addons/issues/464) by [@Goris8](https://github.com/Goris8) # Home assistant add-on: Prowlarr diff --git a/prowlarr/config.json b/prowlarr/config.json index c2a948c4f..d068e7d3e 100644 --- a/prowlarr/config.json +++ b/prowlarr/config.json @@ -92,6 +92,6 @@ }, "slug": "prowlarr", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "nightly-0.4.5.1960-ls404-2-bugfix", + "version": "nightly-0.4.6.1969-ls408", "webui": "[PROTO:ssl]://[HOST]:[PORT:9696]" -} \ No newline at end of file +} diff --git a/prowlarr/updater.json b/prowlarr/updater.json index c29b8ebd6..9a19bf6c5 100644 --- a/prowlarr/updater.json +++ b/prowlarr/updater.json @@ -1,10 +1,10 @@ { "github_beta": "true", "github_fulltag": "true", - "last_update": "09-09-2022", + "last_update": "15-09-2022", "repository": "alexbelgium/hassio-addons", "slug": "prowlarr", "source": "github", "upstream_repo": "linuxserver/docker-prowlarr", - "upstream_version": "nightly-0.4.5.1960-ls404" + "upstream_version": "nightly-0.4.6.1969-ls408" } diff --git a/qbittorrent/CHANGELOG.md b/qbittorrent/CHANGELOG.md index c45dadd47..4ee740ed0 100644 --- a/qbittorrent/CHANGELOG.md +++ b/qbittorrent/CHANGELOG.md @@ -1,3 +1,6 @@ + +## 4.4.5-r0-ls215 (13-09-2022) +- Update to latest version from linuxserver/docker-qbittorrent - Config folder moved to /config/addons_config/qBittorrent ## 4.4.5-r0-ls214 (09-09-2022) diff --git a/qbittorrent/Dockerfile b/qbittorrent/Dockerfile index 11931fd78..31de53737 100644 --- a/qbittorrent/Dockerfile +++ b/qbittorrent/Dockerfile @@ -16,7 +16,7 @@ ARG BUILD_FROM ARG BUILD_VERSION -ARG BUILD_UPSTREAM="4.4.5-r0-ls214" +ARG BUILD_UPSTREAM="4.4.5-r0-ls215" FROM ${BUILD_FROM}-$BUILD_UPSTREAM ################## @@ -57,14 +57,14 @@ RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ \ - # Create new config folder if needed - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ - \ # Allow UID and GID setting && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \ \ # Correct config location - && for file in $(grep -Esril '/config[ /]|/config$' /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ + \ + # Create new config folder if needed + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done \ diff --git a/qbittorrent/README.md b/qbittorrent/README.md index 13bddfa96..9b0665144 100644 --- a/qbittorrent/README.md +++ b/qbittorrent/README.md @@ -1,4 +1,3 @@ -## ⚠ Open Issue : [🐛 [Qbittorrent] New build ignores config/save path (opened 2022-09-09)](https://github.com/alexbelgium/hassio-addons/issues/470) by [@deku-m](https://github.com/deku-m) # Home assistant add-on: qbittorrent [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) diff --git a/qbittorrent/config.json b/qbittorrent/config.json index b67d03fae..39cbe20cd 100644 --- a/qbittorrent/config.json +++ b/qbittorrent/config.json @@ -115,5 +115,5 @@ }, "slug": "qbittorrent", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "4.4.5-r0-ls214-2-bugfix3" -} \ No newline at end of file + "version": "4.4.5-r0-ls215" +} diff --git a/qbittorrent/rootfs/etc/cont-init.d/91-qbittorrent_configuration.sh b/qbittorrent/rootfs/etc/cont-init.d/91-qbittorrent_configuration.sh index 2f7573bff..9dcd71e22 100644 --- a/qbittorrent/rootfs/etc/cont-init.d/91-qbittorrent_configuration.sh +++ b/qbittorrent/rootfs/etc/cont-init.d/91-qbittorrent_configuration.sh @@ -40,7 +40,7 @@ if bashio::config.has_value 'SavePath'; then # Replace save path CURRENTSAVEPATH=$(sed -n '/Downloads\\SavePath/p' qBittorrent.conf) sed -i "s|${CURRENTSAVEPATH#*=}|$DOWNLOADS|g" qBittorrent.conf || \ - sed -i "${LINE}a Downloads\\SavePath\\$DOWNLOADS" qBittorrent.conf + sed -i "${LINE}a Downloads\\SavePath\\$DOWNLOADS" qBittorrent.conf # Replace session save path CURRENTSAVEPATH=$(sed -n '/Session\\DefaultSavePath/p' qBittorrent.conf) diff --git a/qbittorrent/updater.json b/qbittorrent/updater.json index 9a68654b2..d8ecc4d56 100644 --- a/qbittorrent/updater.json +++ b/qbittorrent/updater.json @@ -1,9 +1,9 @@ { "github_fulltag": "true", - "last_update": "09-09-2022", + "last_update": "13-09-2022", "repository": "alexbelgium/hassio-addons", "slug": "qbittorrent", "source": "github", "upstream_repo": "linuxserver/docker-qbittorrent", - "upstream_version": "4.4.5-r0-ls214" + "upstream_version": "4.4.5-r0-ls215" } diff --git a/radarr/Dockerfile b/radarr/Dockerfile index c4bdc3206..ac6c70b04 100644 --- a/radarr/Dockerfile +++ b/radarr/Dockerfile @@ -34,14 +34,14 @@ RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ \ - # Create new config folder if needed - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ - \ # Allow UID and GID setting && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \ \ # Correct config location - && for file in $(grep -Esril '/config[ /]|/config$' /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ + \ + # Create new config folder if needed + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done diff --git a/radarr/config.json b/radarr/config.json index ce499f234..19e87b055 100644 --- a/radarr/config.json +++ b/radarr/config.json @@ -83,4 +83,4 @@ "url": "https://github.com/alexbelgium/hassio-addons/tree/master/radarr", "version": "4.1.0.6175-bugfix", "webui": "[PROTO:ssl]://[HOST]:[PORT:7878]" -} \ No newline at end of file +} diff --git a/readarr/Dockerfile b/readarr/Dockerfile index d56b6a520..fdf4e1192 100644 --- a/readarr/Dockerfile +++ b/readarr/Dockerfile @@ -35,14 +35,14 @@ RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ \ - # Create new config folder if needed - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ - \ # Allow UID and GID setting && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \ \ # Correct config location - && for file in $(grep -Esril '/config[ /]|/config$' /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ + \ + # Create new config folder if needed + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done diff --git a/readarr/config.json b/readarr/config.json index f0e75e582..fe19064a6 100644 --- a/readarr/config.json +++ b/readarr/config.json @@ -80,4 +80,4 @@ "url": "https://github.com/alexbelgium/hassio-addons/tree/master/readarr", "version": "nightly-0.1.1.1409-ls135-bugfix", "webui": "[PROTO:ssl]://[HOST]:[PORT:8787]" -} \ No newline at end of file +} diff --git a/requestrr/Dockerfile b/requestrr/Dockerfile index b29bae8f7..5cdf17e47 100644 --- a/requestrr/Dockerfile +++ b/requestrr/Dockerfile @@ -34,14 +34,14 @@ RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ \ - # Create new config folder if needed - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ - \ # Allow UID and GID setting && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \ \ # Correct config location - && for file in $(grep -Esril '/config[ /]|/config$' /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ + \ + # Create new config folder if needed + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done diff --git a/requestrr/config.json b/requestrr/config.json index 017a40378..31034ae99 100644 --- a/requestrr/config.json +++ b/requestrr/config.json @@ -36,4 +36,4 @@ "url": "https://github.com/alexbelgium/hassio-addons", "version": "2.1.2-3-bugfix", "webui": "[PROTO:ssl]://[HOST]:[PORT:4545]" -} \ No newline at end of file +} diff --git a/resiliosync/Dockerfile b/resiliosync/Dockerfile index 10ba47017..66ab54f92 100644 --- a/resiliosync/Dockerfile +++ b/resiliosync/Dockerfile @@ -44,14 +44,14 @@ RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ \ - # Create new config folder if needed - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ - \ # Allow UID and GID setting && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \ \ # Correct config location - && for file in $(grep -Esril '/config[ /]|/config$' /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ + \ + # Create new config folder if needed + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done diff --git a/seafile/Dockerfile b/seafile/Dockerfile index 49bcfeff9..6af59b39f 100644 --- a/seafile/Dockerfile +++ b/seafile/Dockerfile @@ -30,6 +30,8 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ ENV LANG C.UTF-8 +USER root + ################## # 3 Install apps # ################## diff --git a/seafile/README.md b/seafile/README.md index 9a3c92ffd..3031145b1 100644 --- a/seafile/README.md +++ b/seafile/README.md @@ -1,3 +1,4 @@ +## ⚠ Open Issue : [🐛 [SEAFILE] Error: Failed to prepare seahub avatars dir: [Errno 95] Operation not supported: '../../../seahub-data/avatars' -> '/opt/seafile/seafile-server-9.0.8/seahub/media/avatars' (opened 2022-09-12)](https://github.com/alexbelgium/hassio-addons/issues/475) by [@bobloadmire](https://github.com/bobloadmire) # Home assistant add-on: seafile [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) diff --git a/seafile/build.json b/seafile/build.json index 7d32bce02..ec4fdcbd7 100644 --- a/seafile/build.json +++ b/seafile/build.json @@ -1,8 +1,7 @@ { "build_from": { "aarch64": "franchetti/seafile-arm:latest", - "amd64": "franchetti/seafile-arm:latest", - "armv7": "franchetti/seafile-arm:latest" + "amd64": "franchetti/seafile-arm:latest" }, "codenotary": { "signer": "alexandrep.github@gmail.com" diff --git a/seafile/config.json b/seafile/config.json index c7f73843f..5464932f0 100644 --- a/seafile/config.json +++ b/seafile/config.json @@ -41,19 +41,20 @@ "/dev/nvme2" ], "environment": { - "NOSWAG": "1" + "NOSWAG": "1", + "PGID": "1000", + "PUID": "1000" }, "image": "ghcr.io/alexbelgium/seafile-{arch}", "map": [ - "media:rw", - "share:rw", "config:rw", + "share:rw", "ssl" ], "name": "Seafile", "options": { - "PGID": "0", - "PUID": "0", + "PGID": 1000, + "PUID": 1000, "SEAFILE_ADMIN_EMAIL": "me@example.com", "SEAFILE_ADMIN_PASSWORD": "a_very_secret_password", "TZ": "Europe/Paris", @@ -94,6 +95,6 @@ ], "slug": "seafile", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/seafile", - "version": "v9.0.8-pro", + "version": "v9.0.8-2", "webui": "[PROTO:ssl]://[HOST]:[PORT:8000]" -} \ No newline at end of file +} diff --git a/seafile/rootfs/defaults/.env.example b/seafile/rootfs/defaults/.env.example index 05ad01dc5..25d51547c 100644 --- a/seafile/rootfs/defaults/.env.example +++ b/seafile/rootfs/defaults/.env.example @@ -10,8 +10,8 @@ NOSWAG_PORT=80 ### Run parameters -PUID=1000 -PGID=1000 +PUID=0 +PGID=0 TZ=Europe/Zurich URL=your.domain diff --git a/seafile/rootfs/etc/cont-init.d/99-run.sh b/seafile/rootfs/etc/cont-init.d/99-run.sh index 1d512f54b..12081b360 100644 --- a/seafile/rootfs/etc/cont-init.d/99-run.sh +++ b/seafile/rootfs/etc/cont-init.d/99-run.sh @@ -39,22 +39,30 @@ done bashio::log.info "Setting data location" DATA_LOCATION=$(bashio::config 'data_location') -echo "Check $DATA_LOCATION folder exists" +echo "... check $DATA_LOCATION folder exists" mkdir -p "$DATA_LOCATION" -echo "Setting permissions" -chown -R "$(bashio::config 'PUID'):$(bashio::config 'PGID')" "$DATA_LOCATION" -chmod -R 755 "$DATA_LOCATION" +echo "... setting permissions" +chown -R seafile:seafile "$DATA_LOCATION" -echo "Creating symlink" -ln -sf "$DATA_LOCATION" /shared +echo "... copy media files" +#cp -rnf /opt/seafile/media/* "$DATA_LOCATION"/media +#rm -r /opt/seafile/media -#export SEAFILE_CONF_DIR="$DATA_LOCATION/conf" && sed -i "1a export SEAFILE_CONF_DIR=$DATA_LOCATION/conf" /home/seafile/*.sh -#export SEAFILE_LOGS_DIR="$DATA_LOCATION/logs" && sed -i "1a export SEAFILE_LOGS_DIR=$DATA_LOCATION/logs" /home/seafile/*.sh -#export SEAFILE_DATA_DIR="$DATA_LOCATION/seafile-data" && sed -i "1a export SEAFILE_DATA_DIR=$DATA_LOCATION/seafile-data" /home/seafile/*.sh -#export SEAFILE_SEAHUB_DIR="$DATA_LOCATION/seahub-data" && sed -i "1a export SEAFILE_SEAHUB_DIR=$DATA_LOCATION/seahub-data" /home/seafile/*.sh -#export SEAFILE_SQLITE_DIR="$DATA_LOCATION/sqlite" && sed -i "1a export SEAFILE_SQLITE_DIR=$DATA_LOCATION/sqlite" /home/seafile/*.sh -export DATABASE_DIR="$DATA_LOCATION/db" && sed -i "1a export DATABASE_DIR=$DATA_LOCATION/db" /home/seafile/*.sh +#echo "... creating symlink" +#dirs=("conf" "logs" "media" "seafile-data" "seahub-data" "sqlite") +#for dir in "${dirs[@]}" +#do +# mkdir -p "$DATA_LOCATION/$dir" +# chown -R seafile:seafile "$DATA_LOCATION/$dir" +# ln -fs "$DATA_LOCATION/$dir" /shared +# rm /shared/"$dir" +#done + +echo "... correcting official script" +sed -i "s|/shared|$DATA_LOCATION|g" /docker_entrypoint.sh +sed -i "s|/shared|$DATA_LOCATION|g" /home/seafile/*.sh +#sed -i "s=cp -r ./media $DATA_LOCATION/=chown -R seafile:seafile $DATA_LOCATION/* && chmod -R 777 $DATA_LOCATION/media && cp -rnf ./media/. $DATA_LOCATION/media ||true=g" /home/seafile/*.sh ################### # Define database # diff --git a/sonarr/Dockerfile b/sonarr/Dockerfile index 85011018d..ffcad98ef 100644 --- a/sonarr/Dockerfile +++ b/sonarr/Dockerfile @@ -35,14 +35,14 @@ RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ \ - # Create new config folder if needed - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ - \ # Allow UID and GID setting && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \ \ # Correct config location - && for file in $(grep -Esril '/config[ /]|/config$' /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ + \ + # Create new config folder if needed + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done diff --git a/sonarr/config.json b/sonarr/config.json index 20189f40e..1878ba888 100644 --- a/sonarr/config.json +++ b/sonarr/config.json @@ -83,4 +83,4 @@ "url": "https://github.com/alexbelgium/hassio-addons/tree/master/sonarr", "version": "3.0.9.1549-2-bugfix", "webui": "[PROTO:ssl]://[HOST]:[PORT:8989]" -} \ No newline at end of file +} diff --git a/tandoor_recipes/CHANGELOG.md b/tandoor_recipes/CHANGELOG.md index e404d38b2..68c1fbdb1 100644 --- a/tandoor_recipes/CHANGELOG.md +++ b/tandoor_recipes/CHANGELOG.md @@ -1,3 +1,4 @@ +- Allow nabucasa url - Ingress addition ## 1.3.3 (04-08-2022) diff --git a/tandoor_recipes/config.json b/tandoor_recipes/config.json index 2ffac9e26..93aa6a959 100644 --- a/tandoor_recipes/config.json +++ b/tandoor_recipes/config.json @@ -45,5 +45,5 @@ ], "slug": "tandoor_recipes", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "1.3.3-ingress" + "version": "1.3.3-ingress2" } diff --git a/tandoor_recipes/rootfs/etc/nginx/servers/ingress.conf b/tandoor_recipes/rootfs/etc/nginx/servers/ingress.conf index 9c0ad6869..5552aabe6 100644 --- a/tandoor_recipes/rootfs/etc/nginx/servers/ingress.conf +++ b/tandoor_recipes/rootfs/etc/nginx/servers/ingress.conf @@ -41,7 +41,7 @@ server { proxy_set_header X-Port $x_port; proxy_set_header X-Forwarded-Proto $x_scheme; - proxy_set_header Host $x_host$x_port; # try $host instead if this doesn't work + proxy_set_header Host $host$x_port; # try $host instead if this doesn't work # Correct url without port when using https sub_filter_once off; diff --git a/transmission/Dockerfile b/transmission/Dockerfile index 396f83032..f2c685b41 100644 --- a/transmission/Dockerfile +++ b/transmission/Dockerfile @@ -34,14 +34,14 @@ RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ \ - # Create new config folder if needed - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ - \ # Allow UID and GID setting && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \ \ # Correct config location - && for file in $(grep -Esril '/config[ /]|/config$' /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ + \ + # Create new config folder if needed + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done diff --git a/ubooquity/Dockerfile b/ubooquity/Dockerfile index f4d493fd9..8b45b21a9 100644 --- a/ubooquity/Dockerfile +++ b/ubooquity/Dockerfile @@ -44,14 +44,14 @@ RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ \ - # Create new config folder if needed - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ - \ # Allow UID and GID setting && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \ \ # Correct config location - && for file in $(grep -Esril '/config[ /]|/config$' /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ + \ + # Create new config folder if needed + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done diff --git a/webtop_kde/Dockerfile b/webtop_kde/Dockerfile index 1d05008e0..3ac09b31c 100644 --- a/webtop_kde/Dockerfile +++ b/webtop_kde/Dockerfile @@ -47,14 +47,14 @@ RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ \ - # Create new config folder if needed - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ - \ # Allow UID and GID setting && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \ \ # Correct config location - && for file in $(grep -Esril '/config[ /]|/config$' /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ + \ + # Create new config folder if needed + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done diff --git a/webtrees/config.json b/webtrees/config.json index 2b891b94d..39a2f751c 100644 --- a/webtrees/config.json +++ b/webtrees/config.json @@ -98,4 +98,4 @@ "url": "https://github.com/alexbelgium/hassio-addons", "version": "v2.1.7", "webui": "[PROTO:ssl]://[HOST]:[PORT:80]" -} \ No newline at end of file +} diff --git a/xteve/config.json b/xteve/config.json index d2245033e..f8c9ce78a 100644 --- a/xteve/config.json +++ b/xteve/config.json @@ -26,4 +26,4 @@ "url": "https://github.com/alexbelgium/hassio-addons", "version": "2.5.2", "webui": "[PROTO:ssl]://[HOST]:[PORT:34400]/web" -} \ No newline at end of file +}