diff --git a/.github/paths-filter.yml b/.github/paths-filter.yml index 5ee051f16..dbe2e4b86 100644 --- a/.github/paths-filter.yml +++ b/.github/paths-filter.yml @@ -36,6 +36,7 @@ mylar3: mylar3/config.* nextcloud: nextcloud/config.* nzbget: nzbget/config.* omada: omada/config.* # Image : yes +omada_v3: omada_v3/config.* # Image : yes ombi: ombi/config.* organizr: organizr/config.* overseerr: overseerr/config.* # Image : yes diff --git a/README.md b/README.md index 35a96424e..fe8766ba7 100644 --- a/README.md +++ b/README.md @@ -344,6 +344,14 @@ If you want to do add the repository manually, please follow the procedure highl ![amd64][amd64-badge] ![armv7no][armv7no-badge] +✓ [Omada v3.2](omada_v3/) : TP-Link Omada Controller + +  ![Version](https://img.shields.io/badge/dynamic/json?label=Version&query=%24.version&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fomada_v3%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%2Fomada_v3%2Fupdater.json) +![aarch64][aarch64-badge] +![amd64][amd64-badge] +![armv7no][armv7no-badge] + ✓ [Ombi](ombi/) : Self-hosted Plex Request and user management system   ![Version](https://img.shields.io/badge/dynamic/json?label=Version&query=%24.version&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fombi%2Fconfig.json) diff --git a/addons_updater/Dockerfile b/addons_updater/Dockerfile index 1b205959d..8d5da6776 100644 --- a/addons_updater/Dockerfile +++ b/addons_updater/Dockerfile @@ -55,6 +55,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ENV PACKAGES="" # Automatic apps & bashio +# hadolint ignore=SC2015 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ diff --git a/arpspoof/Dockerfile b/arpspoof/Dockerfile index baca5a0ab..38a141fbf 100644 --- a/arpspoof/Dockerfile +++ b/arpspoof/Dockerfile @@ -54,6 +54,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ENV PACKAGES="jq curl iproute2" # Automatic apps & bashio +# hadolint ignore=SC2015 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ diff --git a/bazarr/Dockerfile b/bazarr/Dockerfile index 4f4c89d06..df0282312 100644 --- a/bazarr/Dockerfile +++ b/bazarr/Dockerfile @@ -34,15 +34,15 @@ RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ \ + # Create new config folder if needed + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + \ # Allow UID and GID setting - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \ + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID') ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID') ]; then echo "0"; else bashio::config 'PGID'; 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 -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ \ - # Create new config folder if needed - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ - \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done @@ -73,6 +73,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ENV PACKAGES="" # Automatic apps & bashio +# hadolint ignore=SC2015 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ diff --git a/bazarr/README.md b/bazarr/README.md index 10fad7765..a7ae901b2 100644 --- a/bazarr/README.md +++ b/bazarr/README.md @@ -1,4 +1,3 @@ -## ⚠ Open Request : [✨ [REQUEST] bazarr add localdisk (opened 2022-08-16)](https://github.com/alexbelgium/hassio-addons/issues/428) by [@crowley666x](https://github.com/crowley666x) # Home assistant add-on: bazarr diff --git a/bitwarden/Dockerfile b/bitwarden/Dockerfile index 5c12cef2f..838b8e254 100644 --- a/bitwarden/Dockerfile +++ b/bitwarden/Dockerfile @@ -65,6 +65,7 @@ ENV PACKAGES="libmariadb-dev-compat \ sqlite3" # Automatic apps & bashio +# hadolint ignore=SC2015 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ diff --git a/booksonic_air/CHANGELOG.md b/booksonic_air/CHANGELOG.md index f046c1027..e339a3e12 100644 --- a/booksonic_air/CHANGELOG.md +++ b/booksonic_air/CHANGELOG.md @@ -1,4 +1,7 @@ +## v2201.1.0-ls69 (20-09-2022) +- Update to latest version from linuxserver/docker-booksonic-air + ## v2201.1.0-ls68 (09-09-2022) - Update to latest version from linuxserver/docker-booksonic-air diff --git a/booksonic_air/Dockerfile b/booksonic_air/Dockerfile index 5f1451b2c..e7d501f47 100644 --- a/booksonic_air/Dockerfile +++ b/booksonic_air/Dockerfile @@ -36,15 +36,15 @@ RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ \ + # Create new config folder if needed + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + \ # Allow UID and GID setting - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \ + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID') ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID') ]; then echo "0"; else bashio::config 'PGID'; 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 -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ \ - # Create new config folder if needed - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ - \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done @@ -78,6 +78,7 @@ ENV PACKAGES="jq \ keyutils" # Automatic apps & bashio +# hadolint ignore=SC2015 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ diff --git a/booksonic_air/config.json b/booksonic_air/config.json index 5da956ba6..9f85374f9 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-ls68-bugfix", + "version": "v2201.1.0-ls69", "webui": "[PROTO:ssl]://[HOST]:[PORT:4040]" } diff --git a/booksonic_air/updater.json b/booksonic_air/updater.json index 4bc677470..b3751a8af 100644 --- a/booksonic_air/updater.json +++ b/booksonic_air/updater.json @@ -1,9 +1,9 @@ { "github_fulltag": "true", - "last_update": "09-09-2022", + "last_update": "20-09-2022", "repository": "alexbelgium/hassio-addons", "slug": "booksonic_air", "source": "github", "upstream_repo": "linuxserver/docker-booksonic-air", - "upstream_version": "v2201.1.0-ls68" + "upstream_version": "v2201.1.0-ls69" } diff --git a/calibre/CHANGELOG.md b/calibre/CHANGELOG.md index fa6a79700..4cb3b2df2 100644 --- a/calibre/CHANGELOG.md +++ b/calibre/CHANGELOG.md @@ -1,4 +1,10 @@ +## v6.5.0-ls182 (22-09-2022) +- Update to latest version from linuxserver/docker-calibre + +## v6.5.0-ls181 (20-09-2022) +- Update to latest version from linuxserver/docker-calibre + ## v6.5.0-ls179 (17-09-2022) - Update to latest version from linuxserver/docker-calibre diff --git a/calibre/Dockerfile b/calibre/Dockerfile index fb0e4d7ac..2c05aa3ab 100644 --- a/calibre/Dockerfile +++ b/calibre/Dockerfile @@ -35,15 +35,15 @@ RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ \ + # Create new config folder if needed + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + \ # Allow UID and GID setting - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \ + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID') ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID') ]; then echo "0"; else bashio::config 'PGID'; 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 -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ \ - # Create new config folder if needed - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ - \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done @@ -78,6 +78,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ENV PACKAGES="" # Automatic apps & bashio +# hadolint ignore=SC2015 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ diff --git a/calibre/config.json b/calibre/config.json index 6f0e52247..8245dbaba 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.5.0-ls179", + "version": "v6.5.0-ls182", "video": true } diff --git a/calibre/updater.json b/calibre/updater.json index 4e956a3e9..676f238ca 100644 --- a/calibre/updater.json +++ b/calibre/updater.json @@ -1,10 +1,10 @@ { "github_fulltag": "true", - "last_update": "17-09-2022", + "last_update": "22-09-2022", "paused": false, "repository": "alexbelgium/hassio-addons", "slug": "calibre", "source": "github", "upstream_repo": "linuxserver/docker-calibre", - "upstream_version": "v6.5.0-ls179" + "upstream_version": "v6.5.0-ls182" } diff --git a/calibre_web/CHANGELOG.md b/calibre_web/CHANGELOG.md index 492ca12c5..5292196ad 100644 --- a/calibre_web/CHANGELOG.md +++ b/calibre_web/CHANGELOG.md @@ -1,4 +1,7 @@ +## 0.6.19-ls175 (22-09-2022) +- Update to latest version from linuxserver/docker-calibre-web + ## 0.6.19-ls174 (15-09-2022) - Update to latest version from linuxserver/docker-calibre-web diff --git a/calibre_web/Dockerfile b/calibre_web/Dockerfile index cca72b0b2..bdad8b76b 100644 --- a/calibre_web/Dockerfile +++ b/calibre_web/Dockerfile @@ -35,15 +35,15 @@ RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ \ + # Create new config folder if needed + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + \ # Allow UID and GID setting - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \ + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID') ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID') ]; then echo "0"; else bashio::config 'PGID'; 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 -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ \ - # Create new config folder if needed - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ - \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done @@ -78,6 +78,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ENV PACKAGES="" # Automatic apps & bashio +# hadolint ignore=SC2015 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ diff --git a/calibre_web/config.json b/calibre_web/config.json index 3433799a4..516966676 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-ls174", + "version": "0.6.19-ls175", "video": true } diff --git a/calibre_web/updater.json b/calibre_web/updater.json index 714ef2bb6..7f8ff2338 100644 --- a/calibre_web/updater.json +++ b/calibre_web/updater.json @@ -1,10 +1,10 @@ { "github_fulltag": "true", - "last_update": "15-09-2022", + "last_update": "22-09-2022", "paused": false, "repository": "alexbelgium/hassio-addons", "slug": "calibre-web", "source": "github", "upstream_repo": "linuxserver/docker-calibre-web", - "upstream_version": "0.6.19-ls174" + "upstream_version": "0.6.19-ls175" } diff --git a/cloudcommander/Dockerfile b/cloudcommander/Dockerfile index cf73efe88..c3ad44248 100644 --- a/cloudcommander/Dockerfile +++ b/cloudcommander/Dockerfile @@ -56,6 +56,7 @@ ENV PACKAGES="jq \ nginx" # Automatic apps & bashio +# hadolint ignore=SC2015 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ diff --git a/code-server/Dockerfile b/code-server/Dockerfile index 5f197fe44..bf947a7c6 100644 --- a/code-server/Dockerfile +++ b/code-server/Dockerfile @@ -34,15 +34,15 @@ RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ \ + # Create new config folder if needed + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + \ # Allow UID and GID setting - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \ + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID') ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID') ]; then echo "0"; else bashio::config 'PGID'; 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 -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ \ - # Create new config folder if needed - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ - \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done @@ -73,6 +73,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ENV PACKAGES="jq" # Automatic apps & bashio +# hadolint ignore=SC2015 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile index 5965ad128..7d7a21b23 100644 --- a/elasticsearch/Dockerfile +++ b/elasticsearch/Dockerfile @@ -67,6 +67,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ENV PACKAGES="" # Automatic apps & bashio +# hadolint ignore=SC2015 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ diff --git a/emby/CHANGELOG.md b/emby/CHANGELOG.md index e476f5ae1..ab72b2c9f 100644 --- a/emby/CHANGELOG.md +++ b/emby/CHANGELOG.md @@ -1,3 +1,6 @@ + +## 4.8.0.9 (24-09-2022) +- Update to latest version from linuxserver/docker-emby ## 4.8.0.8 (16-08-2022) - Update to latest version from linuxserver/docker-emby diff --git a/emby/Dockerfile b/emby/Dockerfile index 6ffa284b0..ce590f92b 100644 --- a/emby/Dockerfile +++ b/emby/Dockerfile @@ -34,15 +34,15 @@ RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ \ + # Create new config folder if needed + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + \ # Allow UID and GID setting - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \ + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID') ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID') ]; then echo "0"; else bashio::config 'PGID'; 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 -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ \ - # Create new config folder if needed - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ - \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done @@ -72,6 +72,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ENV PACKAGES="nginx" # Automatic apps & bashio +# hadolint ignore=SC2015 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ diff --git a/emby/config.json b/emby/config.json index d484fbdcb..9b808f309 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.8-2-bugfix", + "version": "4.8.0.9", "video": true } diff --git a/emby/updater.json b/emby/updater.json index 42fa77a7d..e6e31522d 100644 --- a/emby/updater.json +++ b/emby/updater.json @@ -1,9 +1,9 @@ { "github_beta": "true", - "last_update": "16-08-2022", + "last_update": "24-09-2022", "repository": "alexbelgium/hassio-addons", "slug": "emby", "source": "github", "upstream_repo": "linuxserver/docker-emby", - "upstream_version": "4.8.0.8" + "upstream_version": "4.8.0.9" } diff --git a/enedisgateway2mqtt/Dockerfile b/enedisgateway2mqtt/Dockerfile index 88e2c78e5..da22b3e9b 100644 --- a/enedisgateway2mqtt/Dockerfile +++ b/enedisgateway2mqtt/Dockerfile @@ -56,6 +56,7 @@ ENV PACKAGES="jq \ yamllint" # Automatic apps & bashio +# hadolint ignore=SC2015 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ diff --git a/enedisgateway2mqtt_dev/Dockerfile b/enedisgateway2mqtt_dev/Dockerfile index 1a96f133e..a29f75867 100644 --- a/enedisgateway2mqtt_dev/Dockerfile +++ b/enedisgateway2mqtt_dev/Dockerfile @@ -56,6 +56,7 @@ ENV PACKAGES="jq \ yamllint" # Automatic apps & bashio +# hadolint ignore=SC2015 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ diff --git a/epicgamesfree/Dockerfile b/epicgamesfree/Dockerfile index 9aa8c2a5c..15312bfd6 100644 --- a/epicgamesfree/Dockerfile +++ b/epicgamesfree/Dockerfile @@ -26,7 +26,7 @@ FROM ${BUILD_FROM} ENV S6_CMD_WAIT_FOR_SERVICES=1 \ S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \ S6_SERVICES_GRACETIME=0 - + RUN sed -i "1a /./entrypoint.sh" /usr/local/bin/docker-entrypoint.sh ################## @@ -56,6 +56,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ENV PACKAGES="" # Automatic apps & bashio +# hadolint ignore=SC2015 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ diff --git a/filebrowser/Dockerfile b/filebrowser/Dockerfile index 592d8fa3d..a683e5589 100644 --- a/filebrowser/Dockerfile +++ b/filebrowser/Dockerfile @@ -55,6 +55,7 @@ ENV PACKAGES="bind-tools \ nginx" # Automatic apps & bashio +# hadolint ignore=SC2015 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ diff --git a/fireflyiii/Dockerfile b/fireflyiii/Dockerfile index fbdd9f1ca..e070eb46a 100644 --- a/fireflyiii/Dockerfile +++ b/fireflyiii/Dockerfile @@ -68,6 +68,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ENV PACKAGES="cron mariadb-client" # Automatic apps & bashio +# hadolint ignore=SC2015 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ diff --git a/fireflyiii_data_importer/Dockerfile b/fireflyiii_data_importer/Dockerfile index baf7ee14f..f888a8944 100644 --- a/fireflyiii_data_importer/Dockerfile +++ b/fireflyiii_data_importer/Dockerfile @@ -61,6 +61,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ENV PACKAGES="cron" # Automatic apps & bashio +# hadolint ignore=SC2015 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ diff --git a/fireflyiii_fints_importer/Dockerfile b/fireflyiii_fints_importer/Dockerfile index 81825c6df..748891900 100644 --- a/fireflyiii_fints_importer/Dockerfile +++ b/fireflyiii_fints_importer/Dockerfile @@ -56,6 +56,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ENV PACKAGES="cron" # Automatic apps & bashio +# hadolint ignore=SC2015 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ diff --git a/flaresolverr/CHANGELOG.md b/flaresolverr/CHANGELOG.md index 471670b56..d4fe527c3 100644 --- a/flaresolverr/CHANGELOG.md +++ b/flaresolverr/CHANGELOG.md @@ -1,4 +1,7 @@ +## 2.2.8 (20-09-2022) +- Update to latest version from FlareSolverr/FlareSolverr + ## 2.2.7 (13-09-2022) - Update to latest version from FlareSolverr/FlareSolverr diff --git a/flaresolverr/Dockerfile b/flaresolverr/Dockerfile index 44fce0e65..b919d0824 100644 --- a/flaresolverr/Dockerfile +++ b/flaresolverr/Dockerfile @@ -55,6 +55,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ENV PACKAGES="" # Automatic apps & bashio +# hadolint ignore=SC2015 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ diff --git a/flaresolverr/config.json b/flaresolverr/config.json index c221ecf96..86e400242 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.7", + "version": "2.2.8", "webui": "[PROTO:ssl]://[HOST]:[PORT:8191]" } diff --git a/flaresolverr/updater.json b/flaresolverr/updater.json index 799f8fb85..e1d54322f 100644 --- a/flaresolverr/updater.json +++ b/flaresolverr/updater.json @@ -1,8 +1,8 @@ { - "last_update": "13-09-2022", + "last_update": "20-09-2022", "repository": "alexbelgium/hassio-addons", "slug": "flaresolverr", "source": "github", "upstream_repo": "FlareSolverr/FlareSolverr", - "upstream_version": "2.2.7" + "upstream_version": "2.2.8" } diff --git a/flexget/CHANGELOG.md b/flexget/CHANGELOG.md index 11b743e1e..39b67bb8a 100644 --- a/flexget/CHANGELOG.md +++ b/flexget/CHANGELOG.md @@ -1,4 +1,7 @@ +## 3.3.30 (24-09-2022) +- Update to latest version from wiserain/flexget + ## 3.3.26 (10-09-2022) - Update to latest version from wiserain/flexget - Default password homeassistant123 diff --git a/flexget/Dockerfile b/flexget/Dockerfile index 8a82daf9a..3663a06cd 100644 --- a/flexget/Dockerfile +++ b/flexget/Dockerfile @@ -44,15 +44,15 @@ RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ \ + # Create new config folder if needed + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + \ # Allow UID and GID setting - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \ + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID') ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID') ]; then echo "0"; else bashio::config 'PGID'; 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 -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ \ - # Create new config folder if needed - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ - \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done @@ -85,6 +85,7 @@ ENV PACKAGES="jq \ cifs-utils" # Automatic apps & bashio +# hadolint ignore=SC2015 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ diff --git a/flexget/config.json b/flexget/config.json index 53f29465b..8301f3b39 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.26-bugfix", + "version": "3.3.30", "webui": "[PROTO:ssl]://[HOST]:[PORT:5050]" } diff --git a/flexget/updater.json b/flexget/updater.json index 390ab7bda..1c0280c98 100644 --- a/flexget/updater.json +++ b/flexget/updater.json @@ -1,8 +1,8 @@ { - "last_update": "10-09-2022", + "last_update": "24-09-2022", "repository": "alexbelgium/hassio-addons", "slug": "flexget", "source": "dockerhub", "upstream_repo": "wiserain/flexget", - "upstream_version": "3.3.26" + "upstream_version": "3.3.30" } diff --git a/gazpar2mqtt/Dockerfile b/gazpar2mqtt/Dockerfile index a288ff541..07386700c 100644 --- a/gazpar2mqtt/Dockerfile +++ b/gazpar2mqtt/Dockerfile @@ -56,6 +56,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ENV PACKAGES="" # Automatic apps & bashio +# hadolint ignore=SC2015 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && curl -f -L -s "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ diff --git a/grav/Dockerfile b/grav/Dockerfile index 4b7b32c79..e9fef5e1c 100644 --- a/grav/Dockerfile +++ b/grav/Dockerfile @@ -34,15 +34,15 @@ RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ \ + # Create new config folder if needed + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + \ # Allow UID and GID setting - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \ + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID') ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID') ]; then echo "0"; else bashio::config 'PGID'; 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 -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ \ - # Create new config folder if needed - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ - \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done @@ -76,6 +76,7 @@ ENV PACKAGES="jq \ keyutils" # Automatic apps & bashio +# hadolint ignore=SC2015 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ diff --git a/guacamole/Dockerfile b/guacamole/Dockerfile index 05f01311d..ef0d6a15a 100644 --- a/guacamole/Dockerfile +++ b/guacamole/Dockerfile @@ -81,6 +81,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ENV PACKAGES="" # Automatic apps & bashio +# hadolint ignore=SC2015 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ diff --git a/inadyn/Dockerfile b/inadyn/Dockerfile index c98632708..1e2df6a69 100644 --- a/inadyn/Dockerfile +++ b/inadyn/Dockerfile @@ -60,6 +60,7 @@ ENV PACKAGES="curl \ build-base libressl-dev ca-certificates npm" # Automatic apps & bashio +# hadolint ignore=SC2015 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ @@ -81,6 +82,7 @@ RUN apk add --no-cache \ build-base\ git\ go &&\ + go env -w GO111MODULE=off &&\ go get -u github.com/quantumew/mustache-cli &&\ cp "$GOPATH"/bin/* /usr/bin/ && \ rm -rf "$GOPATH" /var/cache/apk/* /tmp/src &&\ diff --git a/inadyn/config.json b/inadyn/config.json index b710bd814..6795f51e8 100644 --- a/inadyn/config.json +++ b/inadyn/config.json @@ -54,5 +54,5 @@ }, "slug": "inadyn", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "2.9.1-6" + "version": "2.9.1-7" } diff --git a/jackett/CHANGELOG.md b/jackett/CHANGELOG.md index 4e8ca5421..fd0551d32 100644 --- a/jackett/CHANGELOG.md +++ b/jackett/CHANGELOG.md @@ -1,4 +1,13 @@ +## 0.20.1934 (24-09-2022) +- Update to latest version from linuxserver/docker-jackett + +## 0.20.1916 (22-09-2022) +- Update to latest version from linuxserver/docker-jackett + +## 0.20.1913 (20-09-2022) +- Update to latest version from linuxserver/docker-jackett + ## 0.20.1907 (17-09-2022) - Update to latest version from linuxserver/docker-jackett diff --git a/jackett/Dockerfile b/jackett/Dockerfile index 4c1c3d80b..48b3674b2 100644 --- a/jackett/Dockerfile +++ b/jackett/Dockerfile @@ -34,15 +34,15 @@ RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ \ + # Create new config folder if needed + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + \ # Allow UID and GID setting - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \ + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID') ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID') ]; then echo "0"; else bashio::config 'PGID'; 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 -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ \ - # Create new config folder if needed - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ - \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done @@ -76,6 +76,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ENV PACKAGES="curl" # Automatic apps & bashio +# hadolint ignore=SC2015 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ diff --git a/jackett/config.json b/jackett/config.json index 420cdb3d8..b1f4e8deb 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.1907", + "version": "0.20.1934", "webui": "[PROTO:ssl]://[HOST]:[PORT:9117]" } diff --git a/jackett/updater.json b/jackett/updater.json index a7c9ffa0d..8aca510cb 100644 --- a/jackett/updater.json +++ b/jackett/updater.json @@ -1,8 +1,8 @@ { - "last_update": "17-09-2022", + "last_update": "24-09-2022", "repository": "alexbelgium/hassio-addons", "slug": "jackett", "source": "github", "upstream_repo": "linuxserver/docker-jackett", - "upstream_version": "0.20.1907" + "upstream_version": "0.20.1934" } diff --git a/jellyfin/CHANGELOG.md b/jellyfin/CHANGELOG.md index a5e9481d6..c21682ee6 100644 --- a/jellyfin/CHANGELOG.md +++ b/jellyfin/CHANGELOG.md @@ -1,4 +1,7 @@ +## 10.8.4-1-ls179 (24-09-2022) +- Update to latest version from linuxserver/docker-jellyfin + ## 10.8.4-1-ls178 (09-09-2022) - Update to latest version from linuxserver/docker-jellyfin ## 10.8.4-1-ls177 (20-08-2022) diff --git a/jellyfin/Dockerfile b/jellyfin/Dockerfile index 204205515..a5c2561d1 100644 --- a/jellyfin/Dockerfile +++ b/jellyfin/Dockerfile @@ -35,15 +35,15 @@ RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ \ + # Create new config folder if needed + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + \ # Allow UID and GID setting - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \ + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID') ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID') ]; then echo "0"; else bashio::config 'PGID'; 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 -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ \ - # Create new config folder if needed - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ - \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done @@ -74,6 +74,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ENV PACKAGES="nginx" # Automatic apps & bashio +# hadolint ignore=SC2015 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ diff --git a/jellyfin/config.json b/jellyfin/config.json index 96bcb6e17..7a091d2c9 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.4-1-ls178-bugfix", + "version": "10.8.4-1-ls179", "video": true } diff --git a/jellyfin/updater.json b/jellyfin/updater.json index 03791b17f..685bed908 100644 --- a/jellyfin/updater.json +++ b/jellyfin/updater.json @@ -1,9 +1,9 @@ { "github_fulltag": "true", - "last_update": "09-09-2022", + "last_update": "24-09-2022", "repository": "alexbelgium/hassio-addons", "slug": "jellyfin", "source": "github", "upstream_repo": "linuxserver/docker-jellyfin", - "upstream_version": "10.8.4-1-ls178" + "upstream_version": "10.8.4-1-ls179" } diff --git a/joal/Dockerfile b/joal/Dockerfile index 3285ec4da..f664b4584 100644 --- a/joal/Dockerfile +++ b/joal/Dockerfile @@ -56,6 +56,7 @@ ENV PACKAGES="jq \ nginx" # Automatic apps & bashio +# hadolint ignore=SC2015 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ diff --git a/joplin/Dockerfile b/joplin/Dockerfile index f4a6a0e0e..d8f308d09 100644 --- a/joplin/Dockerfile +++ b/joplin/Dockerfile @@ -59,6 +59,7 @@ ENV PACKAGES="jq \ curl" # Automatic apps & bashio +# hadolint ignore=SC2015 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ diff --git a/lidarr/CHANGELOG.md b/lidarr/CHANGELOG.md index d1ca21623..575c18f90 100644 --- a/lidarr/CHANGELOG.md +++ b/lidarr/CHANGELOG.md @@ -1,4 +1,7 @@ +## 1.0.2.2592-ls97 (20-09-2022) +- Update to latest version from linuxserver/docker-lidarr + ## 1.0.2.2592-ls96 (09-09-2022) - Update to latest version from linuxserver/docker-lidarr diff --git a/lidarr/Dockerfile b/lidarr/Dockerfile index d4ed5a6d3..361f1baec 100644 --- a/lidarr/Dockerfile +++ b/lidarr/Dockerfile @@ -34,15 +34,15 @@ RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ \ + # Create new config folder if needed + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + \ # Allow UID and GID setting - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \ + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID') ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID') ]; then echo "0"; else bashio::config 'PGID'; 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 -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ \ - # Create new config folder if needed - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ - \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done @@ -76,6 +76,7 @@ ENV PACKAGES="jq \ keyutils" # Automatic apps & bashio +# hadolint ignore=SC2015 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ diff --git a/lidarr/config.json b/lidarr/config.json index d5af5862f..89f6db977 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-ls96-bugfix", + "version": "1.0.2.2592-ls97", "webui": "[PROTO:ssl]://[HOST]:[PORT:8686]" } diff --git a/lidarr/updater.json b/lidarr/updater.json index 0fb0adc41..f6a8d4157 100644 --- a/lidarr/updater.json +++ b/lidarr/updater.json @@ -1,9 +1,9 @@ { "github_fulltag": "true", - "last_update": "09-09-2022", + "last_update": "20-09-2022", "repository": "alexbelgium/hassio-addons", "slug": "lidarr", "source": "github", "upstream_repo": "linuxserver/docker-lidarr", - "upstream_version": "1.0.2.2592-ls96" + "upstream_version": "1.0.2.2592-ls97" } diff --git a/mealie/Dockerfile b/mealie/Dockerfile index 20ef03268..2ba46e232 100644 --- a/mealie/Dockerfile +++ b/mealie/Dockerfile @@ -58,6 +58,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ENV PACKAGES="jq curl bash" # Automatic apps & bashio +# hadolint ignore=SC2015 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ diff --git a/mylar3/Dockerfile b/mylar3/Dockerfile index f676ce357..4caa44378 100644 --- a/mylar3/Dockerfile +++ b/mylar3/Dockerfile @@ -34,15 +34,15 @@ RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ \ + # Create new config folder if needed + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + \ # Allow UID and GID setting - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \ + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID') ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID') ]; then echo "0"; else bashio::config 'PGID'; 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 -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ \ - # Create new config folder if needed - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ - \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done @@ -73,6 +73,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ENV PACKAGES="" # Automatic apps & bashio +# hadolint ignore=SC2015 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ diff --git a/nextcloud/Dockerfile b/nextcloud/Dockerfile index a260fb2f4..d6d9b3490 100644 --- a/nextcloud/Dockerfile +++ b/nextcloud/Dockerfile @@ -81,6 +81,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ENV PACKAGES="curl jq wget" # Automatic apps & bashio +# hadolint ignore=SC2015 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ diff --git a/nzbget/CHANGELOG.md b/nzbget/CHANGELOG.md index 53ac125bd..d4e5fba67 100644 --- a/nzbget/CHANGELOG.md +++ b/nzbget/CHANGELOG.md @@ -1,4 +1,7 @@ +## v21.1-ls125 (24-09-2022) +- Update to latest version from linuxserver/docker-nzbget + ## v21.1-ls124 (09-09-2022) - Update to latest version from linuxserver/docker-nzbget diff --git a/nzbget/Dockerfile b/nzbget/Dockerfile index fdaaf2b44..edd12f4ab 100644 --- a/nzbget/Dockerfile +++ b/nzbget/Dockerfile @@ -38,15 +38,15 @@ RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ \ + # Create new config folder if needed + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + \ # Allow UID and GID setting - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \ + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID') ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID') ]; then echo "0"; else bashio::config 'PGID'; 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 -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ \ - # Create new config folder if needed - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ - \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done @@ -77,6 +77,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ENV PACKAGES="nginx" # Automatic apps & bashio +# hadolint ignore=SC2015 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ diff --git a/nzbget/config.json b/nzbget/config.json index fca78b1c7..8fcfa7e2c 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-ls124-bugfix" + "version": "v21.1-ls125" } diff --git a/nzbget/updater.json b/nzbget/updater.json index ded7dd799..4370e95f7 100644 --- a/nzbget/updater.json +++ b/nzbget/updater.json @@ -1,9 +1,9 @@ { "github_fulltag": "true", - "last_update": "09-09-2022", + "last_update": "24-09-2022", "repository": "alexbelgium/hassio-addons", "slug": "nzbget", "source": "github", "upstream_repo": "linuxserver/docker-nzbget", - "upstream_version": "v21.1-ls124" + "upstream_version": "v21.1-ls125" } diff --git a/omada/CHANGELOG.md b/omada/CHANGELOG.md index 3219ee9ff..0ff76f20c 100644 --- a/omada/CHANGELOG.md +++ b/omada/CHANGELOG.md @@ -1,4 +1,10 @@ +## 5.5-chromium-amd64-2022-09-23 (2022-09-23) +- Update to latest version from mbentley/omada-controller + +## 5.5-chromium-amd64-2022-09-18 (2022-09-18) +- Update to latest version from mbentley/omada-controller + ## 5.5-chromium-amd64-2022-09-16 (2022-09-16) - Update to latest version from mbentley/omada-controller diff --git a/omada/Dockerfile b/omada/Dockerfile index ad47300ed..9fe31a52c 100644 --- a/omada/Dockerfile +++ b/omada/Dockerfile @@ -16,7 +16,7 @@ ARG BUILD_FROM ARG BUILD_VERSION -ARG BUILD_UPSTREAM="5.5-chromium-amd64-2022-09-16" +ARG BUILD_UPSTREAM="5.5-chromium-amd64-2022-09-23" FROM ${BUILD_FROM} ################## @@ -33,6 +33,7 @@ RUN echo "Adding symlinks to entrypoint" \ -e '1a chmod a+x /etc/cont-init.d/*' \ -e '1a sed -i "s|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g" /etc/cont-init.d/*' \ -e '1a for i in /etc/cont-init.d/*; do /."$i"; done' \ + -e 's|/cert|/ssl|g' \ /entrypoint.sh ################## @@ -62,6 +63,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ENV PACKAGES="" # Automatic apps & bashio +# hadolint ignore=SC2015 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ diff --git a/omada/config.json b/omada/config.json index 0ed8d8db5..b8dc25943 100644 --- a/omada/config.json +++ b/omada/config.json @@ -12,8 +12,8 @@ "PORTAL_HTTP_PORT": "8088", "SHOW_MONGODB_LOGS": "false", "SHOW_SERVER_LOGS": "true", - "SSL_CERT_NAME": "tls.crt", - "SSL_KEY_NAME": "tls.key", + "SSL_CERT_NAME": "fullchain.pem", + "SSL_KEY_NAME": "privkey.pem", "TZ": "Etc/UTC" }, "host_network": true, @@ -45,6 +45,6 @@ }, "slug": "omada", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "5.5-chromium-amd64-2022-09-16", + "version": "5.5-chromium-amd64-2022-09-23-2", "webui": "[PROTO:ssl]://[HOST]:[PORT:8088]" } diff --git a/omada/updater.json b/omada/updater.json index 6d92f4575..fe4599413 100644 --- a/omada/updater.json +++ b/omada/updater.json @@ -1,9 +1,9 @@ { "dockerhub_by_date": true, - "last_update": "2022-09-16", + "last_update": "2022-09-23", "repository": "alexbelgium/hassio-addons", "slug": "omada", "source": "dockerhub", "upstream_repo": "mbentley/omada-controller", - "upstream_version": "5.5-chromium-amd64-2022-09-16" + "upstream_version": "5.5-chromium-amd64-2022-09-23" } diff --git a/omada_v3/CHANGELOG.md b/omada_v3/CHANGELOG.md new file mode 100644 index 000000000..0ff76f20c --- /dev/null +++ b/omada_v3/CHANGELOG.md @@ -0,0 +1,66 @@ + +## 5.5-chromium-amd64-2022-09-23 (2022-09-23) +- Update to latest version from mbentley/omada-controller + +## 5.5-chromium-amd64-2022-09-18 (2022-09-18) +- Update to latest version from mbentley/omada-controller + +## 5.5-chromium-amd64-2022-09-16 (2022-09-16) +- Update to latest version from mbentley/omada-controller + +## 5.5-chromium-amd64-2022-09-13 (2022-09-13) +- Update to latest version from mbentley/omada-controller + +## 5.5-chromium-amd64-2022-09-11 (2022-09-11) +- Update to latest version from mbentley/omada-controller + +## 5.5-chromium-amd64-2022-09-04 (2022-09-04) +- Update to latest version from mbentley/omada-controller + +## 5.5-chromium-amd64-2022-09-02 (2022-09-02) +- Update to latest version from mbentley/omada-controller + +## 5.5-chromium-amd64-2022-08-28 (2022-08-28) +- Update to latest version from mbentley/omada-controller + +## 4.4-arm64-2022-08-31 (2022-08-31) +- Update to latest version from mbentley/omada-controller + +## 5.5-chromium-2022-08-29 (2022-08-29) +- Update to latest version from mbentley/omada-controller +- run add_on on host network so controller can outgres to physical + network properly + +## 5.5-chromium-amd64-2022-08-26 (2022-08-26) +- Update to latest version from mbentley/omada-controller + +## 5.5-chromium-2022-08-24 (2022-08-24) +- Update to latest version from mbentley/omada-controller + +## 5.4-chromium-amd64-2022-08-22 (2022-08-22) +- Update to latest version from mbentley/omada-controller + +## 5.4-chromium-2022-08-19 (2022-08-19) +- Update to latest version from mbentley/omada-controller + +## 5.4-chromium-2022-08-17 (2022-08-17) +- Update to latest version from mbentley/omada-controller + +## 5.3-chromium-2022-08-15 (2022-08-15) +- Update to latest version from mbentley/omada-controller + +## 5.4-chromium-2022-08-12 (2022-08-12) +- Update to latest version from mbentley/omada-controller + +## 5.4-chromium-arm64-2022-08-11 (2022-08-11) +- Update to latest version from mbentley/omada-controller + +## 5.4-chromium-arm64-2022-08-11T21:32:36.717277Z (2022-08-11T21:32:36.717277Z) +- Update to latest version from mbentley/omada-controller + +## 5.4-chromium-arm64 (11-08-2022) +- Update to latest version from mbentley/omada-controller + +## 5.1.7 (14-04-2022) +- Update to latest version from mbentley/omada-controller +- Initial release diff --git a/omada_v3/Dockerfile b/omada_v3/Dockerfile new file mode 100644 index 000000000..9fe31a52c --- /dev/null +++ b/omada_v3/Dockerfile @@ -0,0 +1,111 @@ +#============================# +# ALEXBELGIUM'S DOCKERFILE # +#============================# +# _.------. +# _.-` ('>.-`"""-. +# '.--'` _'` _ .--.) +# -' '-.-';` ` +# ' - _.' ``'--. +# '---` .-'""` +# /` +#=== Home Assistant Addon ===# + +################# +# 1 Build Image # +################# + +ARG BUILD_FROM +ARG BUILD_VERSION +ARG BUILD_UPSTREAM="5.5-chromium-amd64-2022-09-23" +FROM ${BUILD_FROM} + +################## +# 2 Modify Image # +################## + +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \ + S6_SERVICES_GRACETIME=0 + +RUN echo "Adding symlinks to entrypoint" \ + && sed -i \ + -e '1a chmod a+x /etc/cont-init.d/*' \ + -e '1a sed -i "s|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g" /etc/cont-init.d/*' \ + -e '1a for i in /etc/cont-init.d/*; do /."$i"; done' \ + -e 's|/cert|/ssl|g' \ + /entrypoint.sh + +################## +# 3 Install apps # +################## + +# Copy local files +COPY rootfs/ / + +# Corrects permissions for s6 v3 +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 + +# Modules +ARG MODULES="00-banner.sh" + +# Automatic modules download +RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ + && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ + && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ + && mkdir -p /etc/cont-init.d \ + && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ + && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + +# Manual apps +ENV PACKAGES="" + +# Automatic apps & bashio +# hadolint ignore=SC2015 +RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ + && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ + && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ + && chmod 777 /automatic_packages.sh \ + && eval /./automatic_packages.sh "${PACKAGES:-}" \ + && rm /automatic_packages.sh || (printf '%s\n' "${PACKAGES:-}" > /ENVFILE; \ + if [ -f /etc/s6-overlay/s6-rc.d/init-migrations/run ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1a /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/init-migrations/run;fi) + +################ +# 4 Entrypoint # +################ + +#RUN chmod 777 /entrypoint.sh +#ENTRYPOINT [ "/usr/bin/env" ] +#CMD [ "/entrypoint.sh" ] + +############ +# 5 Labels # +############ + +ARG BUILD_ARCH +ARG BUILD_DATE +ARG BUILD_DESCRIPTION +ARG BUILD_NAME +ARG BUILD_REF +ARG BUILD_REPOSITORY +ARG BUILD_VERSION +LABEL \ + io.hass.name="${BUILD_NAME}" \ + io.hass.description="${BUILD_DESCRIPTION}" \ + io.hass.arch="${BUILD_ARCH}" \ + io.hass.type="addon" \ + io.hass.version=${BUILD_VERSION} \ + maintainer="alexbelgium (https://github.com/alexbelgium)" \ + org.opencontainers.image.title="${BUILD_NAME}" \ + org.opencontainers.image.description="${BUILD_DESCRIPTION}" \ + org.opencontainers.image.vendor="Home Assistant Add-ons" \ + org.opencontainers.image.authors="alexbelgium (https://github.com/alexbelgium)" \ + org.opencontainers.image.licenses="MIT" \ + org.opencontainers.image.url="https://github.com/alexbelgium" \ + org.opencontainers.image.source="https://github.com/${BUILD_REPOSITORY}" \ + org.opencontainers.image.documentation="https://github.com/${BUILD_REPOSITORY}/blob/main/README.md" \ + org.opencontainers.image.created=${BUILD_DATE} \ + org.opencontainers.image.revision=${BUILD_REF} \ + org.opencontainers.image.version=${BUILD_VERSION} diff --git a/omada_v3/README.md b/omada_v3/README.md new file mode 100644 index 000000000..379e0294f --- /dev/null +++ b/omada_v3/README.md @@ -0,0 +1,53 @@ +# Home assistant add-on: Omada controller + +[![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) + +![Version](https://img.shields.io/badge/dynamic/json?label=Version&query=%24.version&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fomada%2Fconfig.json) +![Ingress](https://img.shields.io/badge/dynamic/json?label=Ingress&query=%24.ingress&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fomada%2Fconfig.json) +![Arch](https://img.shields.io/badge/dynamic/json?color=success&label=Arch&query=%24.arch&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fomada%2Fconfig.json) + +[![Codacy Badge](https://app.codacy.com/project/badge/Grade/9c6cf10bdbba45ecb202d7f579b5be0e)](https://www.codacy.com/gh/alexbelgium/hassio-addons/dashboard?utm_source=github.com&utm_medium=referral&utm_content=alexbelgium/hassio-addons&utm_campaign=Badge_Grade) +[![GitHub Super-Linter](https://github.com/alexbelgium/hassio-addons/workflows/Lint%20Code%20Base/badge.svg)](https://github.com/marketplace/actions/super-linter) +[![Builder](https://github.com/alexbelgium/hassio-addons/workflows/Builder/badge.svg)](https://github.com/alexbelgium/hassio-addons/actions/workflows/builder.yaml) + +[donation-badge]: https://img.shields.io/badge/Buy%20me%20a%20coffee-%23d32f2f?logo=buy-me-a-coffee&style=flat&logoColor=white + +_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://reporoster.com/stars/dark/alexbelgium/hassio-addons)](https://github.com/alexbelgium/hassio-addons/stargazers) +[![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 + +[TP-Link Omada Controller](https://www.tp-link.com/us/business-networking/omada-sdn-controller/) to control [TP-Link Omada Hardware](https://www.tp-link.com/en/business-networking/all-omada/). + +This addon is based on the docker image https://hub.docker.com/r/mbentley/omada-controller + +## Configuration + +Read official documentation for information how to set : https://hub.docker.com/r/mbentley/omada-controller + +## Installation + +The installation of this add-on is pretty straightforward and not different in comparison to installing any other add-on. + +1. Add my add-ons repository to your home assistant instance (in supervisor addons store at top right, or click button below if you have configured my HA) + [![Open your Home Assistant instance and show the add add-on repository dialog with a specific repository URL pre-filled.](https://my.home-assistant.io/badges/supervisor_add_addon_repository.svg)](https://my.home-assistant.io/redirect/supervisor_add_addon_repository/?repository_url=https%3A%2F%2Fgithub.com%2Falexbelgium%2Fhassio-addons) +1. Install this add-on. +1. Click the `Save` button to store your configuration. +1. Set the add-on options to your preferences +1. Start the add-on. +1. Check the logs of the add-on to see if everything went well. +1. Open the webUI and adapt the software options + +## Integration with HA + +https://github.com/zachcheatham/ha-omada + +## Support + +Create an issue on github + +## Illustration + +[repository]: https://github.com/alexbelgium/hassio-addons diff --git a/omada_v3/apparmor.txt b/omada_v3/apparmor.txt new file mode 100644 index 000000000..e3234e28b --- /dev/null +++ b/omada_v3/apparmor.txt @@ -0,0 +1,65 @@ +#include + +profile omada_addon flags=(attach_disconnected,mediate_deleted) { + #include + + capability, + file, + signal, + mount, + umount, + remount, + network udp, + network tcp, + network dgram, + network stream, + network inet, + network inet6, + network netlink raw, + network unix dgram, + + capability setgid, + capability setuid, + capability sys_admin, + capability dac_read_search, + # capability dac_override, + # capability sys_rawio, + +# S6-Overlay + /init ix, + /run/{s6,s6-rc*,service}/** ix, + /package/** ix, + /command/** ix, + /run/{,**} rwk, + /dev/tty rw, + /bin/** ix, + /usr/bin/** ix, + /usr/lib/bashio/** ix, + /etc/s6/** rix, + /run/s6/** rix, + /etc/services.d/** rwix, + /etc/cont-init.d/** rwix, + /etc/cont-finish.d/** rwix, + /init rix, + /var/run/** mrwkl, + /var/run/ mrwkl, + /dev/i2c-1 mrwkl, + # Files required + /dev/sda1 mrwkl, + /dev/sdb1 mrwkl, + /dev/nvme0 mrwkl, + /dev/nvme1 mrwkl, + /dev/mmcblk0p1 mrwkl, + /dev/* mrwkl, + /tmp/** mrkwl, + + # Data access + /data/** rw, + + # suppress ptrace denials when using 'docker ps' or using 'ps' inside a container + ptrace (trace,read) peer=docker-default, + + # docker daemon confinement requires explict allow rule for signal + signal (receive) set=(kill,term) peer=/usr/bin/docker, + +} diff --git a/omada_v3/build.json b/omada_v3/build.json new file mode 100644 index 000000000..1a8ee204b --- /dev/null +++ b/omada_v3/build.json @@ -0,0 +1,9 @@ +{ + "build_from": { + "aarch64": "mbentley/omada-controller:3.2-arm64", + "amd64": "mbentley/omada-controller:3.2-amd64" + }, + "codenotary": { + "signer": "alexandrep.github@gmail.com" + } +} diff --git a/omada_v3/config.json b/omada_v3/config.json new file mode 100644 index 000000000..48a564c4f --- /dev/null +++ b/omada_v3/config.json @@ -0,0 +1,50 @@ +{ + "arch": [ + "aarch64", + "amd64" + ], + "codenotary": "alexandrep.github@gmail.com", + "description": "TP-Link Omada Controller", + "environment": { + "MANAGE_HTTPS_PORT": "8043", + "MANAGE_HTTP_PORT": "8088", + "PORTAL_HTTPS_PORT": "8843", + "PORTAL_HTTP_PORT": "8088", + "SHOW_MONGODB_LOGS": "false", + "SHOW_SERVER_LOGS": "true", + "SSL_CERT_NAME": "fullchain.pem", + "SSL_KEY_NAME": "privkey.pem", + "TZ": "Etc/UTC" + }, + "host_network": true, + "image": "ghcr.io/alexbelgium/omada_v3-{arch}", + "map": [ + "config:rw", + "ssl:ro" + ], + "name": "Omada v3.2", + "ports": { + "29810/udp": 29810, + "29811/tcp": 29811, + "29812/tcp": 29812, + "29813/tcp": 29813, + "29814/tcp": 29814, + "8043/tcp": 8043, + "8088/tcp": 8088, + "8843/tcp": 8843 + }, + "ports_description": { + "29810/udp": "device discovery port", + "29811/tcp": "legacy device discovery port", + "29812/tcp": "legacy device discovery port", + "29813/tcp": "legacy device upgrade port", + "29814/tcp": "device adoption port", + "8043/tcp": "web interface https", + "8088/tcp": "web interface http", + "8843/tcp": "portal https" + }, + "slug": "omada_v3", + "url": "https://github.com/alexbelgium/hassio-addons", + "version": "5.5-chromium-amd64-2022-09-23-2", + "webui": "[PROTO:ssl]://[HOST]:[PORT:8088]" +} diff --git a/omada_v3/icon.png b/omada_v3/icon.png new file mode 100644 index 000000000..07076406e Binary files /dev/null and b/omada_v3/icon.png differ diff --git a/omada_v3/logo.png b/omada_v3/logo.png new file mode 100644 index 000000000..07076406e Binary files /dev/null and b/omada_v3/logo.png differ diff --git a/omada_v3/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/omada_v3/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh new file mode 100644 index 000000000..b983e4efc --- /dev/null +++ b/omada_v3/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh @@ -0,0 +1,50 @@ +#!/bin/bash + +# If dockerfile failed install manually + +############################## +# Automatic modules download # +############################## +if [ -e "/MODULESFILE" ]; then + MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ + && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ + && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ + && mkdir -p /etc/cont-init.d \ + && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ + && chmod -R 755 /etc/cont-init.d +fi + +####################### +# Automatic installer # +####################### +if [ -e "/ENVFILE" ]; then + PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ + && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ + && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ + && chmod 777 /automatic_packages.sh \ + && eval /./automatic_packages.sh "${PACKAGES:-}" \ + && rm /automatic_packages.sh +fi + +if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then + for scripts in $MODULES; do + echo "$scripts : executing" + chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" + chmod a+x /etc/cont-init.d/"$scripts" + /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" + rm /etc/cont-init.d/"$scripts" + done | tac +fi + +####################### +# Correct permissions # +####################### +[ -d /etc/services.d ] && chmod -R 777 /etc/services.d +[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/omada_v3/rootfs/etc/cont-init.d/00-folders.sh b/omada_v3/rootfs/etc/cont-init.d/00-folders.sh new file mode 100644 index 000000000..2aa8bd12c --- /dev/null +++ b/omada_v3/rootfs/etc/cont-init.d/00-folders.sh @@ -0,0 +1,33 @@ +#!/bin/bash +# shellcheck shell=bash + +CONFIGSOURCE="/data" + +# Create directory +if [ ! -d "$CONFIGSOURCE" ]; then + echo "Creating directory" + mkdir -p "$CONFIGSOURCE" +fi + +# Ensure structure is correct +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" diff --git a/omada_v3/updater.json b/omada_v3/updater.json new file mode 100644 index 000000000..ecab1df1a --- /dev/null +++ b/omada_v3/updater.json @@ -0,0 +1,9 @@ +{ + "dockerhub_by_date": true, + "last_update": "2022-09-23", + "repository": "alexbelgium/hassio-addons", + "slug": "omada_v3", + "source": "dockerhub", + "upstream_repo": "mbentley/omada-controller", + "upstream_version": "5.5-chromium-amd64-2022-09-23" +} diff --git a/ombi/Dockerfile b/ombi/Dockerfile index c8afeb003..93cff4109 100644 --- a/ombi/Dockerfile +++ b/ombi/Dockerfile @@ -34,15 +34,15 @@ RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ \ + # Create new config folder if needed + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + \ # Allow UID and GID setting - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \ + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID') ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID') ]; then echo "0"; else bashio::config 'PGID'; 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 -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ \ - # Create new config folder if needed - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ - \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done @@ -73,6 +73,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ENV PACKAGES="jq curl" # Automatic apps & bashio +# hadolint ignore=SC2015 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ diff --git a/organizr/Dockerfile b/organizr/Dockerfile index 276b53b6c..fe4437aa8 100644 --- a/organizr/Dockerfile +++ b/organizr/Dockerfile @@ -33,15 +33,15 @@ RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ \ + # Create new config folder if needed + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + \ # Allow UID and GID setting - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \ + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID') ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID') ]; then echo "0"; else bashio::config 'PGID'; 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 -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ \ - # Create new config folder if needed - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ - \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done @@ -73,6 +73,7 @@ ENV PACKAGES="curl \ jq" # Automatic apps & bashio +# hadolint ignore=SC2015 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ diff --git a/overseerr/CHANGELOG.md b/overseerr/CHANGELOG.md index 66f7e8b76..08daec393 100644 --- a/overseerr/CHANGELOG.md +++ b/overseerr/CHANGELOG.md @@ -1 +1,4 @@ + +## 1.30.0 (20-09-2022) +- Update to latest version from linuxserver/docker-overseerr - Initial release diff --git a/overseerr/Dockerfile b/overseerr/Dockerfile index da4324672..375c7c8ea 100644 --- a/overseerr/Dockerfile +++ b/overseerr/Dockerfile @@ -35,15 +35,15 @@ RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ \ + # Create new config folder if needed + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + \ # Allow UID and GID setting - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \ + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID') ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID') ]; then echo "0"; else bashio::config 'PGID'; 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 -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ \ - # Create new config folder if needed - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ - \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done @@ -74,6 +74,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ENV PACKAGES="" # Automatic apps & bashio +# hadolint ignore=SC2015 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ diff --git a/overseerr/README.md b/overseerr/README.md index ce60d391d..84c4a77c6 100644 --- a/overseerr/README.md +++ b/overseerr/README.md @@ -1,4 +1,3 @@ -## ⚠ Open Issue : [🐛 Overseerr configfile location unwritable (opened 2022-09-13)](https://github.com/alexbelgium/hassio-addons/issues/478) by [@rjgout](https://github.com/rjgout) # Home assistant add-on: overseerr [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) diff --git a/overseerr/config.json b/overseerr/config.json index 0151ad06a..42fe49e51 100644 --- a/overseerr/config.json +++ b/overseerr/config.json @@ -32,6 +32,6 @@ }, "slug": "overseerr", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/overseerr", - "version": "1.29.1-3", + "version": "1.30.0-2", "webui": "[PROTO:ssl]://[HOST]:[PORT:5055]" } diff --git a/overseerr/rootfs/etc/cont-init.d/00-config_location.sh b/overseerr/rootfs/etc/cont-init.d/00-config_location.sh index 6852da1a9..452ba6289 100644 --- a/overseerr/rootfs/etc/cont-init.d/00-config_location.sh +++ b/overseerr/rootfs/etc/cont-init.d/00-config_location.sh @@ -8,6 +8,7 @@ mkdir -p "$CONFIG_LOCATION" chown -R abc:abc "$CONFIG_LOCATION" chmod -R 755 "$CONFIG_LOCATION" +# shellcheck disable=SC2013 for file in $(grep -Esril "/config/addons_config/overseerr" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config/addons_config/overseerr=$CONFIG_LOCATION=g" "$file" done diff --git a/overseerr/rootfs/etc/cont-init.d/20-folders.sh b/overseerr/rootfs/etc/cont-init.d/20-folders.sh index 7e2e4d168..a94eef137 100644 --- a/overseerr/rootfs/etc/cont-init.d/20-folders.sh +++ b/overseerr/rootfs/etc/cont-init.d/20-folders.sh @@ -10,6 +10,7 @@ if [ -d /config/addons_config/addons_config/overseerr ]; then mv /config/addons_config/addons_config/overseerr /config/addons_config/overseerr fi +# shellcheck disable=SC2013 for file in $(grep -Esril "/config/.config/yarn" /usr /etc /defaults); do sed -i "s=/config/.config/yarn=/config/addons_config/overseerr/yarn=g" "$file" done diff --git a/overseerr/updater.json b/overseerr/updater.json index 25f2ad7a3..711e44b5f 100644 --- a/overseerr/updater.json +++ b/overseerr/updater.json @@ -1,8 +1,8 @@ { - "last_update": "27-04-2022", + "last_update": "20-09-2022", "repository": "alexbelgium/hassio-addons", "slug": "overseerr", "source": "github", "upstream_repo": "linuxserver/docker-overseerr", - "upstream_version": "1.29.1" + "upstream_version": "1.30.0" } diff --git a/paperless_ngx/CHANGELOG.md b/paperless_ngx/CHANGELOG.md index 53f4582ac..06d8513bc 100644 --- a/paperless_ngx/CHANGELOG.md +++ b/paperless_ngx/CHANGELOG.md @@ -1,4 +1,7 @@ +## 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 diff --git a/paperless_ngx/Dockerfile b/paperless_ngx/Dockerfile index 37a25a4cd..2b8806aff 100644 --- a/paperless_ngx/Dockerfile +++ b/paperless_ngx/Dockerfile @@ -34,15 +34,15 @@ RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ \ + # Create new config folder if needed + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + \ # Allow UID and GID setting - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \ + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID') ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID') ]; then echo "0"; else bashio::config 'PGID'; 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 -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ \ - # Create new config folder if needed - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ - \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done @@ -75,6 +75,7 @@ ENV PACKAGES="yamllint \ libxml2-dev libxslt-dev python-dev libjpeg-dev zlib1g-dev python3-dev build-essential" # Automatic apps & bashio +# hadolint ignore=SC2015 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ diff --git a/paperless_ngx/config.json b/paperless_ngx/config.json index c8bef84cc..5366823b8 100644 --- a/paperless_ngx/config.json +++ b/paperless_ngx/config.json @@ -81,6 +81,6 @@ }, "slug": "paperless_ng", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "v1.8.0-ls29", + "version": "v1.8.0-ls30", "webui": "[PROTO:ssl]://[HOST]:[PORT:8000]" } diff --git a/paperless_ngx/updater.json b/paperless_ngx/updater.json index 816dd4e0e..c59829557 100644 --- a/paperless_ngx/updater.json +++ b/paperless_ngx/updater.json @@ -1,9 +1,9 @@ { "github_fulltag": "true", - "last_update": "17-09-2022", + "last_update": "24-09-2022", "repository": "alexbelgium/hassio-addons", "slug": "paperless_ngx", "source": "github", "upstream_repo": "linuxserver/docker-paperless-ngx", - "upstream_version": "v1.8.0-ls29" + "upstream_version": "v1.8.0-ls30" } diff --git a/papermerge/Dockerfile b/papermerge/Dockerfile index 456226fb4..359a8f08a 100644 --- a/papermerge/Dockerfile +++ b/papermerge/Dockerfile @@ -41,15 +41,15 @@ RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ \ + # Create new config folder if needed + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + \ # Allow UID and GID setting - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \ + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID') ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID') ]; then echo "0"; else bashio::config 'PGID'; 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 -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ \ - # Create new config folder if needed - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ - \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done @@ -83,6 +83,7 @@ ENV PACKAGES="jq \ keyutils" # Automatic apps & bashio +# hadolint ignore=SC2015 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ diff --git a/photoprism/Dockerfile b/photoprism/Dockerfile index c2d9b8024..e388c34e1 100644 --- a/photoprism/Dockerfile +++ b/photoprism/Dockerfile @@ -72,6 +72,7 @@ ENV PACKAGES="jq \ nginx" # Automatic apps & bashio +# hadolint ignore=SC2015 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ diff --git a/piwigo/Dockerfile b/piwigo/Dockerfile index 42153cd7a..5a5cc932d 100644 --- a/piwigo/Dockerfile +++ b/piwigo/Dockerfile @@ -34,15 +34,15 @@ RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ \ + # Create new config folder if needed + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + \ # Allow UID and GID setting - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \ + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID') ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID') ]; then echo "0"; else bashio::config 'PGID'; 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 -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ \ - # Create new config folder if needed - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ - \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done @@ -75,6 +75,7 @@ ENV PACKAGES="jq \ cifs-utils" # Automatic apps & bashio +# hadolint ignore=SC2015 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ diff --git a/plex/CHANGELOG.md b/plex/CHANGELOG.md index 1451e376f..f8bf4ebd3 100644 --- a/plex/CHANGELOG.md +++ b/plex/CHANGELOG.md @@ -1,4 +1,7 @@ +## 1.28.2.6151-914ddd2b3-ls132 (22-09-2022) +- Update to latest version from linuxserver/docker-plex + ## 1.28.2.6151-914ddd2b3-ls131 (09-09-2022) - Update to latest version from linuxserver/docker-plex diff --git a/plex/Dockerfile b/plex/Dockerfile index 3cb55bef0..94b9e8a94 100644 --- a/plex/Dockerfile +++ b/plex/Dockerfile @@ -43,15 +43,15 @@ RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ \ + # Create new config folder if needed + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + \ # Allow UID and GID setting - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \ + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID') ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID') ]; then echo "0"; else bashio::config 'PGID'; 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 -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ \ - # Create new config folder if needed - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ - \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done @@ -85,6 +85,7 @@ ENV PACKAGES="jq \ keyutils" # Automatic apps & bashio +# hadolint ignore=SC2015 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ diff --git a/plex/config.json b/plex/config.json index 710e7cae1..2ce5f98a8 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.28.2.6151-914ddd2b3-ls131-2-bugfix", + "version": "1.28.2.6151-914ddd2b3-ls132", "video": true, "webui": "[PROTO:ssl]://[HOST]:[PORT:32400]/web" } diff --git a/plex/updater.json b/plex/updater.json index 9dc165cdc..bb731bf0e 100644 --- a/plex/updater.json +++ b/plex/updater.json @@ -1,9 +1,9 @@ { "github_fulltag": "true", - "last_update": "09-09-2022", + "last_update": "22-09-2022", "repository": "alexbelgium/hassio-addons", "slug": "plex", "source": "github", "upstream_repo": "linuxserver/docker-plex", - "upstream_version": "1.28.2.6151-914ddd2b3-ls131" + "upstream_version": "1.28.2.6151-914ddd2b3-ls132" } diff --git a/plex_meta_manager/CHANGELOG.md b/plex_meta_manager/CHANGELOG.md index 1160d3920..b1bc64b39 100644 --- a/plex_meta_manager/CHANGELOG.md +++ b/plex_meta_manager/CHANGELOG.md @@ -1,4 +1,7 @@ +## v1.17.3-ls28 (20-09-2022) +- Update to latest version from linuxserver/docker-plex-meta-manager + ## v1.17.3-ls27 (09-09-2022) - Update to latest version from linuxserver/docker-plex-meta-manager diff --git a/plex_meta_manager/Dockerfile b/plex_meta_manager/Dockerfile index 64122d41c..2c182c17b 100644 --- a/plex_meta_manager/Dockerfile +++ b/plex_meta_manager/Dockerfile @@ -42,15 +42,15 @@ RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ \ + # Create new config folder if needed + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + \ # Allow UID and GID setting - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \ + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID') ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID') ]; then echo "0"; else bashio::config 'PGID'; 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 -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ \ - # Create new config folder if needed - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ - \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done @@ -81,6 +81,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ENV PACKAGES="" # Automatic apps & bashio +# hadolint ignore=SC2015 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ diff --git a/plex_meta_manager/config.json b/plex_meta_manager/config.json index 9cd49d55f..b78811128 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-ls27-bugfix" + "version": "v1.17.3-ls28" } diff --git a/plex_meta_manager/updater.json b/plex_meta_manager/updater.json index 035ab91e8..7ef7920da 100644 --- a/plex_meta_manager/updater.json +++ b/plex_meta_manager/updater.json @@ -1,9 +1,9 @@ { "github_fulltag": "true", - "last_update": "09-09-2022", + "last_update": "20-09-2022", "repository": "alexbelgium/hassio-addons", "slug": "plex_meta_manager", "source": "github", "upstream_repo": "linuxserver/docker-plex-meta-manager", - "upstream_version": "v1.17.3-ls27" + "upstream_version": "v1.17.3-ls28" } diff --git a/portainer/Dockerfile b/portainer/Dockerfile index b8a0086db..2d37b25d6 100644 --- a/portainer/Dockerfile +++ b/portainer/Dockerfile @@ -78,6 +78,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ENV PACKAGES="nginx" # Automatic apps & bashio +# hadolint ignore=SC2015 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ diff --git a/prowlarr/CHANGELOG.md b/prowlarr/CHANGELOG.md index a146da31f..4ac5cc840 100644 --- a/prowlarr/CHANGELOG.md +++ b/prowlarr/CHANGELOG.md @@ -1,4 +1,7 @@ +## nightly-0.4.7.1978-ls411 (20-09-2022) +- Update to latest version from linuxserver/docker-prowlarr + ## nightly-0.4.6.1969-ls408 (15-09-2022) - Update to latest version from linuxserver/docker-prowlarr diff --git a/prowlarr/Dockerfile b/prowlarr/Dockerfile index 11314b1b7..45c720c80 100644 --- a/prowlarr/Dockerfile +++ b/prowlarr/Dockerfile @@ -34,15 +34,15 @@ RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ \ + # Create new config folder if needed + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + \ # Allow UID and GID setting - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \ + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID') ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID') ]; then echo "0"; else bashio::config 'PGID'; 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 -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ \ - # Create new config folder if needed - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ - \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done @@ -76,6 +76,7 @@ ENV PACKAGES="jq \ keyutils" # Automatic apps & bashio +# hadolint ignore=SC2015 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ diff --git a/prowlarr/README.md b/prowlarr/README.md index 4b3beebbd..c1dfd2cc5 100644 --- a/prowlarr/README.md +++ b/prowlarr/README.md @@ -1,4 +1,3 @@ -## ⚠ Open Request : [✨ [REQUEST] Prowlarr add localdisk (opened 2022-08-16)](https://github.com/alexbelgium/hassio-addons/issues/429) by [@crowley666x](https://github.com/crowley666x) # Home assistant add-on: Prowlarr diff --git a/prowlarr/config.json b/prowlarr/config.json index d068e7d3e..5043f2314 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.6.1969-ls408", + "version": "nightly-0.4.7.1978-ls411", "webui": "[PROTO:ssl]://[HOST]:[PORT:9696]" } diff --git a/prowlarr/updater.json b/prowlarr/updater.json index 9a19bf6c5..8cece0020 100644 --- a/prowlarr/updater.json +++ b/prowlarr/updater.json @@ -1,10 +1,10 @@ { "github_beta": "true", "github_fulltag": "true", - "last_update": "15-09-2022", + "last_update": "20-09-2022", "repository": "alexbelgium/hassio-addons", "slug": "prowlarr", "source": "github", "upstream_repo": "linuxserver/docker-prowlarr", - "upstream_version": "nightly-0.4.6.1969-ls408" + "upstream_version": "nightly-0.4.7.1978-ls411" } diff --git a/qbittorrent/CHANGELOG.md b/qbittorrent/CHANGELOG.md index 4ee740ed0..7a99318ef 100644 --- a/qbittorrent/CHANGELOG.md +++ b/qbittorrent/CHANGELOG.md @@ -1,4 +1,10 @@ +## 4.4.5-r0-ls217 (22-09-2022) +- Update to latest version from linuxserver/docker-qbittorrent + +## 4.4.5-r0-ls216 (20-09-2022) +- Update to latest version from linuxserver/docker-qbittorrent + ## 4.4.5-r0-ls215 (13-09-2022) - Update to latest version from linuxserver/docker-qbittorrent - Config folder moved to /config/addons_config/qBittorrent diff --git a/qbittorrent/Dockerfile b/qbittorrent/Dockerfile index 31de53737..f54323e3e 100644 --- a/qbittorrent/Dockerfile +++ b/qbittorrent/Dockerfile @@ -16,7 +16,7 @@ ARG BUILD_FROM ARG BUILD_VERSION -ARG BUILD_UPSTREAM="4.4.5-r0-ls215" +ARG BUILD_UPSTREAM="4.4.5-r0-ls217" FROM ${BUILD_FROM}-$BUILD_UPSTREAM ################## @@ -57,15 +57,15 @@ RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ \ + # Create new config folder if needed + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + \ # Allow UID and GID setting - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \ + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID') ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID') ]; then echo "0"; else bashio::config 'PGID'; 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 -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ \ - # Create new config folder if needed - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ - \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done \ \ @@ -99,6 +99,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ARG PACKAGES="" # Automatic apps & bashio +# hadolint ignore=SC2015 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ diff --git a/qbittorrent/config.json b/qbittorrent/config.json index 39cbe20cd..6a2b96579 100644 --- a/qbittorrent/config.json +++ b/qbittorrent/config.json @@ -115,5 +115,5 @@ }, "slug": "qbittorrent", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "4.4.5-r0-ls215" + "version": "4.4.5-r0-ls217" } diff --git a/qbittorrent/updater.json b/qbittorrent/updater.json index d8ecc4d56..76166fef4 100644 --- a/qbittorrent/updater.json +++ b/qbittorrent/updater.json @@ -1,9 +1,9 @@ { "github_fulltag": "true", - "last_update": "13-09-2022", + "last_update": "22-09-2022", "repository": "alexbelgium/hassio-addons", "slug": "qbittorrent", "source": "github", "upstream_repo": "linuxserver/docker-qbittorrent", - "upstream_version": "4.4.5-r0-ls215" + "upstream_version": "4.4.5-r0-ls217" } diff --git a/radarr/Dockerfile b/radarr/Dockerfile index ac6c70b04..7ff847d03 100644 --- a/radarr/Dockerfile +++ b/radarr/Dockerfile @@ -34,15 +34,15 @@ RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ \ + # Create new config folder if needed + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + \ # Allow UID and GID setting - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \ + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID') ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID') ]; then echo "0"; else bashio::config 'PGID'; 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 -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ \ - # Create new config folder if needed - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ - \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done @@ -77,6 +77,7 @@ ENV PACKAGES="jq \ keyutils" # Automatic apps & bashio +# hadolint ignore=SC2015 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ diff --git a/readarr/CHANGELOG.md b/readarr/CHANGELOG.md index 32b53bd54..1644b738a 100644 --- a/readarr/CHANGELOG.md +++ b/readarr/CHANGELOG.md @@ -1,4 +1,7 @@ +## nightly-0.1.1.1409-ls136 (24-09-2022) +- Update to latest version from linuxserver/docker-readarr + ## nightly-0.1.1.1409-ls135 (01-09-2022) - Update to latest version from linuxserver/docker-readarr diff --git a/readarr/Dockerfile b/readarr/Dockerfile index fdf4e1192..040fcdcbf 100644 --- a/readarr/Dockerfile +++ b/readarr/Dockerfile @@ -35,15 +35,15 @@ RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ \ + # Create new config folder if needed + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + \ # Allow UID and GID setting - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \ + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID') ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID') ]; then echo "0"; else bashio::config 'PGID'; 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 -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ \ - # Create new config folder if needed - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ - \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done @@ -74,6 +74,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ENV PACKAGES="" # Automatic apps & bashio +# hadolint ignore=SC2015 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ diff --git a/readarr/config.json b/readarr/config.json index fe19064a6..28ed83e35 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.1409-ls135-bugfix", + "version": "nightly-0.1.1.1409-ls136", "webui": "[PROTO:ssl]://[HOST]:[PORT:8787]" } diff --git a/readarr/updater.json b/readarr/updater.json index f4feffca5..e9b58b899 100644 --- a/readarr/updater.json +++ b/readarr/updater.json @@ -1,10 +1,10 @@ { "github_beta": "true", "github_fulltag": "true", - "last_update": "01-09-2022", + "last_update": "24-09-2022", "repository": "alexbelgium/hassio-addons", "slug": "readarr", "source": "github", "upstream_repo": "linuxserver/docker-readarr", - "upstream_version": "nightly-0.1.1.1409-ls135" + "upstream_version": "nightly-0.1.1.1409-ls136" } diff --git a/requestrr/Dockerfile b/requestrr/Dockerfile index 5cdf17e47..827e94d64 100644 --- a/requestrr/Dockerfile +++ b/requestrr/Dockerfile @@ -34,15 +34,15 @@ RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ \ + # Create new config folder if needed + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + \ # Allow UID and GID setting - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \ + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID') ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID') ]; then echo "0"; else bashio::config 'PGID'; 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 -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ \ - # Create new config folder if needed - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ - \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done @@ -76,6 +76,7 @@ ENV PACKAGES="jq \ keyutils" # Automatic apps & bashio +# hadolint ignore=SC2015 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ diff --git a/resiliosync/Dockerfile b/resiliosync/Dockerfile index 66ab54f92..925099e26 100644 --- a/resiliosync/Dockerfile +++ b/resiliosync/Dockerfile @@ -31,11 +31,14 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # hadolint ignore=SC2015,DL4006,SC2013 RUN \ # Correct sync folder - grep -rl "/sync/" /etc/cont-init.d | xargs sed -i 's|/sync/|/share/resiliosync|g' || true \ - && grep -rl " /sync" /etc/cont-init.d | xargs sed -i 's| /sync| /share/resiliosync|g' || true \ - && grep -rl "/sync/" /etc/services.d | xargs sed -i 's|/sync/|/share/resiliosync|g' || true \ - && grep -rl " /sync" /etc/services.d | xargs sed -i 's| /sync| /share/resiliosync|g' || true \ - && sed -i 's=/sync/=/share/resiliosync/=g' /defaults/* + 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 \ + # 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 \ + # 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 \ + \ + && sed -i 's|"/sync",|"/", "/sync",|g' /defaults/sync.conf # Global LSIO modifications ARG CONFIGLOCATION="/share/resiliosync_config" @@ -44,15 +47,15 @@ RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ \ + # Create new config folder if needed + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + \ # Allow UID and GID setting - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \ + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID') ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID') ]; then echo "0"; else bashio::config 'PGID'; 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 -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ \ - # Create new config folder if needed - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ - \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done @@ -87,6 +90,7 @@ ENV PACKAGES="jq \ nginx" # Automatic apps & bashio +# hadolint ignore=SC2015 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ diff --git a/resiliosync/config.json b/resiliosync/config.json index 7f6912bfe..b8eb2be9b 100644 --- a/resiliosync/config.json +++ b/resiliosync/config.json @@ -51,8 +51,9 @@ "options": { "PGID": 0, "PUID": 0, - "config_location": "/config/addons_config/resioliosync", - "data_location": "/share/resioliosync" + "config_location": "/config/addons_config/resiliosync", + "data_location": "/share/resiliosync", + "downloads_location": "/share/resiliosync_downloads" }, "panel_icon": "mdi:cloud-sync-outline", "ports": { @@ -77,6 +78,7 @@ "cifsusername": "str?", "config_location": "str", "data_location": "str", + "downloads_location": "str", "localdisks": "str?", "networkdisks": "str?" }, diff --git a/resiliosync/rootfs/etc/cont-init.d/00-folders.sh b/resiliosync/rootfs/etc/cont-init.d/00-folders.sh index 1a435b3e9..d867e49a1 100644 --- a/resiliosync/rootfs/etc/cont-init.d/00-folders.sh +++ b/resiliosync/rootfs/etc/cont-init.d/00-folders.sh @@ -34,7 +34,9 @@ change_folders () { fi if [ "$TYPE" = "data_location" ]; then [ -f "$FILE" ] && jq --arg variable "$CONFIGLOCATION" '.directory_root = $variable' "$FILE" | sponge "$FILE" - [ -f "$FILE" ] && jq --arg variable "$CONFIGLOCATION/downloads" '.files_default_path = $variable' "$FILE" | sponge "$FILE" + fi + if [ "$TYPE" = "downloads_location" ]; then + [ -f "$FILE" ] && jq --arg variable "$CONFIGLOCATION" '.files_default_path = $variable' "$FILE" | sponge "$FILE" fi done @@ -47,6 +49,7 @@ change_folders () { # Set permissions echo "Setting ownership to $PUID:$PGID" chown -R "$PUID":"$PGID" "$CONFIGLOCATION" + chmod -R 777 "$CONFIGLOCATION" # Transfer files if [ -d "$ORIGINALLOCATION" ] && [ "$(ls -A "$ORIGINALLOCATION" 2>/dev/null)" ]; then @@ -63,3 +66,4 @@ change_folders () { # Adapt files change_folders "$(bashio::config 'config_location')" "/share/resiliosync_config" "config_location" change_folders "$(bashio::config 'data_location')" "/share/resiliosync" "data_location" +change_folders "$(bashio::config 'downloads_location')" "/share/resiliosync_downloads" "downloads_location" diff --git a/scrutiny/Dockerfile b/scrutiny/Dockerfile index a6015b2db..51dfed6ef 100644 --- a/scrutiny/Dockerfile +++ b/scrutiny/Dockerfile @@ -57,6 +57,7 @@ ENV PACKAGES="jq \ nginx" # Automatic apps & bashio +# hadolint ignore=SC2015 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ diff --git a/scrutiny_fa/Dockerfile b/scrutiny_fa/Dockerfile index a6015b2db..51dfed6ef 100644 --- a/scrutiny_fa/Dockerfile +++ b/scrutiny_fa/Dockerfile @@ -57,6 +57,7 @@ ENV PACKAGES="jq \ nginx" # Automatic apps & bashio +# hadolint ignore=SC2015 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ diff --git a/seafile/CHANGELOG.md b/seafile/CHANGELOG.md index b34151291..bc944542e 100644 --- a/seafile/CHANGELOG.md +++ b/seafile/CHANGELOG.md @@ -1,4 +1,10 @@ +## v9.0.9-pro (24-09-2022) +- Update to latest version from haiwen/seahub + +## v9.0.9-server (20-09-2022) +- Update to latest version from haiwen/seahub + ## v9.0.8-pro (09-09-2022) - Update to latest version from haiwen/seahub diff --git a/seafile/Dockerfile b/seafile/Dockerfile index 6af59b39f..911218afb 100644 --- a/seafile/Dockerfile +++ b/seafile/Dockerfile @@ -59,6 +59,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ENV PACKAGES="" # Automatic apps & bashio +# hadolint ignore=SC2015 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ diff --git a/seafile/README.md b/seafile/README.md index 3031145b1..9a3c92ffd 100644 --- a/seafile/README.md +++ b/seafile/README.md @@ -1,4 +1,3 @@ -## ⚠ Open Issue : [🐛 [SEAFILE] Error: Failed to prepare seahub avatars dir: [Errno 95] Operation not supported: '../../../seahub-data/avatars' -> '/opt/seafile/seafile-server-9.0.8/seahub/media/avatars' (opened 2022-09-12)](https://github.com/alexbelgium/hassio-addons/issues/475) by [@bobloadmire](https://github.com/bobloadmire) # Home assistant add-on: seafile [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) diff --git a/seafile/config.json b/seafile/config.json index 5464932f0..eba717a84 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.8-2", + "version": "v9.0.9-pro", "webui": "[PROTO:ssl]://[HOST]:[PORT:8000]" } diff --git a/seafile/updater.json b/seafile/updater.json index e0aa947ba..c5bfe2204 100644 --- a/seafile/updater.json +++ b/seafile/updater.json @@ -1,10 +1,10 @@ { "github_fulltag": "true", - "last_update": "09-09-2022", + "last_update": "24-09-2022", "paused": false, "repository": "alexbelgium/hassio-addons", "slug": "seafile", "source": "github", "upstream_repo": "haiwen/seahub", - "upstream_version": "v9.0.8-pro" + "upstream_version": "v9.0.9-pro" } diff --git a/sonarr/Dockerfile b/sonarr/Dockerfile index ffcad98ef..04a871c6a 100644 --- a/sonarr/Dockerfile +++ b/sonarr/Dockerfile @@ -35,15 +35,15 @@ RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ \ + # Create new config folder if needed + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + \ # Allow UID and GID setting - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \ + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID') ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID') ]; then echo "0"; else bashio::config 'PGID'; 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 -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ \ - # Create new config folder if needed - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ - \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done @@ -77,6 +77,7 @@ ENV PACKAGES="jq \ keyutils" # Automatic apps & bashio +# hadolint ignore=SC2015 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ diff --git a/spotweb/Dockerfile b/spotweb/Dockerfile index 1d550ecdb..2c4909958 100644 --- a/spotweb/Dockerfile +++ b/spotweb/Dockerfile @@ -111,6 +111,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ENV PACKAGES="" # Automatic apps & bashio +# hadolint ignore=SC2015 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ diff --git a/tandoor_recipes/CHANGELOG.md b/tandoor_recipes/CHANGELOG.md index 68c1fbdb1..fa56020bf 100644 --- a/tandoor_recipes/CHANGELOG.md +++ b/tandoor_recipes/CHANGELOG.md @@ -1,3 +1,9 @@ + +## 1.4.2 (24-09-2022) +- Update to latest version from TandoorRecipes/recipes + +## 1.4.1 (22-09-2022) +- Update to latest version from TandoorRecipes/recipes - Allow nabucasa url - Ingress addition diff --git a/tandoor_recipes/Dockerfile b/tandoor_recipes/Dockerfile index 4327c7df0..b21eac072 100644 --- a/tandoor_recipes/Dockerfile +++ b/tandoor_recipes/Dockerfile @@ -55,6 +55,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ENV PACKAGES="nginx" # Automatic apps & bashio +# hadolint ignore=SC2015 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ diff --git a/tandoor_recipes/config.json b/tandoor_recipes/config.json index 93aa6a959..e4ae4ecba 100644 --- a/tandoor_recipes/config.json +++ b/tandoor_recipes/config.json @@ -8,7 +8,7 @@ "description": "recipe manager", "environment": { "DB_ENGINE": "django.db.backends.sqlite3", - "DEBUG": "1", + "DEBUG": "0", "POSTGRES_DB": "/config/addons_config/tandoor_recipes/recipes.db", "TRUSTED_PROXIES": "**" }, @@ -45,5 +45,5 @@ ], "slug": "tandoor_recipes", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "1.3.3-ingress2" + "version": "1.4.2" } diff --git a/tandoor_recipes/rootfs/etc/cont-init.d/32-ingress.sh b/tandoor_recipes/rootfs/etc/cont-init.d/32-ingress.sh index 576060d26..ac009cb2c 100644 --- a/tandoor_recipes/rootfs/etc/cont-init.d/32-ingress.sh +++ b/tandoor_recipes/rootfs/etc/cont-init.d/32-ingress.sh @@ -4,11 +4,10 @@ ######## # TEST # ######## -if [ -f /config/tandooringress.conf ]; then +if [ -f /config/tandoortest.sh ]; then echo "running test file" - rm /etc/nginx/servers/ingress.conf - cp /config/tandooringress.conf /etc/nginx/servers/ingress.conf - chmod 775 /etc/nginx/servers/ingress.conf + chmod +x /config/tandoortest.sh + /./config/tandoortest.sh fi ################# diff --git a/tandoor_recipes/rootfs/etc/nginx/includes/proxy_params.conf b/tandoor_recipes/rootfs/etc/nginx/includes/proxy_params.conf index 1990d4959..28c65a0a8 100644 --- a/tandoor_recipes/rootfs/etc/nginx/includes/proxy_params.conf +++ b/tandoor_recipes/rootfs/etc/nginx/includes/proxy_params.conf @@ -7,7 +7,6 @@ proxy_max_temp_file_size 0; proxy_set_header Accept-Encoding ""; proxy_set_header Connection $connection_upgrade; -proxy_set_header Host $http_host; proxy_set_header Upgrade $http_upgrade; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Proto $scheme; diff --git a/tandoor_recipes/rootfs/etc/nginx/servers/ingress.conf b/tandoor_recipes/rootfs/etc/nginx/servers/ingress.conf index 5552aabe6..74ce5028c 100644 --- a/tandoor_recipes/rootfs/etc/nginx/servers/ingress.conf +++ b/tandoor_recipes/rootfs/etc/nginx/servers/ingress.conf @@ -6,6 +6,16 @@ server { root /opt/recipes/cookbook; + location /switch-space { + proxy_pass http://127.0.0.1:8080/switch-space; + proxy_set_header Host $http_host; + proxy_buffering off; + proxy_read_timeout 30; + proxy_set_header Connection "Upgrade"; + proxy_set_header Upgrade $http_upgrade; + + } + location / { proxy_pass http://127.0.0.1:8080; proxy_buffering off; @@ -19,7 +29,7 @@ server { # Allow frames proxy_hide_header "Content-Security-Policy"; - add_header X-Frame-Options SAMEORIGIN; + add_header X-Frame-Options SAMEORIGIN; # Required for ingress frame add_header Access-Control-Allow-Origin *; proxy_set_header Accept-Encoding ""; @@ -41,7 +51,7 @@ server { proxy_set_header X-Port $x_port; proxy_set_header X-Forwarded-Proto $x_scheme; - proxy_set_header Host $host$x_port; # try $host instead if this doesn't work + proxy_set_header Host $host$x_port; # Required for addresses without ports # Correct url without port when using https sub_filter_once off; @@ -50,7 +60,7 @@ server { sub_filter http://$x_host/ http://$x_host$x_port/; # Rewrite url - sub_filter "/static" "%%ingress_entry%%/static"; - sub_filter "/media" "%%ingress_entry%%/media"; + sub_filter "/static/" "%%ingress_entry%%/static/"; + sub_filter "/media/" "%%ingress_entry%%/media/"; } } diff --git a/tandoor_recipes/updater.json b/tandoor_recipes/updater.json index fe22db39e..59d66b56c 100644 --- a/tandoor_recipes/updater.json +++ b/tandoor_recipes/updater.json @@ -1,8 +1,8 @@ { - "last_update": "04-08-2022", + "last_update": "24-09-2022", "repository": "alexbelgium/hassio-addons", "slug": "tandoor_recipes", "source": "github", "upstream_repo": "TandoorRecipes/recipes", - "upstream_version": "1.3.3" + "upstream_version": "1.4.2" } diff --git a/tdarr/Dockerfile b/tdarr/Dockerfile index a10eff505..8fd8a7ee5 100644 --- a/tdarr/Dockerfile +++ b/tdarr/Dockerfile @@ -54,6 +54,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ENV PACKAGES="libgles2-mesa libgles2-mesa-dev xorg-dev" # Automatic apps & bashio +# hadolint ignore=SC2015 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ diff --git a/teamspeak/Dockerfile b/teamspeak/Dockerfile index 155e18ec2..929d29cfc 100644 --- a/teamspeak/Dockerfile +++ b/teamspeak/Dockerfile @@ -60,6 +60,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ENV PACKAGES="" # Automatic apps & bashio +# hadolint ignore=SC2015 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ diff --git a/transmission/CHANGELOG.md b/transmission/CHANGELOG.md index 02cd01b47..239011892 100644 --- a/transmission/CHANGELOG.md +++ b/transmission/CHANGELOG.md @@ -1,4 +1,7 @@ +## 3.00-r5-ls136 (24-09-2022) +- Update to latest version from linuxserver/docker-transmission + ## 3.00-r5-ls135 (09-09-2022) - Update to latest version from linuxserver/docker-transmission diff --git a/transmission/Dockerfile b/transmission/Dockerfile index f2c685b41..a20e93ef4 100644 --- a/transmission/Dockerfile +++ b/transmission/Dockerfile @@ -34,15 +34,15 @@ RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ \ + # Create new config folder if needed + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + \ # Allow UID and GID setting - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \ + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID') ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID') ]; then echo "0"; else bashio::config 'PGID'; 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 -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ \ - # Create new config folder if needed - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ - \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done @@ -73,6 +73,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ENV PACKAGES="nginx" # Automatic apps & bashio +# hadolint ignore=SC2015 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ diff --git a/transmission/README.md b/transmission/README.md index 59a8fa881..0001a2dad 100644 --- a/transmission/README.md +++ b/transmission/README.md @@ -1,3 +1,4 @@ +## ⚠ Open Issue : [🐛 [Transmission Openvpn] Transmission client is killed upon VPN restart (because of inactivity) (opened 2022-08-22)](https://github.com/alexbelgium/hassio-addons/issues/435) by [@almico](https://github.com/almico) # Home assistant add-on: Transmission [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) diff --git a/transmission/config.json b/transmission/config.json index 1250197ac..485cf1215 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-ls135-bugfix3" + "version": "3.00-r5-ls136" } diff --git a/transmission/updater.json b/transmission/updater.json index 07fcf7df7..f53be71d4 100644 --- a/transmission/updater.json +++ b/transmission/updater.json @@ -1,9 +1,9 @@ { "github_fulltag": "true", - "last_update": "09-09-2022", + "last_update": "24-09-2022", "repository": "alexbelgium/hassio-addons", "slug": "transmission", "source": "github", "upstream_repo": "linuxserver/docker-transmission", - "upstream_version": "3.00-r5-ls135" + "upstream_version": "3.00-r5-ls136" } diff --git a/transmission_openvpn/Dockerfile b/transmission_openvpn/Dockerfile index 25708094c..35d49a05b 100644 --- a/transmission_openvpn/Dockerfile +++ b/transmission_openvpn/Dockerfile @@ -58,6 +58,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ENV PACKAGES="nginx" # Automatic apps & bashio +# hadolint ignore=SC2015 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ diff --git a/transmission_openvpn/config.json b/transmission_openvpn/config.json index 83cc1d335..237dd0948 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-v20" + "version": "4.0-v22" } diff --git a/transmission_openvpn/rootfs/etc/cont-init.d/99-run.sh b/transmission_openvpn/rootfs/etc/cont-init.d/99-run.sh index ec86799de..54160b78a 100644 --- a/transmission_openvpn/rootfs/etc/cont-init.d/99-run.sh +++ b/transmission_openvpn/rootfs/etc/cont-init.d/99-run.sh @@ -112,7 +112,8 @@ fi # Auto restart # ################ -sed -i "s|#!/bin/bash|#!/usr/bin/bashio|g" /etc/openvpn/tunnelDown.sh +sed -i "1d" /etc/openvpn/tunnelDown.sh +sed -i "1i #!/usr/bin/bashio" /etc/openvpn/tunnelDown.sh sed -i "1a bashio::log.warning 'Tunnel down, addon restarting'" /etc/openvpn/tunnelDown.sh sed -i "1a bashio::addon.restart" /etc/openvpn/tunnelDown.sh diff --git a/ubooquity/Dockerfile b/ubooquity/Dockerfile index 8b45b21a9..491262785 100644 --- a/ubooquity/Dockerfile +++ b/ubooquity/Dockerfile @@ -44,15 +44,15 @@ RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ \ + # Create new config folder if needed + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + \ # Allow UID and GID setting - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \ + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID') ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID') ]; then echo "0"; else bashio::config 'PGID'; 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 -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ \ - # Create new config folder if needed - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ - \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done @@ -86,6 +86,7 @@ ENV PACKAGES="curl \ nginx" # Automatic apps & bashio +# hadolint ignore=SC2015 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ diff --git a/webtop_kde/CHANGELOG.md b/webtop_kde/CHANGELOG.md index 5b69d0094..5d80e3330 100644 --- a/webtop_kde/CHANGELOG.md +++ b/webtop_kde/CHANGELOG.md @@ -1,4 +1,7 @@ +## 4.16-r0-ls70 (20-09-2022) +- Update to latest version from linuxserver/docker-webtop + ## 4.16-r0-ls69 (09-09-2022) - Update to latest version from linuxserver/docker-webtop diff --git a/webtop_kde/Dockerfile b/webtop_kde/Dockerfile index 3ac09b31c..51a034cf1 100644 --- a/webtop_kde/Dockerfile +++ b/webtop_kde/Dockerfile @@ -47,15 +47,15 @@ RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ \ + # Create new config folder if needed + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + \ # Allow UID and GID setting - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \ + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID') ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID') ]; then echo "0"; else bashio::config 'PGID'; 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 -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ \ - # Create new config folder if needed - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ - \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done @@ -86,6 +86,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ENV PACKAGES="nginx engrampa" # Automatic apps & bashio +# hadolint ignore=SC2015 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ diff --git a/webtop_kde/config.json b/webtop_kde/config.json index cc235eab5..c45f51915 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-ls69-bugfix", + "version": "4.16-r0-ls70", "video": true } diff --git a/webtop_kde/updater.json b/webtop_kde/updater.json index 383fe3e97..eb1e68f60 100644 --- a/webtop_kde/updater.json +++ b/webtop_kde/updater.json @@ -1,9 +1,9 @@ { "github_fulltag": "true", - "last_update": "09-09-2022", + "last_update": "20-09-2022", "repository": "alexbelgium/hassio-addons", "slug": "webtop_kde", "source": "github", "upstream_repo": "linuxserver/docker-webtop", - "upstream_version": "4.16-r0-ls69" + "upstream_version": "4.16-r0-ls70" } diff --git a/webtrees/Dockerfile b/webtrees/Dockerfile index 25f1d5a6b..3cd2bd411 100644 --- a/webtrees/Dockerfile +++ b/webtrees/Dockerfile @@ -67,6 +67,7 @@ ENV PACKAGES="jq \ yamllint" # Automatic apps & bashio +# hadolint ignore=SC2015 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ diff --git a/whoogle/Dockerfile b/whoogle/Dockerfile index 03b7bbf96..8a063eaea 100644 --- a/whoogle/Dockerfile +++ b/whoogle/Dockerfile @@ -56,6 +56,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ENV PACKAGES="" # Automatic apps & bashio +# hadolint ignore=SC2015 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ diff --git a/xteve/Dockerfile b/xteve/Dockerfile index ce49a283d..59e8f0009 100644 --- a/xteve/Dockerfile +++ b/xteve/Dockerfile @@ -59,6 +59,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ENV PACKAGES="" # Automatic apps & bashio +# hadolint ignore=SC2015 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ diff --git a/zoneminder/CHANGELOG.md b/zoneminder/CHANGELOG.md index 9bf4ff01e..41a344afa 100644 --- a/zoneminder/CHANGELOG.md +++ b/zoneminder/CHANGELOG.md @@ -1,4 +1,7 @@ +## 1.36.26 (20-09-2022) +- Update to latest version from zoneminder-containers/zoneminder-base + ## 1.36.25 (01-09-2022) - Update to latest version from zoneminder-containers/zoneminder-base diff --git a/zoneminder/Dockerfile b/zoneminder/Dockerfile index e74a5314a..b742863fe 100644 --- a/zoneminder/Dockerfile +++ b/zoneminder/Dockerfile @@ -16,7 +16,7 @@ ARG BUILD_FROM ARG BUILD_VERSION -ARG BUILD_UPSTREAM="1.36.25" +ARG BUILD_UPSTREAM="1.36.26" FROM tritruongtr/zoneminder:latest ################## @@ -62,6 +62,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ENV PACKAGES="" # Automatic apps & bashio +# hadolint ignore=SC2015 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ diff --git a/zoneminder/config.json b/zoneminder/config.json index b400ef720..34bfc4c96 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.25", + "version": "1.36.26", "webui": "[PROTO:ssl]://[HOST]:[PORT:80]/zm" } diff --git a/zoneminder/updater.json b/zoneminder/updater.json index bf874db06..2ce0b1b14 100644 --- a/zoneminder/updater.json +++ b/zoneminder/updater.json @@ -1,8 +1,8 @@ { - "last_update": "01-09-2022", + "last_update": "20-09-2022", "repository": "alexbelgium/hassio-addons", "slug": "zoneminder", "source": "github", "upstream_repo": "zoneminder-containers/zoneminder-base", - "upstream_version": "1.36.25" + "upstream_version": "1.36.26" }