diff --git a/.github/linters/.gitleaks.toml b/.github/linters/.gitleaks.toml new file mode 100644 index 000000000..609662ad9 --- /dev/null +++ b/.github/linters/.gitleaks.toml @@ -0,0 +1,10 @@ +title = "gitleaks config" + +[extend] +# useDefault will extend the base configuration with the default gitleaks config: +# https://github.com/zricethezav/gitleaks/blob/master/config/gitleaks.toml +useDefault = false + +[allowlist] +description = "global allowlist. whitelisting paths" +paths = ['''/github/workspace/epicgamesfree/templates/config.json'''] diff --git a/.templates/90-config_yaml.sh b/.templates/90-config_yaml.sh index f91b46d28..18915bb42 100644 --- a/.templates/90-config_yaml.sh +++ b/.templates/90-config_yaml.sh @@ -40,7 +40,7 @@ else fi # Need to restart bashio::log.fatal "Config file not found, creating a new one. Please customize the file in $CONFIGSOURCE before restarting." - # bashio::exit.nok + bashio::addon.stop fi # Permissions diff --git a/.templates/92-local_mounts.sh b/.templates/92-local_mounts.sh index 0edb9d349..177b786d8 100644 --- a/.templates/92-local_mounts.sh +++ b/.templates/92-local_mounts.sh @@ -44,7 +44,8 @@ if bashio::config.has_value 'localdisks'; then [ -d /share/"$disk" ] && mount "$devpath"/"$disk" /share/"$disk" || true # Mount # shellcheck disable=SC2015 - mount "$devpath"/"$disk" -o "uid=$PUID,gid=$PGID" /mnt/"$disk" && bashio::log.info "Success! $disk mounted to /mnt/$disk" || (bashio::log.fatal "Unable to mount local drives! Please check the name." && rmdir /mnt/$disk) + mount "$devpath"/"$disk" -o "uid=$PUID,gid=$PGID" /mnt/"$disk" && bashio::log.info "Success! $disk mounted to /mnt/$disk" || \ + mount "$devpath"/"$disk" /mnt/"$disk" && bashio::log.info "Success! $disk mounted to /mnt/$disk" && bashio::log.info "Success! $disk mounted to /mnt/$disk" || (bashio::log.fatal "Unable to mount local drives! Please check the name." && rmdir /mnt/$disk) done diff --git a/README.md b/README.md index b1f520353..a452cffaf 100644 --- a/README.md +++ b/README.md @@ -75,7 +75,7 @@ If you want to do add the repository manually, please follow the procedure highl ![Update](https://img.shields.io/badge/dynamic/json?label=Updated&query=%24.last_update&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fcalibre%2Fupdater.json) ![aarch64][aarch64-badge] ![amd64][amd64-badge] -![armv7no][armv7no-badge] +![armv7][armv7-badge] ![ingress][ingress-badge] ![smb][smb-badge] ![localdisks][localdisks-badge] @@ -148,7 +148,7 @@ If you want to do add the repository manually, please follow the procedure highl ![armv7][armv7-badge] ![mqtt][mqtt-badge] -✓ [Epic Games Free](epicgamesfree/) : Automatically login and redeem promotional free games from the Epic Games Store +✓ [Epic Games Free](epicgamesfree/) : Automatically login and redeem promotional free games from Epic Games Store   ![Version](https://img.shields.io/badge/dynamic/json?label=Version&query=%24.version&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fepicgamesfree%2Fconfig.json) ![Update](https://img.shields.io/badge/dynamic/json?label=Updated&query=%24.last_update&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fepicgamesfree%2Fupdater.json) @@ -625,7 +625,7 @@ If you want to do add the repository manually, please follow the procedure highl ![Update](https://img.shields.io/badge/dynamic/json?label=Updated&query=%24.last_update&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Funpackerr%2Fupdater.json) ![aarch64][aarch64-badge] ![amd64][amd64-badge] -![armv7][armv7-badge] +![armv7no][armv7no-badge] ✓ [Vaultwarden (Bitwarden)](bitwarden/) : Open source password management solution diff --git a/bazarr/Dockerfile b/bazarr/Dockerfile index 04b30dd00..e90435e3b 100644 --- a/bazarr/Dockerfile +++ b/bazarr/Dockerfile @@ -30,22 +30,22 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # Global LSIO modifications ARG CONFIGLOCATION="/config/addons_config/bazarr" -# hadolint ignore=SC2015, SC2013 +# hadolint ignore=SC2015, SC2013, SC2086, SC2086 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 \ + 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" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + && for file in $(grep -srl "PUID" /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" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $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 -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $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 + && for file 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}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done ################## # 3 Install apps # diff --git a/bitwarden/README.md b/bitwarden/README.md index 98b96cc53..4c2d49e0d 100644 --- a/bitwarden/README.md +++ b/bitwarden/README.md @@ -1,7 +1,6 @@ # Home assistant add-on: Vaultwarden (Bitwarden RS) -IT IS RECOMMENDED TO USE THE OFFICIAL ADDON (https://github.com/hassio-addons/addon-bitwarden) INSTEAD OF THIS FORK. -THE ONLY BENEFIT OF THIS FORK IS AUTOMATED RELEASES, NOW IMPLEMENTED IN THE OFFICAL ONE. +# ⚠️ It is recommended to use the official addon (https://github.com/hassio-addons/addon-bitwarden) instead of this fork. The only benefit of this fork is automated releases, now implemented in the offical one. ⚠️ [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) @@ -17,7 +16,6 @@ THE ONLY BENEFIT OF THIS FORK IS AUTOMATED RELEASES, NOW IMPLEMENTED IN THE OFFI _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ - [![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) ## About diff --git a/booksonic_air/CHANGELOG.md b/booksonic_air/CHANGELOG.md index c7f2df640..3c04711d7 100644 --- a/booksonic_air/CHANGELOG.md +++ b/booksonic_air/CHANGELOG.md @@ -1,4 +1,7 @@ +## v2201.1.0-ls72 (01-11-2022) +- Update to latest version from linuxserver/docker-booksonic-air + ## v2201.1.0-ls71 (18-10-2022) - Update to latest version from linuxserver/docker-booksonic-air diff --git a/booksonic_air/Dockerfile b/booksonic_air/Dockerfile index c57192e04..db3e4c4db 100644 --- a/booksonic_air/Dockerfile +++ b/booksonic_air/Dockerfile @@ -32,22 +32,22 @@ ENV BOOKSONIC_AIR_SETTINGS="/data" # Global LSIO modifications ARG CONFIGLOCATION="/data" -# hadolint ignore=SC2015, SC2013 +# hadolint ignore=SC2015, SC2013, SC2086 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 \ + 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" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + && for file in $(grep -srl "PUID" /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" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $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 -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $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 + && for file 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}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done ################## # 3 Install apps # diff --git a/booksonic_air/config.json b/booksonic_air/config.json index fdd075126..4b249762c 100644 --- a/booksonic_air/config.json +++ b/booksonic_air/config.json @@ -78,6 +78,6 @@ }, "slug": "booksonic-air_nas", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/booksonic_air", - "version": "v2201.1.0-ls71", + "version": "v2201.1.0-ls72", "webui": "[PROTO:ssl]://[HOST]:[PORT:4040]" } diff --git a/booksonic_air/updater.json b/booksonic_air/updater.json index 4a2e83cd8..3f4912618 100644 --- a/booksonic_air/updater.json +++ b/booksonic_air/updater.json @@ -1,9 +1,9 @@ { "github_fulltag": "true", - "last_update": "18-10-2022", + "last_update": "01-11-2022", "repository": "alexbelgium/hassio-addons", "slug": "booksonic_air", "source": "github", "upstream_repo": "linuxserver/docker-booksonic-air", - "upstream_version": "v2201.1.0-ls71" + "upstream_version": "v2201.1.0-ls72" } diff --git a/calibre/CHANGELOG.md b/calibre/CHANGELOG.md index 33fdd7739..74794f9ee 100644 --- a/calibre/CHANGELOG.md +++ b/calibre/CHANGELOG.md @@ -1,4 +1,13 @@ +## v6.7.1-ls190 (01-11-2022) +- Update to latest version from linuxserver/docker-calibre + +## v6.7.1-ls189 (25-10-2022) +- Update to latest version from linuxserver/docker-calibre + +## v6.7.1-ls188 (20-10-2022) +- Update to latest version from linuxserver/docker-calibre + ## v6.7.1-ls186 (18-10-2022) - Update to latest version from linuxserver/docker-calibre diff --git a/calibre/Dockerfile b/calibre/Dockerfile index b046b5ff6..6d8cc83c3 100644 --- a/calibre/Dockerfile +++ b/calibre/Dockerfile @@ -31,22 +31,22 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # Global LSIO modifications ARG CONFIGLOCATION="/config/addons_config/calibre" -# hadolint ignore=SC2015, SC2013 +# hadolint ignore=SC2015, SC2013, SC2086 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 \ + 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" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + && for file in $(grep -srl "PUID" /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" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $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 -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $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 + && for file 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}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done # Specific images modifications RUN \ diff --git a/calibre/config.json b/calibre/config.json index 49725b327..5bfdeb778 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.7.1-ls186", + "version": "v6.7.1-ls190", "video": true } diff --git a/calibre/updater.json b/calibre/updater.json index aba1ca973..b05856951 100644 --- a/calibre/updater.json +++ b/calibre/updater.json @@ -1,10 +1,10 @@ { "github_fulltag": "true", - "last_update": "18-10-2022", + "last_update": "01-11-2022", "paused": false, "repository": "alexbelgium/hassio-addons", "slug": "calibre", "source": "github", "upstream_repo": "linuxserver/docker-calibre", - "upstream_version": "v6.7.1-ls186" + "upstream_version": "v6.7.1-ls190" } diff --git a/calibre_web/CHANGELOG.md b/calibre_web/CHANGELOG.md index b19c5459c..d31950366 100644 --- a/calibre_web/CHANGELOG.md +++ b/calibre_web/CHANGELOG.md @@ -1,4 +1,16 @@ +## 0.6.19-ls182 (02-11-2022) +- Update to latest version from linuxserver/docker-calibre-web + +## 0.6.19-ls181 (27-10-2022) +- Update to latest version from linuxserver/docker-calibre-web + +## 0.6.19-ls180 (25-10-2022) +- Update to latest version from linuxserver/docker-calibre-web + +## 0.6.19-ls179 (20-10-2022) +- Update to latest version from linuxserver/docker-calibre-web + ## 0.6.19-ls178 (13-10-2022) - Update to latest version from linuxserver/docker-calibre-web diff --git a/calibre_web/Dockerfile b/calibre_web/Dockerfile index 6159bc0e7..ec4edad51 100644 --- a/calibre_web/Dockerfile +++ b/calibre_web/Dockerfile @@ -31,22 +31,22 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # Global LSIO modifications ARG CONFIGLOCATION="/config/addons_config/calibre-web" -# hadolint ignore=SC2015, SC2013 +# hadolint ignore=SC2015, SC2013, SC2086 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 \ + 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" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + && for file in $(grep -srl "PUID" /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" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $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 -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $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 + && for file 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}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done # Specific images modifications RUN \ diff --git a/calibre_web/config.json b/calibre_web/config.json index 336a3888f..bc60ea386 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-ls178", + "version": "0.6.19-ls182", "video": true } diff --git a/calibre_web/updater.json b/calibre_web/updater.json index 0a81ffdc9..ccee8d2d1 100644 --- a/calibre_web/updater.json +++ b/calibre_web/updater.json @@ -1,10 +1,10 @@ { "github_fulltag": "true", - "last_update": "13-10-2022", + "last_update": "02-11-2022", "paused": false, "repository": "alexbelgium/hassio-addons", "slug": "calibre-web", "source": "github", "upstream_repo": "linuxserver/docker-calibre-web", - "upstream_version": "0.6.19-ls178" + "upstream_version": "0.6.19-ls182" } diff --git a/cloudcommander/CHANGELOG.md b/cloudcommander/CHANGELOG.md index 5168d1535..0d62f458e 100644 --- a/cloudcommander/CHANGELOG.md +++ b/cloudcommander/CHANGELOG.md @@ -1,4 +1,7 @@ +## 16.6.1 (22-10-2022) +- Update to latest version from coderaiser/cloudcmd + ## 16.6.0 (11-10-2022) - Update to latest version from coderaiser/cloudcmd diff --git a/cloudcommander/config.json b/cloudcommander/config.json index 8c5e9e35a..68edb06c2 100644 --- a/cloudcommander/config.json +++ b/cloudcommander/config.json @@ -74,5 +74,5 @@ }, "slug": "cloudcommander", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/cloudcommander", - "version": "16.6.0" + "version": "16.6.1" } diff --git a/cloudcommander/updater.json b/cloudcommander/updater.json index 5e3b6f8db..265869126 100644 --- a/cloudcommander/updater.json +++ b/cloudcommander/updater.json @@ -1,8 +1,8 @@ { - "last_update": "11-10-2022", + "last_update": "22-10-2022", "repository": "alexbelgium/hassio-addons", "slug": "cloudcommander", "source": "github", "upstream_repo": "coderaiser/cloudcmd", - "upstream_version": "16.6.0" + "upstream_version": "16.6.1" } diff --git a/code-server/CHANGELOG.md b/code-server/CHANGELOG.md index c6ac31b64..fa20813d9 100644 --- a/code-server/CHANGELOG.md +++ b/code-server/CHANGELOG.md @@ -1,4 +1,10 @@ +## 4.8.1 (29-10-2022) +- Update to latest version from linuxserver/docker-code-server + +## 4.8.0 (27-10-2022) +- Update to latest version from linuxserver/docker-code-server + ## 4.7.1 (01-10-2022) - Update to latest version from linuxserver/docker-code-server diff --git a/code-server/Dockerfile b/code-server/Dockerfile index d0d163d46..bdece551f 100644 --- a/code-server/Dockerfile +++ b/code-server/Dockerfile @@ -30,22 +30,22 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # Global LSIO modifications ARG CONFIGLOCATION="/data" -# hadolint ignore=SC2015, SC2013 +# hadolint ignore=SC2015, SC2013, SC2086 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 \ + 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" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + && for file in $(grep -srl "PUID" /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" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $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 -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $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 + && for file 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}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done ################## # 3 Install apps # diff --git a/code-server/README.md b/code-server/README.md index 8830f4254..ac0942973 100644 --- a/code-server/README.md +++ b/code-server/README.md @@ -1,4 +1,6 @@ -# Home assistant add-on: code-server (not recommended : use https://github.com/hassio-addons/addon-vscode) +# Home assistant add-on: code-server + +# ⚠️ It is recommended to use the official addon (https://github.com/hassio-addons/addon-vscode) instead of this fork. The only benefit of this fork is automated releases, now implemented in the offical one. ⚠️ [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) @@ -14,7 +16,6 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ - [![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) ## About diff --git a/code-server/config.json b/code-server/config.json index 0d3a6a7f2..fcb1863a7 100644 --- a/code-server/config.json +++ b/code-server/config.json @@ -74,6 +74,6 @@ }, "slug": "code-server", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/coder-server", - "version": "4.7.1", + "version": "4.8.1", "webui": "[PROTO:ssl]://[HOST]:[PORT:8443]" } diff --git a/code-server/updater.json b/code-server/updater.json index dcad6b275..bbe7a01a9 100644 --- a/code-server/updater.json +++ b/code-server/updater.json @@ -1,8 +1,8 @@ { - "last_update": "01-10-2022", + "last_update": "29-10-2022", "repository": "alexbelgium/hassio-addons", "slug": "code-server", "source": "github", "upstream_repo": "linuxserver/docker-code-server", - "upstream_version": "4.7.1" + "upstream_version": "4.8.1" } diff --git a/emby/CHANGELOG.md b/emby/CHANGELOG.md index 5e83af5e0..1aaf7b01a 100644 --- a/emby/CHANGELOG.md +++ b/emby/CHANGELOG.md @@ -1,4 +1,10 @@ +## 4.8.0.15 (29-10-2022) +- Update to latest version from linuxserver/docker-emby + +## 4.8.0.13 (22-10-2022) +- Update to latest version from linuxserver/docker-emby + ## 4.8.0.12 (15-10-2022) - Update to latest version from linuxserver/docker-emby diff --git a/emby/Dockerfile b/emby/Dockerfile index e10af71d8..434d6c590 100644 --- a/emby/Dockerfile +++ b/emby/Dockerfile @@ -30,22 +30,22 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # Global LSIO modifications ARG CONFIGLOCATION="/emby" -# hadolint ignore=SC2015, SC2013 +# hadolint ignore=SC2015, SC2013, SC2086 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 \ + 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" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + && for file in $(grep -srl "PUID" /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" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $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 -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + # Search occurences of /config and change it to the expected new config + && for file in $(grep -Esril "/config" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $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 + && for file 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}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done ################## # 3 Install apps # diff --git a/emby/config.json b/emby/config.json index 402444fe7..8900e7ddf 100644 --- a/emby/config.json +++ b/emby/config.json @@ -107,6 +107,6 @@ }, "slug": "emby_nas", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/emby", - "version": "4.8.0.12", + "version": "4.8.0.15", "video": true } diff --git a/emby/rootfs/etc/cont-init.d/91-silent.sh b/emby/rootfs/etc/cont-init.d/91-silent.sh index 74bc2dcca..d647be6ae 100644 --- a/emby/rootfs/etc/cont-init.d/91-silent.sh +++ b/emby/rootfs/etc/cont-init.d/91-silent.sh @@ -6,7 +6,7 @@ ############### if bashio::config.true 'silent'; then - APPEND=' > /dev/null' - sed -i '$s|$|'"$APPEND"'|' /etc/services.d/*/run + APPEND=' >/dev/null' + sed -i '$s|$|'"$APPEND"'|' /etc/s6-overlay/s6-rc.d/*/run bashio::log.info 'Silent mode activated, all logs from emby server are hidden. Disable this option if you need to troubleshoot the addon.' fi diff --git a/emby/rootfs/etc/nginx/nginx.conf b/emby/rootfs/etc/nginx/nginx.conf index 9352b89fa..fb597811c 100644 --- a/emby/rootfs/etc/nginx/nginx.conf +++ b/emby/rootfs/etc/nginx/nginx.conf @@ -34,22 +34,22 @@ http { # https://emby.media/community/index.php?/topic/93074-how-to-emby-with-nginx-with-windows-specific-tips-and-csp-options/ server_names_hash_bucket_size 64; gzip_disable "msie6"; - gzip_comp_level 6; - gzip_min_length 1100; - gzip_buffers 16 8k; - gzip_proxied any; - gzip_types - text/plain - text/css - text/js - text/xml - text/javascript - application/javascript - application/x-javascript - application/json - application/xml - application/rss+xml - image/svg+xml; + gzip_comp_level 6; + gzip_min_length 1100; + gzip_buffers 16 8k; + gzip_proxied any; + gzip_types + text/plain + text/css + text/js + text/xml + text/javascript + application/javascript + application/x-javascript + application/json + application/xml + application/rss+xml + image/svg+xml; proxy_connect_timeout 1h; log_format hassio '[$time_local] $status ' diff --git a/emby/updater.json b/emby/updater.json index d93cb8376..e6e1bc189 100644 --- a/emby/updater.json +++ b/emby/updater.json @@ -1,9 +1,9 @@ { "github_beta": "true", - "last_update": "15-10-2022", + "last_update": "29-10-2022", "repository": "alexbelgium/hassio-addons", "slug": "emby", "source": "github", "upstream_repo": "linuxserver/docker-emby", - "upstream_version": "4.8.0.12" + "upstream_version": "4.8.0.15" } diff --git a/epicgamesfree/CHANGELOG.md b/epicgamesfree/CHANGELOG.md index 1918551d0..a740e1f29 100644 --- a/epicgamesfree/CHANGELOG.md +++ b/epicgamesfree/CHANGELOG.md @@ -1,8 +1,17 @@ +## 30-10-2022 + +- New config.js update + +## ee3dff4b29757e28282cada9bcb3e8f84f1c3041-2022-10-23 (2022-10-23) + +- Update to latest version from charlocharlie/epicgames-freegames ## 80fdb2447c8846bee011c0d6d5c44c56210cb24a-2022-09-23 (2022-09-23) + - Update to latest version from charlocharlie/epicgames-freegames ## 9531608362dc8c1232c1e12005541796610d2af7-2021-12-17 (2021-12-17) + - Update to latest version from charlocharlie/epicgames-freegames ## 4.1.0 (21-07-2022) diff --git a/epicgamesfree/config.json b/epicgamesfree/config.json index 0f3a05b67..5dc467670 100644 --- a/epicgamesfree/config.json +++ b/epicgamesfree/config.json @@ -4,7 +4,7 @@ "amd64" ], "codenotary": "alexandrep.github@gmail.com", - "description": "Automatically login and redeem promotional free games from the Epic Games Store", + "description": "Automatically login and redeem promotional free games from Epic Games Store", "image": "ghcr.io/alexbelgium/epicgamesfree-{arch}", "init": false, "map": [ @@ -19,6 +19,6 @@ }, "slug": "epicgamesfree", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "80fdb2447c8846bee011c0d6d5c44c56210cb24a-2022-09-23", + "version": "ee3dff4b29757e28282cada9bcb3e8f84f1c3041-2022-10-30-2", "webui": "[PROTO:ssl]://[HOST]:[PORT:3000]" -} +} \ No newline at end of file diff --git a/epicgamesfree/rootfs/templates/config.json b/epicgamesfree/rootfs/templates/config.json index 5d43a70db..a57a3cb66 100644 --- a/epicgamesfree/rootfs/templates/config.json +++ b/epicgamesfree/rootfs/templates/config.json @@ -1,60 +1,62 @@ { - "runOnStartup":true, - "cronSchedule":"5 16 * * *", - "logLevel":"info", - "webPortalConfig":{ - "baseUrl":"https://epic.exmaple.com" - }, - "accounts":[ - { - "email":"example@gmail.com", - "password":"abc1234", - "totp":"EMNCAZE234AZEEMNCAZE234AZEEMNCAZE234AZEEMNCAZE234AZEEMNCAZE234AZEEMNCAZE234AZEEMNCAZE234AZEEMNCAZE234AZE" + "runOnStartup": true, + "cronSchedule": "5 16 * * *", + "logLevel": "info", + "webPortalConfig": { + "baseUrl": "https://localhost:3000" + }, + "accounts": [ + { + "email": "example@gmail.com", + "password": "abc1234", + "totp": "EMNCF83ULU3K3PXPJBSWY3DPEHPK3PXPJWY3DPEHPK3YI69R39NE" + } + ], + "notifiers": [ + { + "type": "email", + "smtpHost": "smtp.gmail.com", + "smtpPort": 587, + "emailSenderAddress": "hello@gmail.com", + "emailSenderName": "Epic Games Captchas", + "emailRecipientAddress": "hello@gmail.com", + "secure": false, + "auth": { + "user": "hello@gmail.com", + "pass": "abc123" } - ], - "notifiers":[ - { - "type":"email", - "smtpHost":"smtp.gmail.com", - "smtpPort":587, - "emailSenderAddress":"hello@gmail.com", - "emailSenderName":"Epic Games Captchas", - "emailRecipientAddress":"hello@gmail.com", - "secure":false, - "auth":{ - "user":"hello@gmail.com", - "pass":"abc123" - } - }, - { - "type":"discord", - "webhookUrl":"https://discord.com/api/webhooks/123456789123456789/A-abcdefghijklmn-abcdefghijklmnopqrst12345678-abcdefghijklmnop123456", - "mentionedUsers":[ - "914360712086843432" - ], - "mentionedRoles":[ - "734548250895319070" - ] - }, - { - "type":"telegram", - "token":"to_fill", - "chatId":"-987654321" - }, - { - "type":"apprise", - "apiUrl":"http://192.168.1.2:8000", - "urls":"mailto://user:pass@gmail.com" - }, - { - "type":"pushover", - "token":"to_fill", - "userKey":"to_fill" - }, - { - "type":"gotify", - "apiUrl":"https://gotify.net", - "token":"SnL-wAvmfo_QT" - } - ] + }, + { + "type": "discord", + "webhookUrl": "https://discord.com/api/webhooks/123456789123456789/A-abcdefghijklmn-abcdefghijklmnopqrst12345678-abcdefghijklmnop123456", + "mentionedUsers": ["914360712086843432"], + "mentionedRoles": ["734548250895319070"] + }, + { + "type": "telegram", + "token": "644739147:AAGMPo-Jz3mKRnHRTnrPEDi7jUF1vqNOD5k", + "chatId": "-987654321" + }, + { + "type": "apprise", + "apiUrl": "http://192.168.1.2:8000", + "urls": "mailto://user:pass@gmail.com" + }, + { + "type": "pushover", + "token": "a172fyyl9gw99p2xi16tq8hnib48p2", + "userKey": "uvgidym7l5ggpwu2r8i1oy6diaapll" + }, + { + "type": "gotify", + "apiUrl": "https://gotify.net", + "token": "SnL-wAvmfo_QT" + }, + { + "type": "homeassistant", + "instance": "https://homeassistant.example.com", + "token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c", + "notifyservice": "mobile_app_smartphone_name" + } + ] } diff --git a/epicgamesfree/updater.json b/epicgamesfree/updater.json index d97564688..88aebb379 100644 --- a/epicgamesfree/updater.json +++ b/epicgamesfree/updater.json @@ -1,10 +1,10 @@ { "dockerhub_by_date": true, "dockerhub_list_size": 2, - "last_update": "2022-09-23", + "last_update": "2022-10-23", "repository": "alexbelgium/hassio-addons", "slug": "epicgamesfree", "source": "dockerhub", "upstream_repo": "charlocharlie/epicgames-freegames", - "upstream_version": "80fdb2447c8846bee011c0d6d5c44c56210cb24a-2022-09-23" + "upstream_version": "ee3dff4b29757e28282cada9bcb3e8f84f1c3041-2022-10-23" } diff --git a/fireflyiii/CHANGELOG.md b/fireflyiii/CHANGELOG.md index 4f993cefb..76a43951d 100644 --- a/fireflyiii/CHANGELOG.md +++ b/fireflyiii/CHANGELOG.md @@ -1,4 +1,12 @@ +## 5.7.15 (02-11-2022) +- Update to latest version from firefly-iii/firefly-iii +## 5.7.14-2 (29-10-2022) +- Fix bug #530 + +## 5.7.14 (20-10-2022) +- Update to latest version from firefly-iii/firefly-iii + ## 5.7.13 (18-10-2022) - Update to latest version from firefly-iii/firefly-iii diff --git a/fireflyiii/Dockerfile b/fireflyiii/Dockerfile index c3b986f20..9ebe0ea89 100644 --- a/fireflyiii/Dockerfile +++ b/fireflyiii/Dockerfile @@ -33,13 +33,16 @@ 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.13" +ARG BUILD_UPSTREAM="5.7.15" RUN \ ################# # Fix for 5.7.5 # ################# - if [ "$BUILD_UPSTREAM" = "5.7.13" ] ; then \ + if [ "$BUILD_UPSTREAM" = "5.7.15" ] ; 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 +RUN \ + # Change upload folder to "ha_upload" since the default one is binded to a volume (see base image) + sed -i "s/'root' => storage_path('upload'),/'root' => storage_path('ha_upload'),/g" /var/www/html/config/filesystems.php ################## # 3 Install apps # diff --git a/fireflyiii/config.json b/fireflyiii/config.json index 03f01d9d9..ba53514e8 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.13", + "version": "5.7.15", "webui": "[PROTO:ssl]://[HOST]:[PORT:8080]" } diff --git a/fireflyiii/rootfs/etc/cont-init.d/99-run.sh b/fireflyiii/rootfs/etc/cont-init.d/99-run.sh index 18e13cfcc..65050d4fd 100644 --- a/fireflyiii/rootfs/etc/cont-init.d/99-run.sh +++ b/fireflyiii/rootfs/etc/cont-init.d/99-run.sh @@ -48,6 +48,7 @@ case $(bashio::config 'DB_CONNECTION') in # Set variable export DB_CONNECTION=sqlite + export DB_DATABASE=/config/addons_config/fireflyiii/database/database.sqlite # Creating folders mkdir -p /config/addons_config/fireflyiii/database @@ -66,7 +67,7 @@ case $(bashio::config 'DB_CONNECTION') in # Creating symlink rm -r /var/www/html/storage/database - ln -s /config/addons_config/fireflyiii/database /var/www/html/storage/database + ln -s /config/addons_config/fireflyiii/database /var/www/html/storage # Updating permissions chmod 775 /config/addons_config/fireflyiii/database/database.sqlite @@ -121,6 +122,29 @@ case $(bashio::config 'DB_CONNECTION') in esac +######################## +# Define upload folder # +######################## + +bashio::log.info "Defining upload folder" + +# Creating folder +if [ ! -d /config/addons_config/fireflyiii/upload ]; then + mkdir -p /config/addons_config/fireflyiii/upload + chown -R www-data:www-data /config/addons_config/fireflyiii/upload +fi + +# Creating symlink +if [ -d /var/www/html/storage/ha_upload ]; then + rm -r /var/www/html/storage/ha_upload +fi +ln -s /config/addons_config/fireflyiii/upload /var/www/html/storage/ha_upload + +# Updating permissions +chown -R www-data:www-data /config/addons_config/fireflyiii +chown -R www-data:www-data /var/www/html/storage +chmod -R 775 /config/addons_config/fireflyiii + ################ # CRON OPTIONS # ################ diff --git a/fireflyiii/updater.json b/fireflyiii/updater.json index 71e40b418..161e58c2e 100644 --- a/fireflyiii/updater.json +++ b/fireflyiii/updater.json @@ -1,8 +1,8 @@ { - "last_update": "18-10-2022", + "last_update": "02-11-2022", "repository": "alexbelgium/hassio-addons", "slug": "fireflyiii", "source": "github", "upstream_repo": "firefly-iii/firefly-iii", - "upstream_version": "5.7.13" + "upstream_version": "5.7.15" } diff --git a/fireflyiii_data_importer/CHANGELOG.md b/fireflyiii_data_importer/CHANGELOG.md index e185bae65..3f3c1c118 100644 --- a/fireflyiii_data_importer/CHANGELOG.md +++ b/fireflyiii_data_importer/CHANGELOG.md @@ -1,4 +1,7 @@ +## version-0.9.17 (25-10-2022) +- Update to latest version from fireflyiii/data-importer + ## version-0.9.16 (13-09-2022) - Update to latest version from fireflyiii/data-importer diff --git a/fireflyiii_data_importer/Dockerfile b/fireflyiii_data_importer/Dockerfile index f888a8944..040a6426a 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.16" +ARG BUILD_UPSTREAM="version-0.9.17" FROM ${BUILD_FROM} ################## diff --git a/fireflyiii_data_importer/config.json b/fireflyiii_data_importer/config.json index 9405f89fe..e63979983 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.16", + "version": "version-0.9.17", "webui": "[PROTO:ssl]://[HOST]:[PORT:8080]" } diff --git a/fireflyiii_data_importer/updater.json b/fireflyiii_data_importer/updater.json index a982fbcb7..b832a18e5 100644 --- a/fireflyiii_data_importer/updater.json +++ b/fireflyiii_data_importer/updater.json @@ -1,8 +1,8 @@ { - "last_update": "13-09-2022", + "last_update": "25-10-2022", "repository": "alexbelgium/hassio-addons", "slug": "fireflyiii_data_importer", "source": "dockerhub", "upstream_repo": "fireflyiii/data-importer", - "upstream_version": "version-0.9.16" + "upstream_version": "version-0.9.17" } diff --git a/flaresolverr/CHANGELOG.md b/flaresolverr/CHANGELOG.md index 5ec325781..de32e8596 100644 --- a/flaresolverr/CHANGELOG.md +++ b/flaresolverr/CHANGELOG.md @@ -1,4 +1,7 @@ +## 2.2.10 (25-10-2022) +- Update to latest version from FlareSolverr/FlareSolverr + ## 2.2.9 (27-09-2022) - Update to latest version from FlareSolverr/FlareSolverr diff --git a/flaresolverr/config.json b/flaresolverr/config.json index 0e56bca25..80d33a6bb 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.9", + "version": "2.2.10", "webui": "[PROTO:ssl]://[HOST]:[PORT:8191]" } diff --git a/flaresolverr/updater.json b/flaresolverr/updater.json index 6f3dd1a6a..c15d2f1ab 100644 --- a/flaresolverr/updater.json +++ b/flaresolverr/updater.json @@ -1,8 +1,8 @@ { - "last_update": "27-09-2022", + "last_update": "25-10-2022", "repository": "alexbelgium/hassio-addons", "slug": "flaresolverr", "source": "github", "upstream_repo": "FlareSolverr/FlareSolverr", - "upstream_version": "2.2.9" + "upstream_version": "2.2.10" } diff --git a/flexget/CHANGELOG.md b/flexget/CHANGELOG.md index 3dea925fb..6f27cbe6b 100644 --- a/flexget/CHANGELOG.md +++ b/flexget/CHANGELOG.md @@ -1,4 +1,13 @@ +## 3.4.2 (29-10-2022) +- Update to latest version from wiserain/flexget + +## 3.4.0 (27-10-2022) +- Update to latest version from wiserain/flexget + +## 3.3.39 (22-10-2022) +- Update to latest version from wiserain/flexget + ## 3.3.35 (15-10-2022) - Update to latest version from wiserain/flexget diff --git a/flexget/Dockerfile b/flexget/Dockerfile index 6ee95b844..8fc3184d0 100644 --- a/flexget/Dockerfile +++ b/flexget/Dockerfile @@ -29,32 +29,32 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ SHELL ["/bin/bash", "-o", "pipefail", "-c"] -# hadolint ignore=SC2016 +# hadolint ignore=SC2016,SC2086 RUN \ # Set password - files="$(grep -sril "set FG_WEBUI_PASSWD" /etc/cont-init.d /etc/s6-overlay/s6-rc.d)" \ - && sed -i 's/bash/bashio/g' "$files" \ - && sed -i 's/# set FG_WEBUI_PASSWD/if bashio::config.has_value "WebuiPass"; then FG_WEBUI_PASSWD=$(bashio::config "WebuiPass"); else FG_WEBUI_PASSWD=""; fi/g' "$files" \ - && sed -i 's/# install custom plugins/if bashio::config.has_value "FG_PLUGINS"; then FG_PLUGINS=$(bashio::config "FG_PLUGINS"); else FG_PLUGINS=""; fi/g' "$files" + files=$(grep -sril "set FG_WEBUI_PASSWD" /etc/s6-overlay/s6-rc.d) \ + && sed -i 's/bash/bashio/g' $files \ + && sed -i 's/# set FG_WEBUI_PASSWD/if bashio::config.has_value "WebuiPass"; then FG_WEBUI_PASSWD=$(bashio::config "WebuiPass"); else FG_WEBUI_PASSWD=""; fi/g' $files \ + && sed -i 's/# install custom plugins/if bashio::config.has_value "FG_PLUGINS"; then FG_PLUGINS=$(bashio::config "FG_PLUGINS"); else FG_PLUGINS=""; fi/g' $files # Global LSIO modifications ARG CONFIGLOCATION="/config/addons_config/flexget" -# hadolint ignore=SC2015, SC2013 +# hadolint ignore=SC2015, SC2013, SC2086 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 \ + 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" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + && for file in $(grep -srl "PUID" /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" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $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 -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $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 + && for file 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}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done ################## # 3 Install apps # diff --git a/flexget/config.json b/flexget/config.json index e53f6c0b0..f61b9752b 100644 --- a/flexget/config.json +++ b/flexget/config.json @@ -37,6 +37,6 @@ }, "slug": "flexget", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "3.3.35-2", + "version": "3.4.2", "webui": "[PROTO:ssl]://[HOST]:[PORT:5050]" -} \ No newline at end of file +} diff --git a/flexget/updater.json b/flexget/updater.json index afc117d08..4d1e499d5 100644 --- a/flexget/updater.json +++ b/flexget/updater.json @@ -1,8 +1,8 @@ { - "last_update": "15-10-2022", + "last_update": "29-10-2022", "repository": "alexbelgium/hassio-addons", "slug": "flexget", "source": "dockerhub", "upstream_repo": "wiserain/flexget", - "upstream_version": "3.3.35" + "upstream_version": "3.4.2" } diff --git a/grav/Dockerfile b/grav/Dockerfile index 6ef8aa5a8..902d735f0 100644 --- a/grav/Dockerfile +++ b/grav/Dockerfile @@ -29,22 +29,22 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # Global LSIO modifications ARG CONFIGLOCATION="/share/grav" -# hadolint ignore=SC2015, SC2013 +# hadolint ignore=SC2015, SC2013, SC2086 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 \ + 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" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + && for file in $(grep -srl "PUID" /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" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $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 -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $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 + && for file 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}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done ################## # 3 Install apps # diff --git a/jackett/CHANGELOG.md b/jackett/CHANGELOG.md index 5d65f0544..478fe3cc0 100644 --- a/jackett/CHANGELOG.md +++ b/jackett/CHANGELOG.md @@ -1,4 +1,25 @@ +## 0.20.2186 (02-11-2022) +- Update to latest version from linuxserver/docker-jackett + +## 0.20.2180 (01-11-2022) +- Update to latest version from linuxserver/docker-jackett + +## 0.20.2171 (29-10-2022) +- Update to latest version from linuxserver/docker-jackett + +## 0.20.2167 (27-10-2022) +- Update to latest version from linuxserver/docker-jackett + +## 0.20.2158 (25-10-2022) +- Update to latest version from linuxserver/docker-jackett + +## 0.20.2134 (22-10-2022) +- Update to latest version from linuxserver/docker-jackett + +## 0.20.2124 (20-10-2022) +- Update to latest version from linuxserver/docker-jackett + ## 0.20.2122 (18-10-2022) - Update to latest version from linuxserver/docker-jackett diff --git a/jackett/Dockerfile b/jackett/Dockerfile index 76255a827..5ccd19532 100644 --- a/jackett/Dockerfile +++ b/jackett/Dockerfile @@ -29,22 +29,22 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # Global LSIO modifications ARG CONFIGLOCATION="/config/addons_config/Jackett" -# hadolint ignore=SC2015, SC2013 +# hadolint ignore=SC2015, SC2013, SC2086 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 \ + 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" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + && for file in $(grep -srl "PUID" /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" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $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 -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $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 + && for file 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}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done # Changes config directory ENV XDG_CONFIG_HOME="/config/addons_config" diff --git a/jackett/config.json b/jackett/config.json index 8b4a37f89..076f1455f 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.2122", + "version": "0.20.2186", "webui": "[PROTO:ssl]://[HOST]:[PORT:9117]" } diff --git a/jackett/updater.json b/jackett/updater.json index dd161d745..22c7bde50 100644 --- a/jackett/updater.json +++ b/jackett/updater.json @@ -1,8 +1,8 @@ { - "last_update": "18-10-2022", + "last_update": "02-11-2022", "repository": "alexbelgium/hassio-addons", "slug": "jackett", "source": "github", "upstream_repo": "linuxserver/docker-jackett", - "upstream_version": "0.20.2122" + "upstream_version": "0.20.2186" } diff --git a/jellyfin/CHANGELOG.md b/jellyfin/CHANGELOG.md index efa3de1ad..d4450109c 100644 --- a/jellyfin/CHANGELOG.md +++ b/jellyfin/CHANGELOG.md @@ -1,4 +1,16 @@ +## 10.8.7-1-ls186 (02-11-2022) +- Update to latest version from linuxserver/docker-jellyfin + +## 10.8.6-1-ls185 (01-11-2022) +- Update to latest version from linuxserver/docker-jellyfin + +## 10.8.5-1-ls184 (29-10-2022) +- Update to latest version from linuxserver/docker-jellyfin + +## 10.8.5-1-ls183 (22-10-2022) +- Update to latest version from linuxserver/docker-jellyfin + ## 10.8.5-1-ls182 (15-10-2022) - Update to latest version from linuxserver/docker-jellyfin diff --git a/jellyfin/Dockerfile b/jellyfin/Dockerfile index c33882bdd..669d2115c 100644 --- a/jellyfin/Dockerfile +++ b/jellyfin/Dockerfile @@ -30,22 +30,22 @@ ENV S6_CMD_WAIT_FOR_SERVICES=0 \ # Global LSIO modifications ARG CONFIGLOCATION="/config" -# hadolint ignore=SC2015, SC2013 +# hadolint ignore=SC2015, SC2013, SC2086 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 \ + 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" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + && for file in $(grep -srl "PUID" /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" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $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 -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $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 + && for file 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}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done ################## # 3 Install apps # diff --git a/jellyfin/config.json b/jellyfin/config.json index 754d0edfd..6b2b60a14 100644 --- a/jellyfin/config.json +++ b/jellyfin/config.json @@ -103,6 +103,6 @@ }, "slug": "jellyfin", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "10.8.5-1-ls182", + "version": "10.8.7-1-ls186", "video": true } diff --git a/jellyfin/updater.json b/jellyfin/updater.json index 6f37822c3..13341ccd2 100644 --- a/jellyfin/updater.json +++ b/jellyfin/updater.json @@ -1,9 +1,9 @@ { "github_fulltag": "true", - "last_update": "15-10-2022", + "last_update": "02-11-2022", "repository": "alexbelgium/hassio-addons", "slug": "jellyfin", "source": "github", "upstream_repo": "linuxserver/docker-jellyfin", - "upstream_version": "10.8.5-1-ls182" + "upstream_version": "10.8.7-1-ls186" } diff --git a/lidarr/CHANGELOG.md b/lidarr/CHANGELOG.md index 8a66aa94c..92df89cfd 100644 --- a/lidarr/CHANGELOG.md +++ b/lidarr/CHANGELOG.md @@ -1,4 +1,10 @@ +## 1.0.2.2592-ls101 (02-11-2022) +- Update to latest version from linuxserver/docker-lidarr + +## 1.0.2.2592-ls100 (01-11-2022) +- Update to latest version from linuxserver/docker-lidarr + ## 1.0.2.2592-ls99 (18-10-2022) - Update to latest version from linuxserver/docker-lidarr diff --git a/lidarr/Dockerfile b/lidarr/Dockerfile index ba8429219..198691eaa 100644 --- a/lidarr/Dockerfile +++ b/lidarr/Dockerfile @@ -29,22 +29,22 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # Global LSIO modifications ARG CONFIGLOCATION="/config/addons_config/lidarr" -# hadolint ignore=SC2015, SC2013 +# hadolint ignore=SC2015, SC2013, SC2086 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 \ + 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" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + && for file in $(grep -srl "PUID" /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" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $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 -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $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 + && for file 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}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done ################## # 3 Install apps # diff --git a/lidarr/config.json b/lidarr/config.json index fcda00c31..4a3ca4eea 100644 --- a/lidarr/config.json +++ b/lidarr/config.json @@ -80,6 +80,6 @@ }, "slug": "lidarr_nas", "url": "https://github.com/alexbelgium/hassio-addons/blob/master/lidarr/Readme.md", - "version": "1.0.2.2592-ls99", + "version": "1.0.2.2592-ls101", "webui": "[PROTO:ssl]://[HOST]:[PORT:8686]" } diff --git a/lidarr/updater.json b/lidarr/updater.json index ed4a52434..42cf5eef0 100644 --- a/lidarr/updater.json +++ b/lidarr/updater.json @@ -1,9 +1,9 @@ { "github_fulltag": "true", - "last_update": "18-10-2022", + "last_update": "02-11-2022", "repository": "alexbelgium/hassio-addons", "slug": "lidarr", "source": "github", "upstream_repo": "linuxserver/docker-lidarr", - "upstream_version": "1.0.2.2592-ls99" + "upstream_version": "1.0.2.2592-ls101" } diff --git a/mealie/rootfs/caddy.txt b/mealie/rootfs/caddy.txt index 1c9f0a75c..cbe2bb26f 100644 --- a/mealie/rootfs/caddy.txt +++ b/mealie/rootfs/caddy.txt @@ -1,17 +1,17 @@ :%%port%% { - @proxied path /api/* /docs /openapi.json + @proxied path /api/* /docs /openapi.json - @static { - file - path *.ico *.css *.js *.gif *.jpg *.jpeg *.png *.svg *.woff *.woff2 *.webp - } + @static { + file + path *.ico *.css *.js *.gif *.jpg *.jpeg *.png *.svg *.woff *.woff2 *.webp + } - encode gzip zstd + encode gzip zstd - # Handles Recipe Images / Assets - handle_path /api/media/recipes/* { - header Access-Control-Allow-Origin * + # Handles Recipe Images / Assets + handle_path /api/media/recipes/* { + header Access-Control-Allow-Origin * header X-Content-Type-Options nosniff header X-Robots-Tag none header -X-Frame-Options @@ -22,15 +22,15 @@ header X-Forwarded-For $proxy_add_x_forwarded_for header X-Forwarded-Proto $scheme header X-NginX-Proxy true - header X-External-Path $http_x_ingress_path + header X-External-Path $http_x_ingress_path header X-Real-IP $remote_addr - header @static Cache-Control max-age=31536000 - root * /app/data/recipes/ - file_server - } + header @static Cache-Control max-age=31536000 + root * /app/data/recipes/ + file_server + } - handle @proxied { - header Access-Control-Allow-Origin * + handle @proxied { + header Access-Control-Allow-Origin * header X-Content-Type-Options nosniff header X-Robots-Tag none header -X-Frame-Options @@ -42,13 +42,13 @@ header X-Forwarded-Proto $scheme header X-NginX-Proxy true header X-Real-IP $remote_addr - header X-External-Path $http_x_ingress_path; - rewrite * {Referer}{uri} - reverse_proxy http://127.0.0.1:9000 - } + header X-External-Path $http_x_ingress_path; + rewrite * {Referer}{uri} + reverse_proxy http://127.0.0.1:9000 + } - handle { - header Access-Control-Allow-Origin * + handle { + header Access-Control-Allow-Origin * header X-Content-Type-Options nosniff header X-Robots-Tag none header -X-Frame-Options @@ -60,11 +60,11 @@ header X-Forwarded-Proto $scheme header X-NginX-Proxy true header X-Real-IP $remote_addr - header X-External-Path $http_x_ingress_path; - header @static Cache-Control max-age=31536000 - root * /app/dist - try_files {path}.html {path} / - file_server - } + header X-External-Path $http_x_ingress_path; + header @static Cache-Control max-age=31536000 + root * /app/dist + try_files {path}.html {path} / + file_server + } } diff --git a/mylar3/Dockerfile b/mylar3/Dockerfile index 1b8cb4f77..5534c103e 100644 --- a/mylar3/Dockerfile +++ b/mylar3/Dockerfile @@ -29,22 +29,22 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # Global LSIO modifications ARG CONFIGLOCATION="/data" -# hadolint ignore=SC2015, SC2013 +# hadolint ignore=SC2015, SC2013, SC2086 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 \ + 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" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + && for file in $(grep -srl "PUID" /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" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $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 -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $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 + && for file 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}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done ################## # 3 Install apps # diff --git a/nextcloud/CHANGELOG.md b/nextcloud/CHANGELOG.md index fb9c6ded0..7d09a9ea1 100644 --- a/nextcloud/CHANGELOG.md +++ b/nextcloud/CHANGELOG.md @@ -1,4 +1,7 @@ +## 25.0.0 (20-10-2022) +- Update to latest version from linuxserver/docker-nextcloud + ## 24.0.6 (08-10-2022) - Update to latest version from linuxserver/docker-nextcloud diff --git a/nextcloud/Dockerfile b/nextcloud/Dockerfile index 3b1eb5c7f..b7c9f5802 100644 --- a/nextcloud/Dockerfile +++ b/nextcloud/Dockerfile @@ -17,8 +17,8 @@ ARG BUILD_FROM ARG BUILD_VERSION ARG BUILD_ARCH -ARG BUILD_UPSTREAM="24.0.6" -FROM ${BUILD_FROM} +ARG BUILD_UPSTREAM="25.0.0" +FROM ${BUILD_FROM}${BUILD_UPSTREAM} ################## # 2 Modify Image # @@ -31,29 +31,30 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ ENV NEXTCLOUD_PATH="/data/config/www/nextcloud" +# Global LSIO modifications +ARG CONFIGLOCATION="/data/config" +# hadolint ignore=SC2046,SC2013,SC2086 RUN \ # Remove upstream files rm -rf /etc/cont-init.d/10-adduser /etc/cont-init.d/30-keygen /etc/cont-init.d/40-config /etc/cont-init.d/50-install /etc/cont-init.d/60-memcache /etc/cont-init.d/70-aliases \ # Make permissions && chmod +x /defaults/nextcloud-perms.sh \ # default folders - && sed -i "s|data|share/nextcloud|g" /etc/cont-init.d/* \ - && sed -i "s|config|data/config|g" /etc/cont-init.d/* \ - && sed -i "s|data|share/nextcloud|g" /etc/services.d/nginx/* \ - && sed -i "s|config|data/config|g" /etc/services.d/nginx/* \ - && sed -i "s|config|data/config|g" /defaults/* \ + && for file in $(grep -Esril "/data[ '\"/]|/data\$" /etc /defaults); do sed -Ei "s=(/data)+(/| |$|\"|\')=/share/nextcloud\2=g" $file; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $file; done \ # modify data limits files - # -e 's/memory_limit=512M/memory_limit=1024M/g' \ && sed -i \ -e 's/upload_max_filesize=1024M/upload_max_filesize=10240M/g' \ -e 's/post_max_size=1024M/post_max_size=10240M/g' \ - /etc/php7/php.ini \ - && sed -i "s|client_max_body_size 512M;|client_max_body_size 10240M;|g" /defaults/default \ - # Correct ssl path - && sed -i "s|/data/config/keys|/ssl/nextcloud/keys|g" /defaults/default \ + /etc/php*/php.ini \ # Correct initial directory && sed -i "s|/data|%%datadirectory%%|g" /defaults/config.php +RUN \ + # Correct ssl path + sed -i "s|/data/config/keys|/ssl/nextcloud/keys|g" /defaults/nginx/site-confs/default.conf.sample \ + && sed -i "s|client_max_body_size 512M;|client_max_body_size 10240M;|g" /defaults/nginx/site-confs/default.conf.sample + ################## # 3 Install apps # ################## diff --git a/nextcloud/build.json b/nextcloud/build.json index 6ed4668c7..f4a9e5afe 100644 --- a/nextcloud/build.json +++ b/nextcloud/build.json @@ -1,8 +1,8 @@ { "build_from": { - "aarch64": "lscr.io/linuxserver/nextcloud:arm64v8-latest", - "amd64": "lscr.io/linuxserver/nextcloud:amd64-latest", - "armv7": "lscr.io/linuxserver/nextcloud:arm32v7-latest" + "aarch64": "lscr.io/linuxserver/nextcloud:arm64v8-", + "amd64": "lscr.io/linuxserver/nextcloud:amd64-", + "armv7": "lscr.io/linuxserver/nextcloud:arm32v7-" }, "codenotary": { "signer": "alexandrep.github@gmail.com" diff --git a/nextcloud/config.json b/nextcloud/config.json index dbbdc6ad7..cf5fd26a8 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.7", + "version": "25.0.0-9", "webui": "https://[HOST]:[PORT:443]" } diff --git a/nextcloud/rootfs/etc/cont-init.d/10-adduser.sh b/nextcloud/rootfs/etc/cont-init.d/10-adduser.sh index 7a94d879d..234acd69f 100644 --- a/nextcloud/rootfs/etc/cont-init.d/10-adduser.sh +++ b/nextcloud/rootfs/etc/cont-init.d/10-adduser.sh @@ -41,3 +41,4 @@ chown abc:abc /data/config chown abc:abc /defaults rm /config/nginx/site-confs/default 2>/dev/null || true +rm /data/config/nginx/nginx.conf || true diff --git a/nextcloud/rootfs/etc/cont-init.d/30-keygen.sh b/nextcloud/rootfs/etc/cont-init.d/30-keygen.sh index 0e3747333..67db8d3f8 100644 --- a/nextcloud/rootfs/etc/cont-init.d/30-keygen.sh +++ b/nextcloud/rootfs/etc/cont-init.d/30-keygen.sh @@ -25,7 +25,7 @@ fi #Sets certificates echo "... adding ssl certs in files" #Sets certificates -for NGINXFILE in "/defaults/default" "/config/nginx/site-confs/default" "/data/config/nginx/site-confs/default"; do +for NGINXFILE in "/data/config/nginx/ssl.conf" "/defaults/nginx/ssl.conf.sample" "/data/config/nginx/nginx.conf"; do if [ -f $NGINXFILE ]; then LINE=$(sed -n "/ssl_certificate /=" $NGINXFILE) if [[ -n "$LINE" ]]; then diff --git a/nextcloud/rootfs/etc/cont-init.d/93-config.sh b/nextcloud/rootfs/etc/cont-init.d/93-config.sh index 676c3f523..555416199 100644 --- a/nextcloud/rootfs/etc/cont-init.d/93-config.sh +++ b/nextcloud/rootfs/etc/cont-init.d/93-config.sh @@ -34,5 +34,7 @@ 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' => false," "$files" + sed -i "/allow_local_remote_servers/d" "$files" + sed -i "/datadirectory/a 'allow_local_remote_servers' => true," "$files" fi done diff --git a/nextcloud/rootfs/etc/cont-init.d/99-custom_scripts.sh b/nextcloud/rootfs/etc/cont-init.d/99-custom_scripts.sh index 626d33299..02871181d 100644 --- a/nextcloud/rootfs/etc/cont-init.d/99-custom_scripts.sh +++ b/nextcloud/rootfs/etc/cont-init.d/99-custom_scripts.sh @@ -8,3 +8,8 @@ do bash "$file" fi done + +# Use php7 +if [ -f /data/config/crontabs/root ]; then + sed -i "s|php7|php|g" /data/config/crontabs/root +fi diff --git a/nextcloud/updater.json b/nextcloud/updater.json index 3991de020..1974e548e 100644 --- a/nextcloud/updater.json +++ b/nextcloud/updater.json @@ -1,8 +1,9 @@ { - "last_update": "08-10-2022", + "last_update": "20-10-2022", + "paused": true, "repository": "alexbelgium/hassio-addons", "slug": "nextcloud", "source": "github", "upstream_repo": "linuxserver/docker-nextcloud", - "upstream_version": "24.0.6" + "upstream_version": "25.0.0" } diff --git a/nzbget/CHANGELOG.md b/nzbget/CHANGELOG.md index d4e5fba67..8c26aeeed 100644 --- a/nzbget/CHANGELOG.md +++ b/nzbget/CHANGELOG.md @@ -1,4 +1,10 @@ +## v21.1-ls127 (29-10-2022) +- Update to latest version from linuxserver/docker-nzbget + +## v21.1-ls126 (22-10-2022) +- Update to latest version from linuxserver/docker-nzbget + ## v21.1-ls125 (24-09-2022) - Update to latest version from linuxserver/docker-nzbget diff --git a/nzbget/Dockerfile b/nzbget/Dockerfile index cb9430797..c98366576 100644 --- a/nzbget/Dockerfile +++ b/nzbget/Dockerfile @@ -33,22 +33,22 @@ RUN \ # Global LSIO modifications ARG CONFIGLOCATION="/config/addons_config/nzbget" -# hadolint ignore=SC2015, SC2013 +# hadolint ignore=SC2015, SC2013, SC2086 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 \ + 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" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + && for file in $(grep -srl "PUID" /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" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $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 -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $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 + && for file 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}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done ################## # 3 Install apps # diff --git a/nzbget/config.json b/nzbget/config.json index 8fcfa7e2c..d63f09147 100644 --- a/nzbget/config.json +++ b/nzbget/config.json @@ -79,5 +79,5 @@ }, "slug": "nzbget", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "v21.1-ls125" + "version": "v21.1-ls127" } diff --git a/nzbget/updater.json b/nzbget/updater.json index 4370e95f7..a463d5668 100644 --- a/nzbget/updater.json +++ b/nzbget/updater.json @@ -1,9 +1,9 @@ { "github_fulltag": "true", - "last_update": "24-09-2022", + "last_update": "29-10-2022", "repository": "alexbelgium/hassio-addons", "slug": "nzbget", "source": "github", "upstream_repo": "linuxserver/docker-nzbget", - "upstream_version": "v21.1-ls125" + "upstream_version": "v21.1-ls127" } diff --git a/omada/CHANGELOG.md b/omada/CHANGELOG.md index 4763af0a8..6a1e41139 100644 --- a/omada/CHANGELOG.md +++ b/omada/CHANGELOG.md @@ -1,4 +1,16 @@ +## 5.6-chromium-amd64-2022-10-28 (2022-10-28) +- Update to latest version from mbentley/omada-controller + +## 5.6-chromium-amd64-2022-10-24 (2022-10-24) +- Update to latest version from mbentley/omada-controller + +## 5.5-chromium-amd64-2022-10-21 (2022-10-21) +- Update to latest version from mbentley/omada-controller + +## 5.5-chromium-amd64-2022-10-19 (2022-10-19) +- Update to latest version from mbentley/omada-controller + ## 5.5-chromium-amd64-2022-10-17 (2022-10-17) - Update to latest version from mbentley/omada-controller diff --git a/omada/Dockerfile b/omada/Dockerfile index 9ef87fdd7..cce70ad09 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-10-17" +ARG BUILD_UPSTREAM="5.6-chromium-amd64-2022-10-28" FROM ${BUILD_FROM} ################## diff --git a/omada/config.json b/omada/config.json index c0cfbfbf3..01da3a196 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-10-17", + "version": "5.6-chromium-amd64-2022-10-28", "webui": "[PROTO:ssl]://[HOST]:[PORT:8088]" } diff --git a/omada/rootfs/etc/cont-init.d/00-folders.sh b/omada/rootfs/etc/cont-init.d/00-folders.sh index c1c21cb3a..fb299cb7c 100644 --- a/omada/rootfs/etc/cont-init.d/00-folders.sh +++ b/omada/rootfs/etc/cont-init.d/00-folders.sh @@ -1,12 +1,12 @@ #!/bin/bash # shellcheck shell=bash -CONFIGSOURCE="/config/addons_config/omada" +CONFIGSOURCE="/data" # Use ssl if [ -d /ssl ]; then mkdir -p /cert - cp /ssl/* /cert + cp /ssl/* /cert 2>/dev/null chown -R 508:508 /cert fi @@ -17,21 +17,24 @@ if [ ! -f "$CONFIGSOURCE" ]; then fi # Ensure structure is correct -mkdir -p "$CONFIGSOURCE"/db "$CONFIGSOURCE"/html "$CONFIGSOURCE"/pdf cp -rnf /opt/tplink/EAPController/data/* "$CONFIGSOURCE" +echo "Creating symlink" +rm -r /opt/tplink/EAPController/data/* + +mkdir -p "$CONFIGSOURCE"/pdf +mkdir -p "$CONFIGSOURCE"/omada/html +mkdir -p "$CONFIGSOURCE"/db +mkdir -p "$CONFIGSOURCE"/map +mkdir -p "$CONFIGSOURCE"/portal + +ln -s "$CONFIGSOURCE"/pdf /opt/tplink/EAPController/data +ln -s "$CONFIGSOURCE"/omada/html /opt/tplink/EAPController/data +ln -s "$CONFIGSOURCE"/db /opt/tplink/EAPController/data +ln -s "$CONFIGSOURCE"/map /opt/tplink/EAPController/data +ln -s "$CONFIGSOURCE"/portal /opt/tplink/EAPController/data + # Make sure permissions are right echo "Updating permissions" +chmod -R 777 "$CONFIGSOURCE" chown -R "508:508" "$CONFIGSOURCE" - -# Delete previous directories -echo "Removing previous directories" -rm -r /opt/tplink/EAPController/data/html -rm -r /opt/tplink/EAPController/data/pdf -rm -r /opt/tplink/EAPController/data/db - -# Create symlink -echo "Creating symlink" -ln -s /config/addons_config/omada/pdf /opt/tplink/EAPController/data/pdf -ln -s /config/addons_config/omada/html /opt/tplink/EAPController/data/html -ln -s /config/addons_config/omada/db /opt/tplink/EAPController/data/db diff --git a/omada/updater.json b/omada/updater.json index 7fd033e65..fd8a09614 100644 --- a/omada/updater.json +++ b/omada/updater.json @@ -1,9 +1,9 @@ { "dockerhub_by_date": true, - "last_update": "2022-10-17", + "last_update": "2022-10-28", "repository": "alexbelgium/hassio-addons", "slug": "omada", "source": "dockerhub", "upstream_repo": "mbentley/omada-controller", - "upstream_version": "5.5-chromium-amd64-2022-10-17" + "upstream_version": "5.6-chromium-amd64-2022-10-28" } diff --git a/omada_v3/CHANGELOG.md b/omada_v3/CHANGELOG.md index 4763af0a8..6a1e41139 100644 --- a/omada_v3/CHANGELOG.md +++ b/omada_v3/CHANGELOG.md @@ -1,4 +1,16 @@ +## 5.6-chromium-amd64-2022-10-28 (2022-10-28) +- Update to latest version from mbentley/omada-controller + +## 5.6-chromium-amd64-2022-10-24 (2022-10-24) +- Update to latest version from mbentley/omada-controller + +## 5.5-chromium-amd64-2022-10-21 (2022-10-21) +- Update to latest version from mbentley/omada-controller + +## 5.5-chromium-amd64-2022-10-19 (2022-10-19) +- Update to latest version from mbentley/omada-controller + ## 5.5-chromium-amd64-2022-10-17 (2022-10-17) - Update to latest version from mbentley/omada-controller diff --git a/omada_v3/Dockerfile b/omada_v3/Dockerfile index 29426b61d..a7c45f213 100644 --- a/omada_v3/Dockerfile +++ b/omada_v3/Dockerfile @@ -16,7 +16,7 @@ ARG BUILD_FROM ARG BUILD_VERSION -ARG BUILD_UPSTREAM="5.5-chromium-amd64-2022-10-17" +ARG BUILD_UPSTREAM="5.6-chromium-amd64-2022-10-28" FROM ${BUILD_FROM} ################## diff --git a/omada_v3/config.json b/omada_v3/config.json index dcda1f9ee..b450b3fb5 100644 --- a/omada_v3/config.json +++ b/omada_v3/config.json @@ -45,6 +45,6 @@ }, "slug": "omada_v3", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "5.5-chromium-amd64-2022-10-17", + "version": "5.6-chromium-amd64-2022-10-28", "webui": "[PROTO:ssl]://[HOST]:[PORT:8088]" } diff --git a/omada_v3/rootfs/etc/cont-init.d/00-folders.sh b/omada_v3/rootfs/etc/cont-init.d/00-folders.sh index 2aa8bd12c..b76ab0c99 100644 --- a/omada_v3/rootfs/etc/cont-init.d/00-folders.sh +++ b/omada_v3/rootfs/etc/cont-init.d/00-folders.sh @@ -3,6 +3,13 @@ CONFIGSOURCE="/data" +# Use ssl +if [ -d /ssl ]; then + mkdir -p /cert + cp /ssl/* /cert 2>/dev/null + chown -R 508:508 /cert +fi + # Create directory if [ ! -d "$CONFIGSOURCE" ]; then echo "Creating directory" diff --git a/omada_v3/updater.json b/omada_v3/updater.json index 9e6968354..91f21e57a 100644 --- a/omada_v3/updater.json +++ b/omada_v3/updater.json @@ -1,9 +1,9 @@ { "dockerhub_by_date": true, - "last_update": "2022-10-17", + "last_update": "2022-10-28", "repository": "alexbelgium/hassio-addons", "slug": "omada_v3", "source": "dockerhub", "upstream_repo": "mbentley/omada-controller", - "upstream_version": "5.5-chromium-amd64-2022-10-17" + "upstream_version": "5.6-chromium-amd64-2022-10-28" } diff --git a/ombi/Dockerfile b/ombi/Dockerfile index 62886a489..248d24df4 100644 --- a/ombi/Dockerfile +++ b/ombi/Dockerfile @@ -29,22 +29,22 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # Global LSIO modifications ARG CONFIGLOCATION="/config/addons_config/ombi" -# hadolint ignore=SC2015, SC2013 +# hadolint ignore=SC2015, SC2013, SC2086 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 \ + 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" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + && for file in $(grep -srl "PUID" /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" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $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 -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $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 + && for file 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}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done ################## # 3 Install apps # diff --git a/organizr/Dockerfile b/organizr/Dockerfile index ed5dc171a..ab4ef2832 100644 --- a/organizr/Dockerfile +++ b/organizr/Dockerfile @@ -28,22 +28,22 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # Global LSIO modifications ARG CONFIGLOCATION="/data/organizr" -# hadolint ignore=SC2015, SC2013 +# hadolint ignore=SC2015, SC2013, SC2086 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 \ + 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" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + && for file in $(grep -srl "PUID" /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" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $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 -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $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 + && for file 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}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done ################## # 3 Install apps # diff --git a/overseerr/Dockerfile b/overseerr/Dockerfile index 7d4b28b9c..0ad128fa2 100644 --- a/overseerr/Dockerfile +++ b/overseerr/Dockerfile @@ -30,22 +30,22 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # Global LSIO modifications ARG CONFIGLOCATION="/config/addons_config/overseerr" -# hadolint ignore=SC2015, SC2013 +# hadolint ignore=SC2015, SC2013, SC2086 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 \ + 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" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + && for file in $(grep -srl "PUID" /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" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $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 -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $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 + && for file 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}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done ################## # 3 Install apps # diff --git a/paperless_ngx/CHANGELOG.md b/paperless_ngx/CHANGELOG.md index 06d8513bc..3cf2372b7 100644 --- a/paperless_ngx/CHANGELOG.md +++ b/paperless_ngx/CHANGELOG.md @@ -1,89 +1,122 @@ +## 1.9.2 (02-11-2022) +- Update to latest version from paperless-ngx/paperless-ngx +- BACKUP BEFORE UPDATE : switch to paperless-ngx image. Please backup before switch. + ## v1.8.0-ls30 (24-09-2022) + - Update to latest version from linuxserver/docker-paperless-ngx ## 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 ## v1.8.0-ls27 (02-09-2022) + - Update to latest version from linuxserver/docker-paperless-ngx ## v1.8.0-ls26 (20-08-2022) + - Update to latest version from linuxserver/docker-paperless-ngx ## v1.8.0-ls25 (11-08-2022) + - Update to latest version from linuxserver/docker-paperless-ngx ## v1.7.1-ls24 (23-07-2022) + - Update to latest version from linuxserver/docker-paperless-ngx ## v1.7.1-ls23 (16-07-2022) + - Update to latest version from linuxserver/docker-paperless-ngx ## v1.7.1-ls22 (09-07-2022) + - Update to latest version from linuxserver/docker-paperless-ngx ## v1.7.1-ls21 (07-07-2022) + - Update to latest version from linuxserver/docker-paperless-ngx ## v1.7.1-ls20 (02-07-2022) + - Update to latest version from linuxserver/docker-paperless-ngx ## v1.7.1-ls19 (25-06-2022) + - Update to latest version from linuxserver/docker-paperless-ngx ## v1.7.1-ls18 (18-06-2022) + - Update to latest version from linuxserver/docker-paperless-ngx ## v1.7.1-ls17 (11-06-2022) + - Update to latest version from linuxserver/docker-paperless-ngx ## v1.7.1-ls16 (04-06-2022) + - Update to latest version from linuxserver/docker-paperless-ngx ## v1.7.1-ls15 (31-05-2022) + - Update to latest version from linuxserver/docker-paperless-ngx ## v1.7.1-ls14 (19-05-2022) + - Update to latest version from linuxserver/docker-paperless-ngx ## v1.7.1-ls13 (17-05-2022) + - Update to latest version from linuxserver/docker-paperless-ngx ## v1.7.1-ls12 (14-05-2022) + - Update to latest version from linuxserver/docker-paperless-ngx ## v1.7.1-ls10 (12-05-2022) + - Update to latest version from linuxserver/docker-paperless-ngx ## ngx-1.7.0-ls9 (10-05-2022) + - Update to latest version from linuxserver/docker-paperless-ngx ## ngx-1.7.0-ls8 (06-05-2022) + - Update to latest version from linuxserver/docker-paperless-ngx ## ngx-1.7.0-ls7 (01-05-2022) + - Update to latest version from linuxserver/docker-paperless-ngx ## ngx-1.7.0-ls6 (29-04-2022) + - Update to latest version from linuxserver/docker-paperless-ngx ## ngx-1.7.0-ls5 (27-04-2022) + - Update to latest version from linuxserver/docker-paperless-ngx ## ngx-1.6.0-ls4 (14-04-2022) + - Update to latest version from linuxserver/docker-paperless-ngx ## ngx-1.6.0-ls3 (09-04-2022) + - Update to latest version from linuxserver/docker-paperless-ngx ## ngx-1.6.0-ls2 (02-04-2022) + - Update to latest version from linuxserver/docker-paperless-ngx ## ngx-1.6.0-ls1 (28-03-2022) + - Update to latest version from linuxserver/docker-paperless-ngx - Major change : switch to paperless NGX - Add codenotary sign diff --git a/paperless_ngx/Dockerfile b/paperless_ngx/Dockerfile index dcc8edd6f..051346099 100644 --- a/paperless_ngx/Dockerfile +++ b/paperless_ngx/Dockerfile @@ -16,7 +16,8 @@ ARG BUILD_FROM ARG BUILD_VERSION -FROM ${BUILD_FROM} +ARG BUILD_UPSTREAM="1.9.2" +FROM ${BUILD_FROM}${BUILD_UPSTREAM} ################## # 2 Modify Image # @@ -27,25 +28,6 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \ S6_SERVICES_GRACETIME=0 -# Global LSIO modifications -ARG CONFIGLOCATION="/config/addons_config/paperless_ng" -# hadolint ignore=SC2015, SC2013 -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" /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" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$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 -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$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 - ################## # 3 Install apps # ################## @@ -58,6 +40,25 @@ RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ if [ -f /entrypoint.sh ]; then chmod 755 /entrypoint.sh; fi +ENV \ + PAPERLESS_DATA_DIR=/config/addons_config/paperless_ng \ + PAPERLESS_MEDIA_ROOT=/config/addons_config/paperless_ng/media \ + PAPERLESS_CONSUMPTION_DIR=/config/addons_config/paperless_ng/consume + +# Modify image +# hadolint ignore=SC2016 +RUN \ + sed -i 's|usr/bin/env bash|usr/bin/env bashio|g' /sbin/docker-entrypoint.sh && \ + # Run entrypoint + sed -i '2i /./entrypoint.sh' /sbin/docker-entrypoint.sh && \ + # Set variables + sed -i '2i bashio::log.info "Defining variables"' /sbin/docker-entrypoint.sh && \ + sed -i '2i if bashio::config.has_value "PUID"; then export USERMAP_UID=$(bashio::config "PUID"); fi' /sbin/docker-entrypoint.sh && \ + sed -i '2i if bashio::config.has_value "PGID"; then export USERMAP_GID=$(bashio::config "PGID"); fi' /sbin/docker-entrypoint.sh && \ + sed -i '2i if bashio::config.has_value "TZ"; then export PAPERLESS_TIME_ZONE=$(bashio::config "TZ"); fi' /sbin/docker-entrypoint.sh && \ + sed -i '2i if bashio::config.has_value "OCRLANG"; then export PAPERLESS_OCR_LANGUAGES=$(bashio::config "OCRLANG"); fi' /sbin/docker-entrypoint.sh && \ + sed -i '2i if bashio::config.has_value "PAPERLESS_OCR_MODE"; then export PAPERLESS_OCR_MODE=$(bashio::config "PAPERLESS_OCR_MODE"); fi' /sbin/docker-entrypoint.sh + # Modules ARG MODULES="00-banner.sh 92-local_mounts.sh 92-smb_mounts.sh 90-config_yaml.sh" @@ -70,9 +71,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE # Manual apps -ENV PACKAGES="yamllint \ - pip \ - libxml2-dev libxslt-dev python-dev libjpeg-dev zlib1g-dev python3-dev build-essential" +ENV PACKAGES="redis-server yamllint pip libxml2-dev libxslt-dev python-dev libjpeg-dev zlib1g-dev python3-dev build-essential" # Automatic apps & bashio # hadolint ignore=SC2015 @@ -88,10 +87,10 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get # 4 Entrypoint # ################ -#RUN chmod 777 /entrypoint.sh +RUN chmod 777 /entrypoint.sh #WORKDIR / #ENTRYPOINT [ "/usr/bin/env" ] -#CMD [ "/entrypoint.sh" ] +#ENTRYPOINT [ "/entrypoint.sh" ] #SHELL ["/bin/bash", "-o", "pipefail", "-c"] ############ diff --git a/paperless_ngx/build.json b/paperless_ngx/build.json index aeed85df6..6e2168be3 100644 --- a/paperless_ngx/build.json +++ b/paperless_ngx/build.json @@ -1,8 +1,8 @@ { "build_from": { - "aarch64": "lscr.io/linuxserver/paperless-ngx:arm64v8-latest", - "amd64": "lscr.io/linuxserver/paperless-ngx:amd64-latest", - "armv7": "lscr.io/linuxserver/paperless-ngx:arm32v7-latest" + "aarch64": "ghcr.io/paperless-ngx/paperless-ngx:", + "amd64": "ghcr.io/paperless-ngx/paperless-ngx:", + "armv7": "ghcr.io/paperless-ngx/paperless-ngx:" }, "codenotary": { "signer": "alexandrep.github@gmail.com" diff --git a/paperless_ngx/config.json b/paperless_ngx/config.json index 5366823b8..530393aa4 100644 --- a/paperless_ngx/config.json +++ b/paperless_ngx/config.json @@ -56,7 +56,9 @@ "options": { "CONFIG_LOCATION": "/config/addons_config/paperless_ng/config.yaml", "PGID": 0, - "PUID": 0 + "PUID": 0, + "PAPERLESS_OCR_MODE": "skip", + "OCRLANG": "ENG" }, "ports": { "8000/tcp": 8011 @@ -74,6 +76,7 @@ "PGID": "int", "PUID": "int", "TZ": "str?", + "PAPERLESS_OCR_MODE": "list(skip|redo|force|skip_noarchive)?", "cifspassword": "str?", "cifsusername": "str?", "localdisks": "str?", @@ -81,6 +84,6 @@ }, "slug": "paperless_ng", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "v1.8.0-ls30", + "version": "1.9.2", "webui": "[PROTO:ssl]://[HOST]:[PORT:8000]" } diff --git a/paperless_ngx/rootfs/entrypoint.sh b/paperless_ngx/rootfs/entrypoint.sh new file mode 100644 index 000000000..85d8a9212 --- /dev/null +++ b/paperless_ngx/rootfs/entrypoint.sh @@ -0,0 +1,27 @@ +#!/bin/bash +echo "Starting..." + +############################ +# Backup Dockerfile Script # +############################ + +if [ -f /etc/cont-init.d/00-aaa_dockerfile_backup.sh ]; then + chown "$(id -u)":"$(id -g)" /etc/cont-init.d/00-aaa_dockerfile_backup.sh + chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh + /./etc/cont-init.d/00-aaa_dockerfile_backup.sh + rm /etc/cont-init.d/00-aaa_dockerfile_backup.sh +fi + +#################### +# Starting scripts # +#################### + +for SCRIPTS in /etc/cont-init.d/*; do + [ -e "$SCRIPTS" ] || continue + echo "$SCRIPTS: executing" + chown "$(id -u)":"$(id -g)" "$SCRIPTS" + chmod a+x "$SCRIPTS" + # Change shebang if no s6 supervision + sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS" + /."$SCRIPTS" || echo "$SCRIPTS: exiting $?" +done diff --git a/paperless_ngx/rootfs/etc/cont-init.d/20-folders.sh b/paperless_ngx/rootfs/etc/cont-init.d/20-folders.sh index bd2369978..8cedd1b6b 100644 --- a/paperless_ngx/rootfs/etc/cont-init.d/20-folders.sh +++ b/paperless_ngx/rootfs/etc/cont-init.d/20-folders.sh @@ -4,16 +4,9 @@ slug=paperless_ng if [ ! -d /config/addons_config/$slug ]; then - - if [ -d /config/$slug ]; then - echo "Moving to new location /config/addons_config/$slug" - mkdir -p /config/addons_config/$slug - chmod 777 /config/addons_config/$slug - mv /config/$slug/* /config/addons_config/$slug/ - rm -r /config/$slug - fi - echo "Creating /config/addons_config/$slug" mkdir -p /config/addons_config/$slug - chmod 777 /config/addons_config/$slug fi + +chmod -R 755 /config/addons_config/$slug +chown -R paperless:paperless /config/addons_config/$slug diff --git a/paperless_ngx/rootfs/etc/cont-init.d/91-pikepdf.sh b/paperless_ngx/rootfs/etc/cont-init.d/91-pikepdf.sh deleted file mode 100644 index bf7a9682b..000000000 --- a/paperless_ngx/rootfs/etc/cont-init.d/91-pikepdf.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/with-contenv bashio -# shellcheck shell=bash - -echo "Installing pikepdf..." -( - export DEBIAN_FRONTEND="noninteractive" - export TERM="xterm-256color" - apt-get update - apt-get install -yq libxml2-dev libxslt-dev python-dev - apt-get install -yq libjpeg-dev zlib1g-dev - apt-get install -yq python3-dev build-essential - pip install pikepdf --force-reinstall -) >/dev/null -echo "... success!" diff --git a/paperless_ngx/rootfs/etc/cont-init.d/93-multiocr.sh b/paperless_ngx/rootfs/etc/cont-init.d/93-multiocr.sh deleted file mode 100644 index 36578a964..000000000 --- a/paperless_ngx/rootfs/etc/cont-init.d/93-multiocr.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/with-contenv bashio -# shellcheck shell=bash - -OCRLANG=$(bashio::config 'OCRLANG') -if [ -n "$OCRLANG" ]; then - apt-get update &>/dev/null - echo "OCRLANG variable is set, processing the language packages" - for i in ${OCRLANG//,/ }; do - if apt-cache show tesseract-ocr-"${i}" >/dev/null 2>&1; then - apt-get install -yq tesseract-ocr-"${i}" - bashio::log.info "OCR Language installed : $i" || bashio::log.fatal "Couldn't install OCR lang $i. Please check its format is conform" - else - echo "package tesseract-ocr-${i} not found in the repository, skipping" - fi - done -fi diff --git a/paperless_ngx/rootfs/etc/cont-init.d/99-run.sh b/paperless_ngx/rootfs/etc/cont-init.d/99-run.sh index bccae88fc..02fb35864 100644 --- a/paperless_ngx/rootfs/etc/cont-init.d/99-run.sh +++ b/paperless_ngx/rootfs/etc/cont-init.d/99-run.sh @@ -1,4 +1,37 @@ #!/usr/bin/with-contenv bashio # shellcheck shell=bash +################# +# Staring redis # +################# +exec redis-server & bashio::log.info "Starting redis" + +########################### +# Avoid overcommit memory # +########################### +bashio::log.info "Avoid overcommit memory" +sysctl vm.overcommit_memory=1 + +############################### +# Create user if not existing # +############################### +# Origin : https://github.com/linuxserver/docker-paperless-ngx/blob/main/root/etc/cont-init.d/99-migrations +bashio::log.info "Creating default user" +cat << EOF | python3 /app/paperless/src/manage.py shell +from django.contrib.auth import get_user_model + +# see ref. below +UserModel = get_user_model() + +if len(UserModel.objects.all()) == 1: + print("Creating new user") + user = UserModel.objects.create_user('admin', password='admin') + user.is_superuser = True + user.is_staff = True + user.save() +EOF + +######### +# Start # +######### bashio::log.info "Initial username and password are admin. Please change in the administration panel of the webUI after login." diff --git a/paperless_ngx/updater.json b/paperless_ngx/updater.json index c59829557..9b45a4522 100644 --- a/paperless_ngx/updater.json +++ b/paperless_ngx/updater.json @@ -1,9 +1,9 @@ { - "github_fulltag": "true", - "last_update": "24-09-2022", + "github_fulltag": "false", + "last_update": "02-11-2022", "repository": "alexbelgium/hassio-addons", "slug": "paperless_ngx", "source": "github", - "upstream_repo": "linuxserver/docker-paperless-ngx", - "upstream_version": "v1.8.0-ls30" + "upstream_repo": "paperless-ngx/paperless-ngx", + "upstream_version": "1.9.2" } diff --git a/papermerge/Dockerfile b/papermerge/Dockerfile index d8678d6d9..8a111ec3b 100644 --- a/papermerge/Dockerfile +++ b/papermerge/Dockerfile @@ -36,22 +36,22 @@ RUN \ # Global LSIO modifications ARG CONFIGLOCATION="/config" -# hadolint ignore=SC2015, SC2013 +# hadolint ignore=SC2015, SC2013, SC2086 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 \ + 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" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + && for file in $(grep -srl "PUID" /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" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $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 -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $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 + && for file 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}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done ################## # 3 Install apps # diff --git a/piwigo/CHANGELOG.md b/piwigo/CHANGELOG.md index 69b646550..4b2261cbe 100644 --- a/piwigo/CHANGELOG.md +++ b/piwigo/CHANGELOG.md @@ -1,4 +1,7 @@ +## 13.1.0 (25-10-2022) +- Update to latest version from linuxserver/docker-piwigo + ## 13.0.0 (13-10-2022) - Update to latest version from linuxserver/docker-piwigo diff --git a/piwigo/Dockerfile b/piwigo/Dockerfile index fe8484e2c..12d9ac144 100644 --- a/piwigo/Dockerfile +++ b/piwigo/Dockerfile @@ -29,22 +29,22 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # Global LSIO modifications ARG CONFIGLOCATION="/config" -# hadolint ignore=SC2015, SC2013 +# hadolint ignore=SC2015, SC2013, SC2086 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 \ + 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" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + && for file in $(grep -srl "PUID" /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" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $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 -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $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 + && for file 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}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done ################## # 3 Install apps # diff --git a/piwigo/config.json b/piwigo/config.json index 6c31c35fc..74811e75b 100644 --- a/piwigo/config.json +++ b/piwigo/config.json @@ -77,6 +77,6 @@ "slug": "piwigo", "stage": "experimental", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "13.0.0", + "version": "13.1.0", "webui": "[PROTO:ssl]://[HOST]:[PORT:80]" } diff --git a/piwigo/updater.json b/piwigo/updater.json index 583219de5..fa8e444c5 100644 --- a/piwigo/updater.json +++ b/piwigo/updater.json @@ -1,8 +1,8 @@ { - "last_update": "13-10-2022", + "last_update": "25-10-2022", "repository": "alexbelgium/hassio-addons", "slug": "piwigo", "source": "github", "upstream_repo": "linuxserver/docker-piwigo", - "upstream_version": "13.0.0" + "upstream_version": "13.1.0" } diff --git a/plex/CHANGELOG.md b/plex/CHANGELOG.md index 8ee7346ef..ffc378d13 100644 --- a/plex/CHANGELOG.md +++ b/plex/CHANGELOG.md @@ -1,4 +1,16 @@ +## 1.29.1.6316-f4cdfea9c-ls141 (02-11-2022) +- Update to latest version from linuxserver/docker-plex + +## 1.29.1.6316-f4cdfea9c-ls140 (25-10-2022) +- Update to latest version from linuxserver/docker-plex + +## 1.29.1.6316-f4cdfea9c-ls139 (22-10-2022) +- Update to latest version from linuxserver/docker-plex + +## 1.29.1.6313-f4cdfea9c-ls135 (20-10-2022) +- Update to latest version from linuxserver/docker-plex + ## 1.29.0.6244-819d3678c-ls134 (29-09-2022) - Update to latest version from linuxserver/docker-plex diff --git a/plex/Dockerfile b/plex/Dockerfile index d0460ac20..644789824 100644 --- a/plex/Dockerfile +++ b/plex/Dockerfile @@ -28,32 +28,32 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ S6_SERVICES_GRACETIME=0 # Image specific modifications -# hadolint ignore=SC2016 +# hadolint ignore=SC2016,SC2086 RUN \ # CORRECT PLEX CLAIM - file="$(grep -sril 'Server claimed successfully, navigate to http://serverip:32400/web to complete plex setup' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d)" \ - && sed -i 's/with-contenv bash/with-contenv bashio/g' "$file" \ - && sed -i '2iexport PLEX_CLAIM=$(bashio::config "claim")' "$file" \ - && sed -i '3i[ $PLEX_CLAIM = "Get_from_https://www.plex.tv/claim" ] && bashio::log.warning "Please change the PLEX_CLAIM code from the options" && exit 1 || true' "$file" + file=$(grep -sril 'Server claimed successfully' /etc) \ + && sed -i 's/with-contenv bash/with-contenv bashio/g' $file \ + && sed -i '2iexport PLEX_CLAIM=$(bashio::config "claim")' $file \ + && sed -i '3i[ $PLEX_CLAIM = "Get_from_https://www.plex.tv/claim" ] && bashio::log.warning "Please change the PLEX_CLAIM code from the options" && exit 1 || true' $file # Global LSIO modifications ARG CONFIGLOCATION="/config" -# hadolint ignore=SC2015, SC2013 +# hadolint ignore=SC2015, SC2013, SC2086 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 \ + 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" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + && for file in $(grep -srl "PUID" /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" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $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 -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $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 + && for file 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}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done ################## diff --git a/plex/config.json b/plex/config.json index bbbbf02d2..846c913ca 100644 --- a/plex/config.json +++ b/plex/config.json @@ -115,7 +115,7 @@ }, "slug": "plex_nas", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/plex", - "version": "1.29.0.6244-819d3678c-ls134", + "version": "1.29.1.6316-f4cdfea9c-ls141", "video": true, "webui": "[PROTO:ssl]://[HOST]:[PORT:32400]/web" } diff --git a/plex/updater.json b/plex/updater.json index 18c1c59e4..4f0d1650d 100644 --- a/plex/updater.json +++ b/plex/updater.json @@ -1,9 +1,9 @@ { "github_fulltag": "true", - "last_update": "29-09-2022", + "last_update": "02-11-2022", "repository": "alexbelgium/hassio-addons", "slug": "plex", "source": "github", "upstream_repo": "linuxserver/docker-plex", - "upstream_version": "1.29.0.6244-819d3678c-ls134" + "upstream_version": "1.29.1.6316-f4cdfea9c-ls141" } diff --git a/plex_meta_manager/CHANGELOG.md b/plex_meta_manager/CHANGELOG.md index a879f28a1..3c0462871 100644 --- a/plex_meta_manager/CHANGELOG.md +++ b/plex_meta_manager/CHANGELOG.md @@ -1,4 +1,10 @@ +## v1.17.3-ls33 (02-11-2022) +- Update to latest version from linuxserver/docker-plex-meta-manager + +## v1.17.3-ls32 (01-11-2022) +- Update to latest version from linuxserver/docker-plex-meta-manager + ## v1.17.3-ls31 (18-10-2022) - Update to latest version from linuxserver/docker-plex-meta-manager diff --git a/plex_meta_manager/Dockerfile b/plex_meta_manager/Dockerfile index 7f589f594..6916a72e7 100644 --- a/plex_meta_manager/Dockerfile +++ b/plex_meta_manager/Dockerfile @@ -37,22 +37,22 @@ RUN \ # Global LSIO modifications ARG CONFIGLOCATION="/config/addons_config/plex-meta-manager" -# hadolint ignore=SC2015, SC2013 +# hadolint ignore=SC2015, SC2013, SC2086 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 \ + 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" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + && for file in $(grep -srl "PUID" /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" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $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 -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $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 + && for file 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}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done ################## # 3 Install apps # diff --git a/plex_meta_manager/config.json b/plex_meta_manager/config.json index bc2ea3456..1a9bbc72e 100644 --- a/plex_meta_manager/config.json +++ b/plex_meta_manager/config.json @@ -34,5 +34,5 @@ }, "slug": "plex-meta-manager", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/plex_meta_manager", - "version": "v1.17.3-ls31" + "version": "v1.17.3-ls33" } diff --git a/plex_meta_manager/updater.json b/plex_meta_manager/updater.json index 4d1537028..ac3666b92 100644 --- a/plex_meta_manager/updater.json +++ b/plex_meta_manager/updater.json @@ -1,9 +1,9 @@ { "github_fulltag": "true", - "last_update": "18-10-2022", + "last_update": "02-11-2022", "repository": "alexbelgium/hassio-addons", "slug": "plex_meta_manager", "source": "github", "upstream_repo": "linuxserver/docker-plex-meta-manager", - "upstream_version": "v1.17.3-ls31" + "upstream_version": "v1.17.3-ls33" } diff --git a/portainer/CHANGELOG.md b/portainer/CHANGELOG.md index 07fe1094a..b4c4ab247 100644 --- a/portainer/CHANGELOG.md +++ b/portainer/CHANGELOG.md @@ -1,4 +1,7 @@ +## 2.16.0 (01-11-2022) +- Update to latest version from portainer/portainer + ## 2.15.1 (17-09-2022) - Update to latest version from portainer/portainer diff --git a/portainer/Dockerfile b/portainer/Dockerfile index 2d37b25d6..febd1a59e 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.1" +ARG BUILD_UPSTREAM="2.16.0" # spellcheck disable=SC2015 # hadolint ignore=SC2015 diff --git a/portainer/config.json b/portainer/config.json index ed1969962..156be4d9c 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.1" + "version": "2.16.0" } diff --git a/portainer/rootfs/etc/services.d/portainer/run b/portainer/rootfs/etc/services.d/portainer/run index f25569d67..420f6fdc6 100644 --- a/portainer/rootfs/etc/services.d/portainer/run +++ b/portainer/rootfs/etc/services.d/portainer/run @@ -42,11 +42,11 @@ CURRENTPASSWORD=$( cat /data/portainer_password ) # Reset password if not first run if bashio::fs.file_exists "/data/hidden"; then - if [ "$CURRENTPASSWORD" != "$PASSWORD" ]; then - mv -f /data/portainer.db /data/portainer.old || true - rm /data/hidden || true - bashio::log.warning "... password changed, database reseted. Previous version stored in /data/portainer.old" - fi + if [ "$CURRENTPASSWORD" != "$PASSWORD" ]; then + mv -f /data/portainer.db /data/portainer.old || true + rm /data/hidden || true + bashio::log.warning "... password changed, database reseted. Previous version stored in /data/portainer.old" + fi fi # Define option diff --git a/portainer/updater.json b/portainer/updater.json index 4e9eed07e..cd15f697c 100644 --- a/portainer/updater.json +++ b/portainer/updater.json @@ -1,9 +1,9 @@ { "github_havingasset": "true", - "last_update": "17-09-2022", + "last_update": "01-11-2022", "repository": "alexbelgium/hassio-addons", "slug": "portainer", "source": "github", "upstream_repo": "portainer/portainer", - "upstream_version": "2.15.1" + "upstream_version": "2.16.0" } diff --git a/prowlarr/CHANGELOG.md b/prowlarr/CHANGELOG.md index 63e2d2fc5..9fa238d79 100644 --- a/prowlarr/CHANGELOG.md +++ b/prowlarr/CHANGELOG.md @@ -1,4 +1,7 @@ +## nightly-0.4.7.2048-ls431 (01-11-2022) +- Update to latest version from linuxserver/docker-prowlarr + ## nightly-0.4.7.2016-ls427 (13-10-2022) - Update to latest version from linuxserver/docker-prowlarr diff --git a/prowlarr/Dockerfile b/prowlarr/Dockerfile index 1d1661dd5..9ecef138c 100644 --- a/prowlarr/Dockerfile +++ b/prowlarr/Dockerfile @@ -29,22 +29,22 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # Global LSIO modifications ARG CONFIGLOCATION="/config/addons_config/prowlarr" -# hadolint ignore=SC2015, SC2013 +# hadolint ignore=SC2015, SC2013, SC2086 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 \ + 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" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + && for file in $(grep -srl "PUID" /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" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $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 -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $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 + && for file 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}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done ################## # 3 Install apps # diff --git a/prowlarr/config.json b/prowlarr/config.json index 7a3b1d241..3aff0c006 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.7.2016-ls427", + "version": "nightly-0.4.7.2048-ls431", "webui": "[PROTO:ssl]://[HOST]:[PORT:9696]" } diff --git a/prowlarr/updater.json b/prowlarr/updater.json index 4b2a9e7d2..70abb339a 100644 --- a/prowlarr/updater.json +++ b/prowlarr/updater.json @@ -1,10 +1,10 @@ { "github_beta": "true", "github_fulltag": "true", - "last_update": "13-10-2022", + "last_update": "01-11-2022", "repository": "alexbelgium/hassio-addons", "slug": "prowlarr", "source": "github", "upstream_repo": "linuxserver/docker-prowlarr", - "upstream_version": "nightly-0.4.7.2016-ls427" + "upstream_version": "nightly-0.4.7.2048-ls431" } diff --git a/qbittorrent/CHANGELOG.md b/qbittorrent/CHANGELOG.md index b0691d5e9..c4bdad7a9 100644 --- a/qbittorrent/CHANGELOG.md +++ b/qbittorrent/CHANGELOG.md @@ -1,4 +1,13 @@ +## 4.4.5-r2-ls226 (01-11-2022) +- Update to latest version from linuxserver/docker-qbittorrent + +## 4.4.5-r2-ls224 (25-10-2022) +- Update to latest version from linuxserver/docker-qbittorrent + +## 4.4.5-r1-ls223 (20-10-2022) +- Update to latest version from linuxserver/docker-qbittorrent + ## 4.4.5-r0-ls222 (18-10-2022) - Update to latest version from linuxserver/docker-qbittorrent diff --git a/qbittorrent/Dockerfile b/qbittorrent/Dockerfile index ee967a152..00e3ec36c 100644 --- a/qbittorrent/Dockerfile +++ b/qbittorrent/Dockerfile @@ -16,7 +16,7 @@ ARG BUILD_FROM ARG BUILD_VERSION -ARG BUILD_UPSTREAM="4.4.5-r0-ls222" +ARG BUILD_UPSTREAM="4.4.5-r2-ls226" FROM ${BUILD_FROM}-$BUILD_UPSTREAM ################## @@ -52,25 +52,25 @@ RUN \ # Global LSIO modifications ARG CONFIGLOCATION="/config/addons_config/qBittorrent" -# hadolint ignore=SC2015, SC2013 +# hadolint ignore=SC2015, SC2013, SC2086 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 \ + 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" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + && for file in $(grep -srl "PUID" /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" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $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 -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $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 \ + && for file 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}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;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 + && for file 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}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done ################## # 3 Install apps # diff --git a/qbittorrent/README.md b/qbittorrent/README.md index 5000edc26..97765cd3a 100644 --- a/qbittorrent/README.md +++ b/qbittorrent/README.md @@ -50,7 +50,7 @@ ssl: true/false certfile: fullchain.pem #ssl certificate, must be located in /ssl keyfile: privkey.pem #sslkeyfile, must be located in /ssl whitelist: "localhost,192.168.0.0/16" # list ip subnets that won't need a password (optional) -customUI: selection from list # alternative webUI can be set here. Latest version set at each addon start. +customUI: selection from list # alternative webUI can be set here. Latest version set at each addon start. Select 'custom' to fill it yourself in the webui DNS_servers: 8.8.8.8,1.1.1.1 # Keep blank to use router’s DNS, or set custom DNS to avoid spamming in case of local DNS ad-remover SavePath: "/share/qbittorrent" # Define the download directory localdisks: sda1 #put the hardware name of your drive to mount separated by commas, or its label. Ex: sda1, sdb1, MYNAS... diff --git a/qbittorrent/config.json b/qbittorrent/config.json index ee6803b17..bb7d6c8f8 100644 --- a/qbittorrent/config.json +++ b/qbittorrent/config.json @@ -98,7 +98,7 @@ "cifsdomain": "str?", "cifspassword": "str?", "cifsusername": "str?", - "customUI": "list(default|vuetorrent|qbit-matUI|qb-web)?", + "customUI": "list(default|vuetorrent|qbit-matUI|qb-web|custom)?", "keyfile": "str", "localdisks": "str?", "networkdisks": "str?", @@ -115,5 +115,5 @@ }, "slug": "qbittorrent", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "4.4.5-r0-ls222" + "version": "4.4.5-r2-ls226" } 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 9dcd71e22..3b866b205 100644 --- a/qbittorrent/rootfs/etc/cont-init.d/91-qbittorrent_configuration.sh +++ b/qbittorrent/rootfs/etc/cont-init.d/91-qbittorrent_configuration.sh @@ -129,15 +129,19 @@ fi # Alternate UI # ################ -# Clean data -sed -i '/AlternativeUIEnabled/d' qBittorrent.conf -sed -i '/RootFolder/d' qBittorrent.conf -rm -f -r /webui -mkdir -p /webui -chown abc:abc /webui - CUSTOMUI=$(bashio::config 'customUI') -if bashio::config.has_value 'customUI' && [ ! "$CUSTOMUI" = default ]; then + +# Clean data if not custom +if [ ! "$CUSTOMUI" = custom ]; then + sed -i '/AlternativeUIEnabled/d' qBittorrent.conf + sed -i '/RootFolder/d' qBittorrent.conf + rm -f -r /webui + mkdir -p /webui + chown abc:abc /webui +fi + +# Install webui +if bashio::config.has_value 'customUI' && [ ! "$CUSTOMUI" = default ] && [ ! "$CUSTOMUI" = custom ]; then ### Variables bashio::log.info "Alternate UI enabled : $CUSTOMUI. If webui don't work, disable this option" diff --git a/qbittorrent/updater.json b/qbittorrent/updater.json index ca4307601..1ba63f33e 100644 --- a/qbittorrent/updater.json +++ b/qbittorrent/updater.json @@ -1,9 +1,9 @@ { "github_fulltag": "true", - "last_update": "18-10-2022", + "last_update": "01-11-2022", "repository": "alexbelgium/hassio-addons", "slug": "qbittorrent", "source": "github", "upstream_repo": "linuxserver/docker-qbittorrent", - "upstream_version": "4.4.5-r0-ls222" + "upstream_version": "4.4.5-r2-ls226" } diff --git a/radarr/Dockerfile b/radarr/Dockerfile index dd85df354..cbcb01abe 100644 --- a/radarr/Dockerfile +++ b/radarr/Dockerfile @@ -29,22 +29,22 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # Global LSIO modifications ARG CONFIGLOCATION="/config/addons_config/radarr" -# hadolint ignore=SC2015, SC2013 +# hadolint ignore=SC2015, SC2013, SC2086 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 \ + 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" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + && for file in $(grep -srl "PUID" /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" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $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 -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $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 + && for file 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}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done ################## # 3 Install apps # diff --git a/readarr/CHANGELOG.md b/readarr/CHANGELOG.md index 4264e92d4..a522a1830 100644 --- a/readarr/CHANGELOG.md +++ b/readarr/CHANGELOG.md @@ -1,4 +1,10 @@ +## nightly-0.1.1.1426-ls139 (01-11-2022) +- Update to latest version from linuxserver/docker-readarr + +## nightly-0.1.1.1426-ls138 (29-10-2022) +- Update to latest version from linuxserver/docker-readarr + ## nightly-0.1.1.1426-ls137 (27-09-2022) - Update to latest version from linuxserver/docker-readarr diff --git a/readarr/Dockerfile b/readarr/Dockerfile index 6918fa4ee..f97c66356 100644 --- a/readarr/Dockerfile +++ b/readarr/Dockerfile @@ -30,22 +30,22 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # Global LSIO modifications ARG CONFIGLOCATION="/config/addons_config/readarr" -# hadolint ignore=SC2015, SC2013 +# hadolint ignore=SC2015, SC2013, SC2086 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 \ + 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" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + && for file in $(grep -srl "PUID" /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" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $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 -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $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 + && for file 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}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done ################## # 3 Install apps # diff --git a/readarr/config.json b/readarr/config.json index d003413f2..c86ab0b4f 100644 --- a/readarr/config.json +++ b/readarr/config.json @@ -78,6 +78,6 @@ }, "slug": "readarr_nas", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/readarr", - "version": "nightly-0.1.1.1426-ls137", + "version": "nightly-0.1.1.1426-ls139", "webui": "[PROTO:ssl]://[HOST]:[PORT:8787]" } diff --git a/readarr/updater.json b/readarr/updater.json index 1e2e8bee8..4fa891eae 100644 --- a/readarr/updater.json +++ b/readarr/updater.json @@ -1,10 +1,10 @@ { "github_beta": "true", "github_fulltag": "true", - "last_update": "27-09-2022", + "last_update": "01-11-2022", "repository": "alexbelgium/hassio-addons", "slug": "readarr", "source": "github", "upstream_repo": "linuxserver/docker-readarr", - "upstream_version": "nightly-0.1.1.1426-ls137" + "upstream_version": "nightly-0.1.1.1426-ls139" } diff --git a/requestrr/Dockerfile b/requestrr/Dockerfile index 41f2b27c6..636e53934 100644 --- a/requestrr/Dockerfile +++ b/requestrr/Dockerfile @@ -29,22 +29,22 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # Global LSIO modifications ARG CONFIGLOCATION="/data" -# hadolint ignore=SC2015, SC2013 +# hadolint ignore=SC2015, SC2013, SC2086 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 \ + 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" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + && for file in $(grep -srl "PUID" /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" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $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 -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $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 + && for file 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}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done ################## # 3 Install apps # diff --git a/resiliosync/Dockerfile b/resiliosync/Dockerfile index 127b25edf..476edd714 100644 --- a/resiliosync/Dockerfile +++ b/resiliosync/Dockerfile @@ -28,13 +28,13 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \ S6_SERVICES_GRACETIME=0 -# hadolint ignore=SC2015,DL4006,SC2013 +# hadolint ignore=SC2015,DL4006,SC2013,SC2086 RUN \ # Correct sync folder - for file in $(grep -Esril "/sync[ '\"/]|/sync\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/sync=/share/resiliosync=g" "$file"; done \ - && for file in $(grep -ril "/share/resiliosync.conf" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/share/resiliosync.conf=/sync.conf=g" "$file"; done \ + for file in $(grep -Esril "/sync[ '\"/]|/sync\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/sync=/share/resiliosync=g" $file; done \ + && for file in $(grep -ril "/share/resiliosync.conf" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/share/resiliosync.conf=/sync.conf=g" $file; done \ # Correct sync folder - && for file in $(grep -Esril "/downloads[ '\"/]|/downloads\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/downloads=/share/resiliosync_downloads=g" "$file"; done \ + && for file in $(grep -Esril "/downloads[ '\"/]|/downloads\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/downloads=/share/resiliosync_downloads=g" $file; done \ # Adapt sync.conf && sed -i 's|"directory_root_policy" : "belowroot"|"directory_root_policy" : "all"|g' /defaults/sync.conf \ && sed -i 's|"allow_empty_password" : false|"allow_empty_password" : true|g' /defaults/sync.conf \ @@ -43,22 +43,22 @@ RUN \ # Global LSIO modifications ARG CONFIGLOCATION="/share/resiliosync_config" -# hadolint ignore=SC2015, SC2013 +# hadolint ignore=SC2015, SC2013, SC2086 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 \ + 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" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + && for file in $(grep -srl "PUID" /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" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $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 -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $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 + && for file 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}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done ################## # 3 Install apps # diff --git a/seafile/CHANGELOG.md b/seafile/CHANGELOG.md index 2ea6c67d9..001a61e12 100644 --- a/seafile/CHANGELOG.md +++ b/seafile/CHANGELOG.md @@ -1,4 +1,7 @@ +## v9.0.11-pro (29-10-2022) +- Update to latest version from haiwen/seahub + ## v9.0.10-pro (13-10-2022) - Update to latest version from haiwen/seahub diff --git a/seafile/config.json b/seafile/config.json index 0a43951d8..0d4f29963 100644 --- a/seafile/config.json +++ b/seafile/config.json @@ -95,6 +95,6 @@ ], "slug": "seafile", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/seafile", - "version": "v9.0.10-pro", + "version": "v9.0.11-pro", "webui": "[PROTO:ssl]://[HOST]:[PORT:8000]" } diff --git a/seafile/updater.json b/seafile/updater.json index 9af9ec9f9..a2bb49577 100644 --- a/seafile/updater.json +++ b/seafile/updater.json @@ -1,10 +1,10 @@ { "github_fulltag": "true", - "last_update": "13-10-2022", + "last_update": "29-10-2022", "paused": false, "repository": "alexbelgium/hassio-addons", "slug": "seafile", "source": "github", "upstream_repo": "haiwen/seahub", - "upstream_version": "v9.0.10-pro" + "upstream_version": "v9.0.11-pro" } diff --git a/sonarr/Dockerfile b/sonarr/Dockerfile index 42589fd08..68579bc40 100644 --- a/sonarr/Dockerfile +++ b/sonarr/Dockerfile @@ -30,22 +30,22 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # Global LSIO modifications ARG CONFIGLOCATION="/config/addons_config/sonarr" -# hadolint ignore=SC2015, SC2013 +# hadolint ignore=SC2015, SC2013, SC2086 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 \ + 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" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + && for file in $(grep -srl "PUID" /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" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $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 -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $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 + && for file 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}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done ################## # 3 Install apps # diff --git a/teamspeak/config.json b/teamspeak/config.json index 26968dfb3..7968b5b84 100644 --- a/teamspeak/config.json +++ b/teamspeak/config.json @@ -7,7 +7,7 @@ "codenotary": "alexandrep.github@gmail.com", "description": "voice communication for online gaming, education and training", "environment": { - "DIST_UPDATE": "1", + "DIST_UPDATE": "0", "GUID": "503", "INIFILE": "1", "PGID": "503", @@ -34,5 +34,5 @@ }, "slug": "teamspeak", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "3.13.6-4" + "version": "3.13.6-6" } diff --git a/transmission/CHANGELOG.md b/transmission/CHANGELOG.md index dc801866b..cce629a7f 100644 --- a/transmission/CHANGELOG.md +++ b/transmission/CHANGELOG.md @@ -1,4 +1,7 @@ +## 3.00-r5-ls138 (29-10-2022) +- Update to latest version from linuxserver/docker-transmission + ## 3.00-r5-ls137 (30-09-2022) - Update to latest version from linuxserver/docker-transmission diff --git a/transmission/Dockerfile b/transmission/Dockerfile index 69b178d7c..d1c7d8b56 100644 --- a/transmission/Dockerfile +++ b/transmission/Dockerfile @@ -29,22 +29,22 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # Global LSIO modifications ARG CONFIGLOCATION="/config/transmission" -# hadolint ignore=SC2015, SC2013 +# hadolint ignore=SC2015, SC2013, SC2086 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 \ + 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" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + && for file in $(grep -srl "PUID" /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" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $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 -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $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 + && for file 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}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done ################## # 3 Install apps # diff --git a/transmission/config.json b/transmission/config.json index 43e9c273e..f07d0cab2 100644 --- a/transmission/config.json +++ b/transmission/config.json @@ -93,5 +93,5 @@ }, "slug": "transmission_ls", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "3.00-r5-ls137" + "version": "3.00-r5-ls138" } diff --git a/transmission/updater.json b/transmission/updater.json index 72acc3ad3..991490841 100644 --- a/transmission/updater.json +++ b/transmission/updater.json @@ -1,9 +1,9 @@ { "github_fulltag": "true", - "last_update": "30-09-2022", + "last_update": "29-10-2022", "repository": "alexbelgium/hassio-addons", "slug": "transmission", "source": "github", "upstream_repo": "linuxserver/docker-transmission", - "upstream_version": "3.00-r5-ls137" + "upstream_version": "3.00-r5-ls138" } diff --git a/transmission_openvpn/config.json b/transmission_openvpn/config.json index c0181adcb..a5843e7e4 100644 --- a/transmission_openvpn/config.json +++ b/transmission_openvpn/config.json @@ -105,5 +105,5 @@ }, "slug": "transmission_openvpn", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "4.0-v27" + "version": "4.0-v29" } diff --git a/transmission_openvpn/rootfs/usr/bin/restart_addon b/transmission_openvpn/rootfs/usr/bin/restart_addon index 68bc6662e..bdff736b2 100644 --- a/transmission_openvpn/rootfs/usr/bin/restart_addon +++ b/transmission_openvpn/rootfs/usr/bin/restart_addon @@ -1,5 +1,4 @@ #!/usr/bin/env bashio - bashio::log.fatal 'Tunnel down, addon restarting in 15 seconds' sleep 15 diff --git a/ubooquity/Dockerfile b/ubooquity/Dockerfile index 8972d993d..a7b9127b0 100644 --- a/ubooquity/Dockerfile +++ b/ubooquity/Dockerfile @@ -39,22 +39,22 @@ RUN \ # Global LSIO modifications ARG CONFIGLOCATION="/config/addons_config/ubooquity" -# hadolint ignore=SC2015, SC2013 +# hadolint ignore=SC2015, SC2013, SC2086 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 \ + 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" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + && for file in $(grep -srl "PUID" /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" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $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 -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $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 + && for file 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}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done ################## # 3 Install apps # diff --git a/unpackerr/Dockerfile b/unpackerr/Dockerfile index 1a1d58a79..04c7b5e1d 100644 --- a/unpackerr/Dockerfile +++ b/unpackerr/Dockerfile @@ -29,22 +29,22 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # Global LSIO modifications ARG CONFIGLOCATION="/config" -# hadolint ignore=SC2015, SC2013 +# hadolint ignore=SC2015, SC2013, SC2086 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 \ + 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" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + && for file in $(grep -srl "PUID" /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" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $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 -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $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 + && for file 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}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done ################## # 3 Install apps # diff --git a/webtop_kde/CHANGELOG.md b/webtop_kde/CHANGELOG.md index a1bec3fd9..42321df70 100644 --- a/webtop_kde/CHANGELOG.md +++ b/webtop_kde/CHANGELOG.md @@ -1,4 +1,10 @@ +## 4.16-r0-ls75 (25-10-2022) +- Update to latest version from linuxserver/docker-webtop + +## 4.16-r0-ls74 (20-10-2022) +- Update to latest version from linuxserver/docker-webtop + ## 4.16-r0-ls73 (18-10-2022) - Update to latest version from linuxserver/docker-webtop diff --git a/webtop_kde/Dockerfile b/webtop_kde/Dockerfile index 4e495980f..52ed61b3e 100644 --- a/webtop_kde/Dockerfile +++ b/webtop_kde/Dockerfile @@ -28,13 +28,13 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ S6_SERVICES_GRACETIME=0 # Allow UID and GID setting -# hadolint ignore=SC2015,DL4006,SC2013 +# hadolint ignore=SC2015,DL4006,SC2013,SC2086 RUN \ # Change home folder location usermod --home /share/webtop_kde abc \ \ # Correct error in upstream image - && sed -i 's|startwm |startwm.sh |g' /etc/cont-init.d/30-config \ + && for file in $(grep -srl "startwm " /etc); do sed -i 's/startwm /startwm.sh /g' $file; done \ \ # Update distribution # hadolint ignore=DL3017 @@ -42,22 +42,22 @@ RUN \ # Global LSIO modifications ARG CONFIGLOCATION="/share/webtop_kde" -# hadolint ignore=SC2015, SC2013 +# hadolint ignore=SC2015, SC2013, SC2086 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 \ + 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" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + && for file in $(grep -srl "PUID" /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" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $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 -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $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 + && for file 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}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done ################## # 3 Install apps # diff --git a/webtop_kde/config.json b/webtop_kde/config.json index 6a4ea004d..668f2a346 100644 --- a/webtop_kde/config.json +++ b/webtop_kde/config.json @@ -112,6 +112,6 @@ "slug": "webtop-kde", "udev": true, "url": "https://github.com/alexbelgium/hassio-addons", - "version": "4.16-r0-ls73", + "version": "4.16-r0-ls75-9", "video": true } diff --git a/webtop_kde/rootfs/etc/cont-init.d/00-data_location.sh b/webtop_kde/rootfs/etc/cont-init.d/00-data_location.sh index 2475f9d73..d099512c8 100644 --- a/webtop_kde/rootfs/etc/cont-init.d/00-data_location.sh +++ b/webtop_kde/rootfs/etc/cont-init.d/00-data_location.sh @@ -1,5 +1,6 @@ #!/usr/bin/with-contenv bashio # shellcheck shell=bash +# shellcheck disable=SC2046 # Define user PUID=$(bashio::config "PUID") @@ -31,11 +32,14 @@ fi # Set data location bashio::log.info "Setting data location to $LOCATION" -sed -i "1a export HOME=$LOCATION" /etc/services.d/web/run -sed -i "1a export FM_HOME=$LOCATION" /etc/services.d/web/run -sed -i "s|/share/webtop_kde|$LOCATION|g" /defaults/* -sed -i "s|/share/webtop_kde|$LOCATION|g" /etc/cont-init.d/* -sed -i "s|/share/webtop_kde|$LOCATION|g" /etc/services.d/*/run + +sed -i "1a export HOME=$LOCATION" /etc/s6-overlay/s6-rc.d/svc-web/run || true +sed -i "1a export FM_HOME=$LOCATION" /etc/s6-overlay/s6-rc.d/svc-web/run || true +sed -i "s|/share/webtop_kde|$LOCATION|g" $(find /defaults -type f) || true +sed -i "s|/share/webtop_kde|$LOCATION|g" $(find /etc/cont-init.d -type f) || true +sed -i "s|/share/webtop_kde|$LOCATION|g" $(find /etc/services.d -type f) || true +sed -i "s|/share/webtop_kde|$LOCATION|g" $(find /etc/s6-overlay/s6-rc.d -type f) || true + usermod --home "$LOCATION" abc # Create folder diff --git a/webtop_kde/rootfs/etc/cont-init.d/80-configuration.sh b/webtop_kde/rootfs/etc/cont-init.d/80-configuration.sh index 1f3eabaa7..2ad700137 100644 --- a/webtop_kde/rootfs/etc/cont-init.d/80-configuration.sh +++ b/webtop_kde/rootfs/etc/cont-init.d/80-configuration.sh @@ -47,7 +47,7 @@ fi if bashio::config.has_value 'KEYBOARD'; then KEYBOARD=$(bashio::config 'KEYBOARD') bashio::log.info "Setting keyboard to $KEYBOARD" - sed -i "1a export KEYBOARD=$KEYBOARD" /etc/services.d/web/run + sed -i "1a export KEYBOARD=$KEYBOARD" /etc/s6-overlay/s6-rc.d/svc-web/run fi # Set password diff --git a/webtop_kde/rootfs/etc/cont-init.d/90-ingress.sh b/webtop_kde/rootfs/etc/cont-init.d/90-ingress.sh index 2aba20d0a..7abd4dc69 100644 --- a/webtop_kde/rootfs/etc/cont-init.d/90-ingress.sh +++ b/webtop_kde/rootfs/etc/cont-init.d/90-ingress.sh @@ -33,4 +33,4 @@ sed -i "s/%%port%%/${ingress_port}/g" /etc/nginx/servers/ingress.conf sed -i "s/%%interface%%/${ingress_interface}/g" /etc/nginx/servers/ingress.conf # Implement SUBFOLDER value -sed -i "1a SUBFOLDER=$(bashio::addon.ingress_url)" /etc/services.d/autostart/run +sed -i "1a SUBFOLDER=$(bashio::addon.ingress_url)" /etc/s6-overlay/s6-rc.d/svc-autostart/run diff --git a/webtop_kde/updater.json b/webtop_kde/updater.json index fe515f06d..6037d82a1 100644 --- a/webtop_kde/updater.json +++ b/webtop_kde/updater.json @@ -1,9 +1,9 @@ { "github_fulltag": "true", - "last_update": "18-10-2022", + "last_update": "25-10-2022", "repository": "alexbelgium/hassio-addons", "slug": "webtop_kde", "source": "github", "upstream_repo": "linuxserver/docker-webtop", - "upstream_version": "4.16-r0-ls73" + "upstream_version": "4.16-r0-ls75" } diff --git a/xteve/CHANGELOG.md b/xteve/CHANGELOG.md index d93464e38..86d7bea76 100644 --- a/xteve/CHANGELOG.md +++ b/xteve/CHANGELOG.md @@ -1,4 +1,7 @@ +## 2.5.3 (22-10-2022) +- Update to latest version from SenexCrenshaw/xTeVe + ## 2.5.2 (01-09-2022) - Update to latest version from SenexCrenshaw/xTeVe diff --git a/xteve/Dockerfile b/xteve/Dockerfile index 59e8f0009..49c0d0ca6 100644 --- a/xteve/Dockerfile +++ b/xteve/Dockerfile @@ -16,7 +16,7 @@ ARG BUILD_FROM ARG BUILD_VERSION -ARG BUILD_UPSTREAM="2.5.2" +ARG BUILD_UPSTREAM="2.5.3" FROM $BUILD_FROM ################## diff --git a/xteve/config.json b/xteve/config.json index f8c9ce78a..6e9734ae1 100644 --- a/xteve/config.json +++ b/xteve/config.json @@ -10,6 +10,7 @@ "XTEVE_CONF": "/data/conf", "XTEVE_HOME": "/data" }, + "host_network": true, "map": [ "config:rw", "share:rw", @@ -24,6 +25,6 @@ }, "slug": "xteve", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "2.5.2", + "version": "2.5.3-2", "webui": "[PROTO:ssl]://[HOST]:[PORT:34400]/web" } diff --git a/xteve/updater.json b/xteve/updater.json index b6463ade4..5c6f9ca26 100644 --- a/xteve/updater.json +++ b/xteve/updater.json @@ -1,8 +1,8 @@ { - "last_update": "01-09-2022", + "last_update": "22-10-2022", "repository": "alexbelgium/hassio-addons", "slug": "xteve", "source": "github", "upstream_repo": "SenexCrenshaw/xTeVe", - "upstream_version": "2.5.2" + "upstream_version": "2.5.3" } diff --git a/zoneminder/CHANGELOG.md b/zoneminder/CHANGELOG.md index d88ed9a19..794f00f24 100644 --- a/zoneminder/CHANGELOG.md +++ b/zoneminder/CHANGELOG.md @@ -1,4 +1,7 @@ +## 1.36.31 (20-10-2022) +- Update to latest version from zoneminder-containers/zoneminder-base + ## 1.36.29 (13-10-2022) - Update to latest version from zoneminder-containers/zoneminder-base diff --git a/zoneminder/Dockerfile b/zoneminder/Dockerfile index 09ac73f45..026e5e207 100644 --- a/zoneminder/Dockerfile +++ b/zoneminder/Dockerfile @@ -16,7 +16,7 @@ ARG BUILD_FROM ARG BUILD_VERSION -ARG BUILD_UPSTREAM="1.36.29" +ARG BUILD_UPSTREAM="1.36.31" FROM tritruongtr/zoneminder:latest ################## diff --git a/zoneminder/config.json b/zoneminder/config.json index f31253c39..ef8239401 100644 --- a/zoneminder/config.json +++ b/zoneminder/config.json @@ -37,6 +37,6 @@ ], "slug": "zoneminder", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "1.36.29", + "version": "1.36.31", "webui": "[PROTO:ssl]://[HOST]:[PORT:80]/zm" } diff --git a/zoneminder/updater.json b/zoneminder/updater.json index 6c152a700..37dad137a 100644 --- a/zoneminder/updater.json +++ b/zoneminder/updater.json @@ -1,8 +1,8 @@ { - "last_update": "13-10-2022", + "last_update": "20-10-2022", "repository": "alexbelgium/hassio-addons", "slug": "zoneminder", "source": "github", "upstream_repo": "zoneminder-containers/zoneminder-base", - "upstream_version": "1.36.29" + "upstream_version": "1.36.31" }