From f1f0bb5537706cce43cf71784007d307617166b0 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 19 Oct 2022 10:40:30 +0000 Subject: [PATCH 001/243] Github bot : issues linked to readme --- flexget/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/flexget/README.md b/flexget/README.md index 47f54badb..0fc3ed328 100644 --- a/flexget/README.md +++ b/flexget/README.md @@ -1,3 +1,4 @@ +## ⚠ Open Issue : [🐛 [FlexGet] Can't start the addon (opened 2022-10-19)](https://github.com/alexbelgium/hassio-addons/issues/515) by [@txitxo0](https://github.com/txitxo0) # Hass.io Add-ons: Flexget [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) From e51fea2e3db2fe39fe78f8258539b2a794152a27 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 19 Oct 2022 14:16:16 +0000 Subject: [PATCH 002/243] Github bot : issues linked to readme --- flexget/README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/flexget/README.md b/flexget/README.md index 0fc3ed328..47f54badb 100644 --- a/flexget/README.md +++ b/flexget/README.md @@ -1,4 +1,3 @@ -## ⚠ Open Issue : [🐛 [FlexGet] Can't start the addon (opened 2022-10-19)](https://github.com/alexbelgium/hassio-addons/issues/515) by [@txitxo0](https://github.com/txitxo0) # Hass.io Add-ons: Flexget [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) From 2d118e40ba1fae1d32281c8dc9fb90cf4b95be89 Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Thu, 20 Oct 2022 01:55:52 +0200 Subject: [PATCH 003/243] Updater bot : calibre updated to v6.7.1-ls188 --- calibre/CHANGELOG.md | 3 +++ calibre/config.json | 2 +- calibre/updater.json | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/calibre/CHANGELOG.md b/calibre/CHANGELOG.md index 33fdd7739..d481fc44f 100644 --- a/calibre/CHANGELOG.md +++ b/calibre/CHANGELOG.md @@ -1,4 +1,7 @@ +## v6.7.1-ls188 (20-10-2022) +- Update to latest version from linuxserver/docker-calibre + ## v6.7.1-ls186 (18-10-2022) - Update to latest version from linuxserver/docker-calibre diff --git a/calibre/config.json b/calibre/config.json index 49725b327..2e9f5a7a8 100644 --- a/calibre/config.json +++ b/calibre/config.json @@ -89,6 +89,6 @@ }, "slug": "calibre", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/calibre", - "version": "v6.7.1-ls186", + "version": "v6.7.1-ls188", "video": true } diff --git a/calibre/updater.json b/calibre/updater.json index aba1ca973..0e389f460 100644 --- a/calibre/updater.json +++ b/calibre/updater.json @@ -1,10 +1,10 @@ { "github_fulltag": "true", - "last_update": "18-10-2022", + "last_update": "20-10-2022", "paused": false, "repository": "alexbelgium/hassio-addons", "slug": "calibre", "source": "github", "upstream_repo": "linuxserver/docker-calibre", - "upstream_version": "v6.7.1-ls186" + "upstream_version": "v6.7.1-ls188" } From 00f6f86779a6de3e2eaa6f0213ceacb85f67cf6c Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Thu, 20 Oct 2022 01:56:00 +0200 Subject: [PATCH 004/243] Updater bot : calibre_web updated to 0.6.19-ls179 --- calibre_web/CHANGELOG.md | 3 +++ calibre_web/config.json | 2 +- calibre_web/updater.json | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/calibre_web/CHANGELOG.md b/calibre_web/CHANGELOG.md index b19c5459c..7702b576e 100644 --- a/calibre_web/CHANGELOG.md +++ b/calibre_web/CHANGELOG.md @@ -1,4 +1,7 @@ +## 0.6.19-ls179 (20-10-2022) +- Update to latest version from linuxserver/docker-calibre-web + ## 0.6.19-ls178 (13-10-2022) - Update to latest version from linuxserver/docker-calibre-web diff --git a/calibre_web/config.json b/calibre_web/config.json index 336a3888f..3bffab97d 100644 --- a/calibre_web/config.json +++ b/calibre_web/config.json @@ -90,6 +90,6 @@ }, "slug": "calibre-web", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/calibre-web", - "version": "0.6.19-ls178", + "version": "0.6.19-ls179", "video": true } diff --git a/calibre_web/updater.json b/calibre_web/updater.json index 0a81ffdc9..f848e3e02 100644 --- a/calibre_web/updater.json +++ b/calibre_web/updater.json @@ -1,10 +1,10 @@ { "github_fulltag": "true", - "last_update": "13-10-2022", + "last_update": "20-10-2022", "paused": false, "repository": "alexbelgium/hassio-addons", "slug": "calibre-web", "source": "github", "upstream_repo": "linuxserver/docker-calibre-web", - "upstream_version": "0.6.19-ls178" + "upstream_version": "0.6.19-ls179" } From 9757daa01a11f49395a9ebd3b936ece0ee8cad93 Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Thu, 20 Oct 2022 01:56:46 +0200 Subject: [PATCH 005/243] Updater bot : fireflyiii updated to 5.7.14 --- fireflyiii/CHANGELOG.md | 3 +++ fireflyiii/Dockerfile | 4 ++-- fireflyiii/config.json | 2 +- fireflyiii/updater.json | 4 ++-- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/fireflyiii/CHANGELOG.md b/fireflyiii/CHANGELOG.md index 4f993cefb..e0a7ea930 100644 --- a/fireflyiii/CHANGELOG.md +++ b/fireflyiii/CHANGELOG.md @@ -1,4 +1,7 @@ +## 5.7.14 (20-10-2022) +- Update to latest version from firefly-iii/firefly-iii + ## 5.7.13 (18-10-2022) - Update to latest version from firefly-iii/firefly-iii diff --git a/fireflyiii/Dockerfile b/fireflyiii/Dockerfile index c3b986f20..97bb06acd 100644 --- a/fireflyiii/Dockerfile +++ b/fireflyiii/Dockerfile @@ -33,12 +33,12 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # # Change data location # grep -rl "/var/www/html" /etc/ | xargs sed -i 's|/var/www/html|/data/firefly|g' -ARG BUILD_UPSTREAM="5.7.13" +ARG BUILD_UPSTREAM="5.7.14" RUN \ ################# # Fix for 5.7.5 # ################# - if [ "$BUILD_UPSTREAM" = "5.7.13" ] ; then \ + if [ "$BUILD_UPSTREAM" = "5.7.14" ] ; then \ sed -i "s|, \$transaction\[\x27amount\x27\] ?? \x270\x27);|, (string)(\$transaction\[\x27amount\x27\] ?? \x270\x27));|g" /var/www/html/app/Helpers/Collector/GroupCollector.php; else echo "not 5.7.5"; fi ################## diff --git a/fireflyiii/config.json b/fireflyiii/config.json index 03f01d9d9..9776f4da4 100644 --- a/fireflyiii/config.json +++ b/fireflyiii/config.json @@ -46,6 +46,6 @@ "slug": "fireflyiii", "startup": "services", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "5.7.13", + "version": "5.7.14", "webui": "[PROTO:ssl]://[HOST]:[PORT:8080]" } diff --git a/fireflyiii/updater.json b/fireflyiii/updater.json index 71e40b418..49782dda5 100644 --- a/fireflyiii/updater.json +++ b/fireflyiii/updater.json @@ -1,8 +1,8 @@ { - "last_update": "18-10-2022", + "last_update": "20-10-2022", "repository": "alexbelgium/hassio-addons", "slug": "fireflyiii", "source": "github", "upstream_repo": "firefly-iii/firefly-iii", - "upstream_version": "5.7.13" + "upstream_version": "5.7.14" } From 37e0cc78ede00f57a54eee09fd58021fe8a843a0 Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Thu, 20 Oct 2022 01:57:40 +0200 Subject: [PATCH 006/243] Updater bot : jackett updated to 0.20.2124 --- jackett/CHANGELOG.md | 3 +++ jackett/config.json | 2 +- jackett/updater.json | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/jackett/CHANGELOG.md b/jackett/CHANGELOG.md index 5d65f0544..8b53ddb65 100644 --- a/jackett/CHANGELOG.md +++ b/jackett/CHANGELOG.md @@ -1,4 +1,7 @@ +## 0.20.2124 (20-10-2022) +- Update to latest version from linuxserver/docker-jackett + ## 0.20.2122 (18-10-2022) - Update to latest version from linuxserver/docker-jackett diff --git a/jackett/config.json b/jackett/config.json index 8b4a37f89..c99b218c3 100644 --- a/jackett/config.json +++ b/jackett/config.json @@ -43,6 +43,6 @@ }, "slug": "jackett_nas", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/jackett", - "version": "0.20.2122", + "version": "0.20.2124", "webui": "[PROTO:ssl]://[HOST]:[PORT:9117]" } diff --git a/jackett/updater.json b/jackett/updater.json index dd161d745..d4f767f40 100644 --- a/jackett/updater.json +++ b/jackett/updater.json @@ -1,8 +1,8 @@ { - "last_update": "18-10-2022", + "last_update": "20-10-2022", "repository": "alexbelgium/hassio-addons", "slug": "jackett", "source": "github", "upstream_repo": "linuxserver/docker-jackett", - "upstream_version": "0.20.2122" + "upstream_version": "0.20.2124" } From ebd0708a4384a3009afc3004491711b3059de6ce Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Thu, 20 Oct 2022 01:58:30 +0200 Subject: [PATCH 007/243] Updater bot : nextcloud updated to 25.0.0 --- nextcloud/CHANGELOG.md | 3 +++ nextcloud/Dockerfile | 2 +- nextcloud/config.json | 2 +- nextcloud/updater.json | 4 ++-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/nextcloud/CHANGELOG.md b/nextcloud/CHANGELOG.md index fb9c6ded0..7d09a9ea1 100644 --- a/nextcloud/CHANGELOG.md +++ b/nextcloud/CHANGELOG.md @@ -1,4 +1,7 @@ +## 25.0.0 (20-10-2022) +- Update to latest version from linuxserver/docker-nextcloud + ## 24.0.6 (08-10-2022) - Update to latest version from linuxserver/docker-nextcloud diff --git a/nextcloud/Dockerfile b/nextcloud/Dockerfile index 3b1eb5c7f..8b6e44d70 100644 --- a/nextcloud/Dockerfile +++ b/nextcloud/Dockerfile @@ -17,7 +17,7 @@ ARG BUILD_FROM ARG BUILD_VERSION ARG BUILD_ARCH -ARG BUILD_UPSTREAM="24.0.6" +ARG BUILD_UPSTREAM="25.0.0" FROM ${BUILD_FROM} ################## diff --git a/nextcloud/config.json b/nextcloud/config.json index dbbdc6ad7..6fb74403d 100644 --- a/nextcloud/config.json +++ b/nextcloud/config.json @@ -103,6 +103,6 @@ "slug": "nextcloud_ocr", "uart": true, "url": "https://github.com/alexbelgium/hassio-addons/tree/master/nextcloud", - "version": "24.0.7", + "version": "25.0.0", "webui": "https://[HOST]:[PORT:443]" } diff --git a/nextcloud/updater.json b/nextcloud/updater.json index 3991de020..db3b9c906 100644 --- a/nextcloud/updater.json +++ b/nextcloud/updater.json @@ -1,8 +1,8 @@ { - "last_update": "08-10-2022", + "last_update": "20-10-2022", "repository": "alexbelgium/hassio-addons", "slug": "nextcloud", "source": "github", "upstream_repo": "linuxserver/docker-nextcloud", - "upstream_version": "24.0.6" + "upstream_version": "25.0.0" } From 05f8f78171bd1920fbc0468375aba57c0065ea22 Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Thu, 20 Oct 2022 01:58:43 +0200 Subject: [PATCH 008/243] Updater bot : omada updated to 5.5-chromium-amd64-2022-10-19 --- omada/CHANGELOG.md | 3 +++ omada/Dockerfile | 2 +- omada/config.json | 2 +- omada/updater.json | 4 ++-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/omada/CHANGELOG.md b/omada/CHANGELOG.md index 4763af0a8..2f4f904c0 100644 --- a/omada/CHANGELOG.md +++ b/omada/CHANGELOG.md @@ -1,4 +1,7 @@ +## 5.5-chromium-amd64-2022-10-19 (2022-10-19) +- Update to latest version from mbentley/omada-controller + ## 5.5-chromium-amd64-2022-10-17 (2022-10-17) - Update to latest version from mbentley/omada-controller diff --git a/omada/Dockerfile b/omada/Dockerfile index 9ef87fdd7..81a511a11 100644 --- a/omada/Dockerfile +++ b/omada/Dockerfile @@ -16,7 +16,7 @@ ARG BUILD_FROM ARG BUILD_VERSION -ARG BUILD_UPSTREAM="5.5-chromium-amd64-2022-10-17" +ARG BUILD_UPSTREAM="5.5-chromium-amd64-2022-10-19" FROM ${BUILD_FROM} ################## diff --git a/omada/config.json b/omada/config.json index c0cfbfbf3..c74f227a5 100644 --- a/omada/config.json +++ b/omada/config.json @@ -45,6 +45,6 @@ }, "slug": "omada", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "5.5-chromium-amd64-2022-10-17", + "version": "5.5-chromium-amd64-2022-10-19", "webui": "[PROTO:ssl]://[HOST]:[PORT:8088]" } diff --git a/omada/updater.json b/omada/updater.json index 7fd033e65..59453ecb3 100644 --- a/omada/updater.json +++ b/omada/updater.json @@ -1,9 +1,9 @@ { "dockerhub_by_date": true, - "last_update": "2022-10-17", + "last_update": "2022-10-19", "repository": "alexbelgium/hassio-addons", "slug": "omada", "source": "dockerhub", "upstream_repo": "mbentley/omada-controller", - "upstream_version": "5.5-chromium-amd64-2022-10-17" + "upstream_version": "5.5-chromium-amd64-2022-10-19" } From f48a16f4278094b7d1c541db630ee371bd3ecb06 Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Thu, 20 Oct 2022 01:58:49 +0200 Subject: [PATCH 009/243] Updater bot : omada_v3 updated to 5.5-chromium-amd64-2022-10-19 --- omada_v3/CHANGELOG.md | 3 +++ omada_v3/Dockerfile | 2 +- omada_v3/config.json | 2 +- omada_v3/updater.json | 4 ++-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/omada_v3/CHANGELOG.md b/omada_v3/CHANGELOG.md index 4763af0a8..2f4f904c0 100644 --- a/omada_v3/CHANGELOG.md +++ b/omada_v3/CHANGELOG.md @@ -1,4 +1,7 @@ +## 5.5-chromium-amd64-2022-10-19 (2022-10-19) +- Update to latest version from mbentley/omada-controller + ## 5.5-chromium-amd64-2022-10-17 (2022-10-17) - Update to latest version from mbentley/omada-controller diff --git a/omada_v3/Dockerfile b/omada_v3/Dockerfile index 29426b61d..04d7fd4fe 100644 --- a/omada_v3/Dockerfile +++ b/omada_v3/Dockerfile @@ -16,7 +16,7 @@ ARG BUILD_FROM ARG BUILD_VERSION -ARG BUILD_UPSTREAM="5.5-chromium-amd64-2022-10-17" +ARG BUILD_UPSTREAM="5.5-chromium-amd64-2022-10-19" FROM ${BUILD_FROM} ################## diff --git a/omada_v3/config.json b/omada_v3/config.json index dcda1f9ee..db38bfd50 100644 --- a/omada_v3/config.json +++ b/omada_v3/config.json @@ -45,6 +45,6 @@ }, "slug": "omada_v3", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "5.5-chromium-amd64-2022-10-17", + "version": "5.5-chromium-amd64-2022-10-19", "webui": "[PROTO:ssl]://[HOST]:[PORT:8088]" } diff --git a/omada_v3/updater.json b/omada_v3/updater.json index 9e6968354..42b3ddcd7 100644 --- a/omada_v3/updater.json +++ b/omada_v3/updater.json @@ -1,9 +1,9 @@ { "dockerhub_by_date": true, - "last_update": "2022-10-17", + "last_update": "2022-10-19", "repository": "alexbelgium/hassio-addons", "slug": "omada_v3", "source": "dockerhub", "upstream_repo": "mbentley/omada-controller", - "upstream_version": "5.5-chromium-amd64-2022-10-17" + "upstream_version": "5.5-chromium-amd64-2022-10-19" } From 2265376ee7beb221a66826777d2421238402a1af Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Thu, 20 Oct 2022 01:59:41 +0200 Subject: [PATCH 010/243] Updater bot : plex updated to 1.29.1.6313-f4cdfea9c-ls135 --- plex/CHANGELOG.md | 3 +++ plex/config.json | 2 +- plex/updater.json | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/plex/CHANGELOG.md b/plex/CHANGELOG.md index 8ee7346ef..f1806dda0 100644 --- a/plex/CHANGELOG.md +++ b/plex/CHANGELOG.md @@ -1,4 +1,7 @@ +## 1.29.1.6313-f4cdfea9c-ls135 (20-10-2022) +- Update to latest version from linuxserver/docker-plex + ## 1.29.0.6244-819d3678c-ls134 (29-09-2022) - Update to latest version from linuxserver/docker-plex diff --git a/plex/config.json b/plex/config.json index bbbbf02d2..99334d18d 100644 --- a/plex/config.json +++ b/plex/config.json @@ -115,7 +115,7 @@ }, "slug": "plex_nas", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/plex", - "version": "1.29.0.6244-819d3678c-ls134", + "version": "1.29.1.6313-f4cdfea9c-ls135", "video": true, "webui": "[PROTO:ssl]://[HOST]:[PORT:32400]/web" } diff --git a/plex/updater.json b/plex/updater.json index 18c1c59e4..3afbd7530 100644 --- a/plex/updater.json +++ b/plex/updater.json @@ -1,9 +1,9 @@ { "github_fulltag": "true", - "last_update": "29-09-2022", + "last_update": "20-10-2022", "repository": "alexbelgium/hassio-addons", "slug": "plex", "source": "github", "upstream_repo": "linuxserver/docker-plex", - "upstream_version": "1.29.0.6244-819d3678c-ls134" + "upstream_version": "1.29.1.6313-f4cdfea9c-ls135" } From 99dbf682247e17ef9cad944ab9df90b2471c45a9 Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Thu, 20 Oct 2022 02:00:11 +0200 Subject: [PATCH 011/243] Updater bot : qbittorrent updated to 4.4.5-r1-ls223 --- qbittorrent/CHANGELOG.md | 3 +++ qbittorrent/Dockerfile | 2 +- qbittorrent/config.json | 2 +- qbittorrent/updater.json | 4 ++-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/qbittorrent/CHANGELOG.md b/qbittorrent/CHANGELOG.md index b0691d5e9..a96dafb4b 100644 --- a/qbittorrent/CHANGELOG.md +++ b/qbittorrent/CHANGELOG.md @@ -1,4 +1,7 @@ +## 4.4.5-r1-ls223 (20-10-2022) +- Update to latest version from linuxserver/docker-qbittorrent + ## 4.4.5-r0-ls222 (18-10-2022) - Update to latest version from linuxserver/docker-qbittorrent diff --git a/qbittorrent/Dockerfile b/qbittorrent/Dockerfile index ee967a152..9122e20fa 100644 --- a/qbittorrent/Dockerfile +++ b/qbittorrent/Dockerfile @@ -16,7 +16,7 @@ ARG BUILD_FROM ARG BUILD_VERSION -ARG BUILD_UPSTREAM="4.4.5-r0-ls222" +ARG BUILD_UPSTREAM="4.4.5-r1-ls223" FROM ${BUILD_FROM}-$BUILD_UPSTREAM ################## diff --git a/qbittorrent/config.json b/qbittorrent/config.json index ee6803b17..111d756f6 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-ls222" + "version": "4.4.5-r1-ls223" } diff --git a/qbittorrent/updater.json b/qbittorrent/updater.json index ca4307601..f650ec196 100644 --- a/qbittorrent/updater.json +++ b/qbittorrent/updater.json @@ -1,9 +1,9 @@ { "github_fulltag": "true", - "last_update": "18-10-2022", + "last_update": "20-10-2022", "repository": "alexbelgium/hassio-addons", "slug": "qbittorrent", "source": "github", "upstream_repo": "linuxserver/docker-qbittorrent", - "upstream_version": "4.4.5-r0-ls222" + "upstream_version": "4.4.5-r1-ls223" } From bb02c7145f434a0820568025c595971e87aef97f Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Thu, 20 Oct 2022 02:01:57 +0200 Subject: [PATCH 012/243] Updater bot : webtop_kde updated to 4.16-r0-ls74 --- webtop_kde/CHANGELOG.md | 3 +++ webtop_kde/config.json | 2 +- webtop_kde/updater.json | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/webtop_kde/CHANGELOG.md b/webtop_kde/CHANGELOG.md index a1bec3fd9..250174dad 100644 --- a/webtop_kde/CHANGELOG.md +++ b/webtop_kde/CHANGELOG.md @@ -1,4 +1,7 @@ +## 4.16-r0-ls74 (20-10-2022) +- Update to latest version from linuxserver/docker-webtop + ## 4.16-r0-ls73 (18-10-2022) - Update to latest version from linuxserver/docker-webtop diff --git a/webtop_kde/config.json b/webtop_kde/config.json index 6a4ea004d..7e75eaca7 100644 --- a/webtop_kde/config.json +++ b/webtop_kde/config.json @@ -112,6 +112,6 @@ "slug": "webtop-kde", "udev": true, "url": "https://github.com/alexbelgium/hassio-addons", - "version": "4.16-r0-ls73", + "version": "4.16-r0-ls74", "video": true } diff --git a/webtop_kde/updater.json b/webtop_kde/updater.json index fe515f06d..427f449ed 100644 --- a/webtop_kde/updater.json +++ b/webtop_kde/updater.json @@ -1,9 +1,9 @@ { "github_fulltag": "true", - "last_update": "18-10-2022", + "last_update": "20-10-2022", "repository": "alexbelgium/hassio-addons", "slug": "webtop_kde", "source": "github", "upstream_repo": "linuxserver/docker-webtop", - "upstream_version": "4.16-r0-ls73" + "upstream_version": "4.16-r0-ls74" } From 74ef02a7eb715f648faaa02c44251c0b2a51b443 Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Thu, 20 Oct 2022 02:02:26 +0200 Subject: [PATCH 013/243] Updater bot : zoneminder updated to 1.36.31 --- zoneminder/CHANGELOG.md | 3 +++ zoneminder/Dockerfile | 2 +- zoneminder/config.json | 2 +- zoneminder/updater.json | 4 ++-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/zoneminder/CHANGELOG.md b/zoneminder/CHANGELOG.md index d88ed9a19..794f00f24 100644 --- a/zoneminder/CHANGELOG.md +++ b/zoneminder/CHANGELOG.md @@ -1,4 +1,7 @@ +## 1.36.31 (20-10-2022) +- Update to latest version from zoneminder-containers/zoneminder-base + ## 1.36.29 (13-10-2022) - Update to latest version from zoneminder-containers/zoneminder-base diff --git a/zoneminder/Dockerfile b/zoneminder/Dockerfile index 09ac73f45..026e5e207 100644 --- a/zoneminder/Dockerfile +++ b/zoneminder/Dockerfile @@ -16,7 +16,7 @@ ARG BUILD_FROM ARG BUILD_VERSION -ARG BUILD_UPSTREAM="1.36.29" +ARG BUILD_UPSTREAM="1.36.31" FROM tritruongtr/zoneminder:latest ################## diff --git a/zoneminder/config.json b/zoneminder/config.json index f31253c39..ef8239401 100644 --- a/zoneminder/config.json +++ b/zoneminder/config.json @@ -37,6 +37,6 @@ ], "slug": "zoneminder", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "1.36.29", + "version": "1.36.31", "webui": "[PROTO:ssl]://[HOST]:[PORT:80]/zm" } diff --git a/zoneminder/updater.json b/zoneminder/updater.json index 6c152a700..37dad137a 100644 --- a/zoneminder/updater.json +++ b/zoneminder/updater.json @@ -1,8 +1,8 @@ { - "last_update": "13-10-2022", + "last_update": "20-10-2022", "repository": "alexbelgium/hassio-addons", "slug": "zoneminder", "source": "github", "upstream_repo": "zoneminder-containers/zoneminder-base", - "upstream_version": "1.36.29" + "upstream_version": "1.36.31" } From 8b3315329e0bba2b9f43d3566ad46d1ef9e23228 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Thu, 20 Oct 2022 05:45:16 +0200 Subject: [PATCH 014/243] Update build.json --- nextcloud/build.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nextcloud/build.json b/nextcloud/build.json index 6ed4668c7..f4a9e5afe 100644 --- a/nextcloud/build.json +++ b/nextcloud/build.json @@ -1,8 +1,8 @@ { "build_from": { - "aarch64": "lscr.io/linuxserver/nextcloud:arm64v8-latest", - "amd64": "lscr.io/linuxserver/nextcloud:amd64-latest", - "armv7": "lscr.io/linuxserver/nextcloud:arm32v7-latest" + "aarch64": "lscr.io/linuxserver/nextcloud:arm64v8-", + "amd64": "lscr.io/linuxserver/nextcloud:amd64-", + "armv7": "lscr.io/linuxserver/nextcloud:arm32v7-" }, "codenotary": { "signer": "alexandrep.github@gmail.com" From 205e29a950a892337f179afd6e95ca1ca6f498e0 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Thu, 20 Oct 2022 05:45:58 +0200 Subject: [PATCH 015/243] Update Dockerfile --- nextcloud/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nextcloud/Dockerfile b/nextcloud/Dockerfile index 8b6e44d70..2fb35668b 100644 --- a/nextcloud/Dockerfile +++ b/nextcloud/Dockerfile @@ -17,8 +17,8 @@ ARG BUILD_FROM ARG BUILD_VERSION ARG BUILD_ARCH -ARG BUILD_UPSTREAM="25.0.0" -FROM ${BUILD_FROM} +ARG BUILD_UPSTREAM="24.0.6" +FROM ${BUILD_FROM}${BUILD_UPSTREAM} ################## # 2 Modify Image # From 5a9305f5a0c2d1abf4bfc5f5ab5f083943606ff6 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Thu, 20 Oct 2022 05:46:19 +0200 Subject: [PATCH 016/243] Update config.json --- nextcloud/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nextcloud/config.json b/nextcloud/config.json index 6fb74403d..7b4a6e022 100644 --- a/nextcloud/config.json +++ b/nextcloud/config.json @@ -103,6 +103,6 @@ "slug": "nextcloud_ocr", "uart": true, "url": "https://github.com/alexbelgium/hassio-addons/tree/master/nextcloud", - "version": "25.0.0", + "version": "24.0.6", "webui": "https://[HOST]:[PORT:443]" } From 2c5fb9cd55a42a71994ee38b57312223c79da094 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Thu, 20 Oct 2022 05:46:41 +0200 Subject: [PATCH 017/243] Update updater.json --- nextcloud/updater.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nextcloud/updater.json b/nextcloud/updater.json index db3b9c906..8f6278ab6 100644 --- a/nextcloud/updater.json +++ b/nextcloud/updater.json @@ -4,5 +4,5 @@ "slug": "nextcloud", "source": "github", "upstream_repo": "linuxserver/docker-nextcloud", - "upstream_version": "25.0.0" + "upstream_version": "24.0.6" } From 979e61cacef970f2bc834170fdf4bfae6b92754e Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Thu, 20 Oct 2022 05:51:21 +0200 Subject: [PATCH 018/243] Update updater.json --- nextcloud/updater.json | 1 + 1 file changed, 1 insertion(+) diff --git a/nextcloud/updater.json b/nextcloud/updater.json index 8f6278ab6..0d4459c23 100644 --- a/nextcloud/updater.json +++ b/nextcloud/updater.json @@ -1,5 +1,6 @@ { "last_update": "20-10-2022", + "paused": true, "repository": "alexbelgium/hassio-addons", "slug": "nextcloud", "source": "github", From 4f338e4df8d2bed561ed8c04e0fde2a756ebb867 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Thu, 20 Oct 2022 06:13:52 +0200 Subject: [PATCH 019/243] Update Dockerfile --- nextcloud/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nextcloud/Dockerfile b/nextcloud/Dockerfile index 2fb35668b..d5ac5211e 100644 --- a/nextcloud/Dockerfile +++ b/nextcloud/Dockerfile @@ -17,7 +17,7 @@ ARG BUILD_FROM ARG BUILD_VERSION ARG BUILD_ARCH -ARG BUILD_UPSTREAM="24.0.6" +ARG BUILD_UPSTREAM="25.0.0" FROM ${BUILD_FROM}${BUILD_UPSTREAM} ################## From 3ce5c7c8ba960fd274bcc2734358a5e3656a7cd1 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Thu, 20 Oct 2022 06:14:10 +0200 Subject: [PATCH 020/243] Update updater.json --- nextcloud/updater.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nextcloud/updater.json b/nextcloud/updater.json index 0d4459c23..1974e548e 100644 --- a/nextcloud/updater.json +++ b/nextcloud/updater.json @@ -5,5 +5,5 @@ "slug": "nextcloud", "source": "github", "upstream_repo": "linuxserver/docker-nextcloud", - "upstream_version": "24.0.6" + "upstream_version": "25.0.0" } From 172f04cc2a454cbfcb2a95125eaf03df4ba2260e Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Thu, 20 Oct 2022 06:16:24 +0200 Subject: [PATCH 021/243] Update Dockerfile --- nextcloud/Dockerfile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/nextcloud/Dockerfile b/nextcloud/Dockerfile index d5ac5211e..e114f6f99 100644 --- a/nextcloud/Dockerfile +++ b/nextcloud/Dockerfile @@ -47,13 +47,16 @@ RUN \ && sed -i \ -e 's/upload_max_filesize=1024M/upload_max_filesize=10240M/g' \ -e 's/post_max_size=1024M/post_max_size=10240M/g' \ - /etc/php7/php.ini \ + /etc/php*/php.ini \ && sed -i "s|client_max_body_size 512M;|client_max_body_size 10240M;|g" /defaults/default \ - # Correct ssl path - && sed -i "s|/data/config/keys|/ssl/nextcloud/keys|g" /defaults/default \ # Correct initial directory && sed -i "s|/data|%%datadirectory%%|g" /defaults/config.php +RUN \ + # Correct ssl path + sed -i "s|/data/config/keys|/ssl/nextcloud/keys|g" /defaults/default \ + && sed -i "s|/data/config/keys|/ssl/nextcloud/keys|g" /root/defaults/nginx/site-confs/default.conf.sample + ################## # 3 Install apps # ################## From ff737ba712ac158611ea1cb2602001edd457c400 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Thu, 20 Oct 2022 06:46:09 +0200 Subject: [PATCH 022/243] Update Dockerfile --- nextcloud/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nextcloud/Dockerfile b/nextcloud/Dockerfile index e114f6f99..26428f8a2 100644 --- a/nextcloud/Dockerfile +++ b/nextcloud/Dockerfile @@ -55,7 +55,7 @@ RUN \ RUN \ # Correct ssl path sed -i "s|/data/config/keys|/ssl/nextcloud/keys|g" /defaults/default \ - && sed -i "s|/data/config/keys|/ssl/nextcloud/keys|g" /root/defaults/nginx/site-confs/default.conf.sample + || sed -i "s|/data/config/keys|/ssl/nextcloud/keys|g" /root/defaults/nginx/site-confs/default.conf.sample ################## # 3 Install apps # From 94f098c37186a5e8c373b867ea9ac1f3631e2c27 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Thu, 20 Oct 2022 06:51:54 +0200 Subject: [PATCH 023/243] Update Dockerfile --- nextcloud/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nextcloud/Dockerfile b/nextcloud/Dockerfile index 26428f8a2..7e484982b 100644 --- a/nextcloud/Dockerfile +++ b/nextcloud/Dockerfile @@ -41,7 +41,7 @@ RUN \ && sed -i "s|config|data/config|g" /etc/cont-init.d/* \ && sed -i "s|data|share/nextcloud|g" /etc/services.d/nginx/* \ && sed -i "s|config|data/config|g" /etc/services.d/nginx/* \ - && sed -i "s|config|data/config|g" /defaults/* \ + && for i in $(find /defaults -type f); do sed -i "s|config|data/config|g" $i; done \ # modify data limits files # -e 's/memory_limit=512M/memory_limit=1024M/g' \ && sed -i \ From 214d0c9b44323d1fb946430fa6dad2156c0d7887 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Thu, 20 Oct 2022 06:54:28 +0200 Subject: [PATCH 024/243] Update Dockerfile --- nextcloud/Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/nextcloud/Dockerfile b/nextcloud/Dockerfile index 7e484982b..85871de69 100644 --- a/nextcloud/Dockerfile +++ b/nextcloud/Dockerfile @@ -48,14 +48,13 @@ RUN \ -e 's/upload_max_filesize=1024M/upload_max_filesize=10240M/g' \ -e 's/post_max_size=1024M/post_max_size=10240M/g' \ /etc/php*/php.ini \ - && sed -i "s|client_max_body_size 512M;|client_max_body_size 10240M;|g" /defaults/default \ # Correct initial directory && sed -i "s|/data|%%datadirectory%%|g" /defaults/config.php RUN \ # Correct ssl path - sed -i "s|/data/config/keys|/ssl/nextcloud/keys|g" /defaults/default \ - || sed -i "s|/data/config/keys|/ssl/nextcloud/keys|g" /root/defaults/nginx/site-confs/default.conf.sample + sed -i "s|/data/config/keys|/ssl/nextcloud/keys|g" /root/defaults/nginx/site-confs/default.conf.sample \ + && sed -i "s|client_max_body_size 512M;|client_max_body_size 10240M;|g" /defaults/default \ ################## # 3 Install apps # From b97be3724b95e85d73712c04d04ea5a53a324d16 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Thu, 20 Oct 2022 07:01:46 +0200 Subject: [PATCH 025/243] Update Dockerfile --- nextcloud/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nextcloud/Dockerfile b/nextcloud/Dockerfile index 85871de69..ca7386e37 100644 --- a/nextcloud/Dockerfile +++ b/nextcloud/Dockerfile @@ -53,8 +53,8 @@ RUN \ RUN \ # Correct ssl path - sed -i "s|/data/config/keys|/ssl/nextcloud/keys|g" /root/defaults/nginx/site-confs/default.conf.sample \ - && sed -i "s|client_max_body_size 512M;|client_max_body_size 10240M;|g" /defaults/default \ + sed -i "s|/data/config/keys|/ssl/nextcloud/keys|g" /defaults/nginx/site-confs/default.conf.sample \ + && sed -i "s|client_max_body_size 512M;|client_max_body_size 10240M;|g" /defaults/nginx/site-confs/default.conf.sample ################## # 3 Install apps # From bd547a7d5ce4549f74e33b6bb7b9151e133d6b3a Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Thu, 20 Oct 2022 07:57:59 +0200 Subject: [PATCH 026/243] Update Dockerfile --- nextcloud/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nextcloud/Dockerfile b/nextcloud/Dockerfile index ca7386e37..4c4b77335 100644 --- a/nextcloud/Dockerfile +++ b/nextcloud/Dockerfile @@ -41,7 +41,7 @@ RUN \ && sed -i "s|config|data/config|g" /etc/cont-init.d/* \ && sed -i "s|data|share/nextcloud|g" /etc/services.d/nginx/* \ && sed -i "s|config|data/config|g" /etc/services.d/nginx/* \ - && for i in $(find /defaults -type f); do sed -i "s|config|data/config|g" $i; done \ + && sed -i "s|config|data/config|g" $(find /defaults -type f) \ # modify data limits files # -e 's/memory_limit=512M/memory_limit=1024M/g' \ && sed -i \ From f50487fd90d72a1bb1f5ae3e36fcdf0d05bc1318 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Thu, 20 Oct 2022 08:12:08 +0200 Subject: [PATCH 027/243] Update Dockerfile --- nextcloud/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/nextcloud/Dockerfile b/nextcloud/Dockerfile index 4c4b77335..85f2d27d4 100644 --- a/nextcloud/Dockerfile +++ b/nextcloud/Dockerfile @@ -31,6 +31,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ ENV NEXTCLOUD_PATH="/data/config/www/nextcloud" +# shellcheck disable=SC2046 RUN \ # Remove upstream files rm -rf /etc/cont-init.d/10-adduser /etc/cont-init.d/30-keygen /etc/cont-init.d/40-config /etc/cont-init.d/50-install /etc/cont-init.d/60-memcache /etc/cont-init.d/70-aliases \ From 2e825b3a5c6abb4925ca4c9bdcfdfb282f4de3dc Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 20 Oct 2022 10:20:57 +0000 Subject: [PATCH 028/243] Github bot : issues linked to readme --- nextcloud/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/nextcloud/README.md b/nextcloud/README.md index ba2cf0639..f6f0d2199 100644 --- a/nextcloud/README.md +++ b/nextcloud/README.md @@ -1,3 +1,4 @@ +## ⚠ Open Issue : [🐛 [Nextcloud] Stange version of update pop up (opened 2022-10-20)](https://github.com/alexbelgium/hassio-addons/issues/518) by [@michelebossa](https://github.com/michelebossa) # Home assistant add-on: Nextcloud [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) From b59bc83b2952557c7ea4a1a317d235d96ecd665c Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Thu, 20 Oct 2022 17:16:01 +0200 Subject: [PATCH 029/243] Align to upstream https://github.com/alexbelgium/hassio-addons/issues/519 --- nextcloud/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/nextcloud/Dockerfile b/nextcloud/Dockerfile index 85f2d27d4..4edd41ff9 100644 --- a/nextcloud/Dockerfile +++ b/nextcloud/Dockerfile @@ -43,6 +43,7 @@ RUN \ && sed -i "s|data|share/nextcloud|g" /etc/services.d/nginx/* \ && sed -i "s|config|data/config|g" /etc/services.d/nginx/* \ && sed -i "s|config|data/config|g" $(find /defaults -type f) \ + && sed -i "s|config|data/config|g" $(find /etc/nginx -type f) \ # modify data limits files # -e 's/memory_limit=512M/memory_limit=1024M/g' \ && sed -i \ From 0ef26585c19ef3ab1f0c5b7235772f528cd03b49 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Thu, 20 Oct 2022 17:16:38 +0200 Subject: [PATCH 030/243] Correct version https://github.com/alexbelgium/hassio-addons/issues/518 --- nextcloud/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nextcloud/config.json b/nextcloud/config.json index 7b4a6e022..75cdab141 100644 --- a/nextcloud/config.json +++ b/nextcloud/config.json @@ -103,6 +103,6 @@ "slug": "nextcloud_ocr", "uart": true, "url": "https://github.com/alexbelgium/hassio-addons/tree/master/nextcloud", - "version": "24.0.6", + "version": "25.0.0-2", "webui": "https://[HOST]:[PORT:443]" } From 7dc14798d7d9864b729a9bbee23c7e448a3fccf7 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Thu, 20 Oct 2022 17:48:16 +0200 Subject: [PATCH 031/243] test --- nextcloud/Dockerfile | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/nextcloud/Dockerfile b/nextcloud/Dockerfile index 4edd41ff9..6ded6363a 100644 --- a/nextcloud/Dockerfile +++ b/nextcloud/Dockerfile @@ -31,6 +31,8 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ ENV NEXTCLOUD_PATH="/data/config/www/nextcloud" +# Global LSIO modifications +ARG CONFIGLOCATION="/data/config" # shellcheck disable=SC2046 RUN \ # Remove upstream files @@ -38,14 +40,9 @@ RUN \ # Make permissions && chmod +x /defaults/nextcloud-perms.sh \ # default folders - && sed -i "s|data|share/nextcloud|g" /etc/cont-init.d/* \ - && sed -i "s|config|data/config|g" /etc/cont-init.d/* \ - && sed -i "s|data|share/nextcloud|g" /etc/services.d/nginx/* \ - && sed -i "s|config|data/config|g" /etc/services.d/nginx/* \ - && sed -i "s|config|data/config|g" $(find /defaults -type f) \ - && sed -i "s|config|data/config|g" $(find /etc/nginx -type f) \ + && for file in $(grep -Esril "/data[ '\"/]|/data\$" /etc /defaults); do sed -Ei "s=(/data)+(/| |$|\"|\')=/share/nextcloud\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ # modify data limits files - # -e 's/memory_limit=512M/memory_limit=1024M/g' \ && sed -i \ -e 's/upload_max_filesize=1024M/upload_max_filesize=10240M/g' \ -e 's/post_max_size=1024M/post_max_size=10240M/g' \ From 2b22ef25e9df64b2be8d432f1488d7d9eaa04c36 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Thu, 20 Oct 2022 17:52:58 +0200 Subject: [PATCH 032/243] All good now https://github.com/alexbelgium/hassio-addons/issues/519 https://github.com/alexbelgium/hassio-addons/issues/518 --- nextcloud/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nextcloud/config.json b/nextcloud/config.json index 75cdab141..4b1dbd57c 100644 --- a/nextcloud/config.json +++ b/nextcloud/config.json @@ -103,6 +103,6 @@ "slug": "nextcloud_ocr", "uart": true, "url": "https://github.com/alexbelgium/hassio-addons/tree/master/nextcloud", - "version": "25.0.0-2", + "version": "25.0.0-3", "webui": "https://[HOST]:[PORT:443]" } From 6e54320285944281ed802ae2e699d08fa53efa68 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Thu, 20 Oct 2022 18:11:36 +0200 Subject: [PATCH 033/243] Update Dockerfile --- emby/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/emby/Dockerfile b/emby/Dockerfile index c5900ce60..4e128b8d2 100644 --- a/emby/Dockerfile +++ b/emby/Dockerfile @@ -40,8 +40,8 @@ RUN \ # Allow UID and GID setting && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ \ - # Correct config location - && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + # Search occurences of /config and change it to the expected new config + && for file in $(grep -Esril "/config" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done From 17a54715ae801929df28b3c0bedfc2f533f3ef06 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 20 Oct 2022 17:34:45 +0000 Subject: [PATCH 034/243] Github bot : issues linked to readme --- nextcloud/README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/nextcloud/README.md b/nextcloud/README.md index f6f0d2199..ba2cf0639 100644 --- a/nextcloud/README.md +++ b/nextcloud/README.md @@ -1,4 +1,3 @@ -## ⚠ Open Issue : [🐛 [Nextcloud] Stange version of update pop up (opened 2022-10-20)](https://github.com/alexbelgium/hassio-addons/issues/518) by [@michelebossa](https://github.com/michelebossa) # Home assistant add-on: Nextcloud [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) From 632906adc3b7b3be24c717615cb60e4b4ce9ef6d Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 20 Oct 2022 17:50:06 +0000 Subject: [PATCH 035/243] Github bot : issues linked to readme --- nextcloud/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/nextcloud/README.md b/nextcloud/README.md index ba2cf0639..f6f0d2199 100644 --- a/nextcloud/README.md +++ b/nextcloud/README.md @@ -1,3 +1,4 @@ +## ⚠ Open Issue : [🐛 [Nextcloud] Stange version of update pop up (opened 2022-10-20)](https://github.com/alexbelgium/hassio-addons/issues/518) by [@michelebossa](https://github.com/michelebossa) # Home assistant add-on: Nextcloud [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) From e41ec32992827c679167d6c4bb4f71c398f7f17c Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Thu, 20 Oct 2022 20:40:10 +0200 Subject: [PATCH 036/243] Reset nginx conf https://github.com/alexbelgium/hassio-addons/issues/519 https://github.com/alexbelgium/hassio-addons/issues/518 --- nextcloud/rootfs/etc/cont-init.d/10-adduser.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/nextcloud/rootfs/etc/cont-init.d/10-adduser.sh b/nextcloud/rootfs/etc/cont-init.d/10-adduser.sh index 7a94d879d..234acd69f 100644 --- a/nextcloud/rootfs/etc/cont-init.d/10-adduser.sh +++ b/nextcloud/rootfs/etc/cont-init.d/10-adduser.sh @@ -41,3 +41,4 @@ chown abc:abc /data/config chown abc:abc /defaults rm /config/nginx/site-confs/default 2>/dev/null || true +rm /data/config/nginx/nginx.conf || true From b0e629f42ed8e9e80afafe93709bf7e3213912bc Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Thu, 20 Oct 2022 20:40:48 +0200 Subject: [PATCH 037/243] Reset nginx for people affected --- nextcloud/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nextcloud/config.json b/nextcloud/config.json index 4b1dbd57c..dd6ff6b91 100644 --- a/nextcloud/config.json +++ b/nextcloud/config.json @@ -103,6 +103,6 @@ "slug": "nextcloud_ocr", "uart": true, "url": "https://github.com/alexbelgium/hassio-addons/tree/master/nextcloud", - "version": "25.0.0-3", + "version": "25.0.0-4", "webui": "https://[HOST]:[PORT:443]" } From 39e6b57a3213bbf78b42ce8ab05a5878584b84f8 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Thu, 20 Oct 2022 20:50:43 +0200 Subject: [PATCH 038/243] Add allow_local_remote_servers https://github.com/alexbelgium/hassio-addons/issues/520 --- nextcloud/rootfs/etc/cont-init.d/93-config.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nextcloud/rootfs/etc/cont-init.d/93-config.sh b/nextcloud/rootfs/etc/cont-init.d/93-config.sh index 676c3f523..555416199 100644 --- a/nextcloud/rootfs/etc/cont-init.d/93-config.sh +++ b/nextcloud/rootfs/etc/cont-init.d/93-config.sh @@ -34,5 +34,7 @@ for files in /defaults/config.php /data/config/www/nextcloud/config/config.php; if [ -f "$files" ]; then sed -i "/check_data_directory_permissions/d" "$files" sed -i "/datadirectory/a 'check_data_directory_permissions' => false," "$files" + sed -i "/allow_local_remote_servers/d" "$files" + sed -i "/datadirectory/a 'allow_local_remote_servers' => true," "$files" fi done From c83e956379c7adc18aa0e11485c07c9d1cd2d793 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Thu, 20 Oct 2022 20:51:06 +0200 Subject: [PATCH 039/243] Update config.json --- nextcloud/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nextcloud/config.json b/nextcloud/config.json index dd6ff6b91..74fd418b6 100644 --- a/nextcloud/config.json +++ b/nextcloud/config.json @@ -103,6 +103,6 @@ "slug": "nextcloud_ocr", "uart": true, "url": "https://github.com/alexbelgium/hassio-addons/tree/master/nextcloud", - "version": "25.0.0-4", + "version": "25.0.0-5", "webui": "https://[HOST]:[PORT:443]" } From 0aab951b946eb6692c2abe17784c908e3a261ca5 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Thu, 20 Oct 2022 21:41:03 +0200 Subject: [PATCH 040/243] Correcting nginx path https://github.com/alexbelgium/hassio-addons/issues/519 --- nextcloud/rootfs/etc/cont-init.d/30-keygen.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nextcloud/rootfs/etc/cont-init.d/30-keygen.sh b/nextcloud/rootfs/etc/cont-init.d/30-keygen.sh index 0e3747333..df4f179ea 100644 --- a/nextcloud/rootfs/etc/cont-init.d/30-keygen.sh +++ b/nextcloud/rootfs/etc/cont-init.d/30-keygen.sh @@ -25,7 +25,7 @@ fi #Sets certificates echo "... adding ssl certs in files" #Sets certificates -for NGINXFILE in "/defaults/default" "/config/nginx/site-confs/default" "/data/config/nginx/site-confs/default"; do +for NGINXFILE in "/data/config/nginx/nginx.conf" "/defaults/default" "/config/nginx/site-confs/default" "/data/config/nginx/site-confs/default"; do if [ -f $NGINXFILE ]; then LINE=$(sed -n "/ssl_certificate /=" $NGINXFILE) if [[ -n "$LINE" ]]; then From 13810ee4ce2ea5c8936c1f97967f5a2cc4cac60a Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Thu, 20 Oct 2022 21:41:56 +0200 Subject: [PATCH 041/243] Update config.json --- nextcloud/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nextcloud/config.json b/nextcloud/config.json index 74fd418b6..ec444b90e 100644 --- a/nextcloud/config.json +++ b/nextcloud/config.json @@ -103,6 +103,6 @@ "slug": "nextcloud_ocr", "uart": true, "url": "https://github.com/alexbelgium/hassio-addons/tree/master/nextcloud", - "version": "25.0.0-5", + "version": "25.0.0-6", "webui": "https://[HOST]:[PORT:443]" } From a6eeaa8dc8a1b2c7d84154c6c0064b38ca03cd47 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Thu, 20 Oct 2022 22:26:44 +0200 Subject: [PATCH 042/243] Use ssl.conf https://github.com/alexbelgium/hassio-addons/issues/519 --- nextcloud/rootfs/etc/cont-init.d/30-keygen.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nextcloud/rootfs/etc/cont-init.d/30-keygen.sh b/nextcloud/rootfs/etc/cont-init.d/30-keygen.sh index df4f179ea..67db8d3f8 100644 --- a/nextcloud/rootfs/etc/cont-init.d/30-keygen.sh +++ b/nextcloud/rootfs/etc/cont-init.d/30-keygen.sh @@ -25,7 +25,7 @@ fi #Sets certificates echo "... adding ssl certs in files" #Sets certificates -for NGINXFILE in "/data/config/nginx/nginx.conf" "/defaults/default" "/config/nginx/site-confs/default" "/data/config/nginx/site-confs/default"; do +for NGINXFILE in "/data/config/nginx/ssl.conf" "/defaults/nginx/ssl.conf.sample" "/data/config/nginx/nginx.conf"; do if [ -f $NGINXFILE ]; then LINE=$(sed -n "/ssl_certificate /=" $NGINXFILE) if [[ -n "$LINE" ]]; then From 9f73ad44aac524081f6d80655f302bcddf52de66 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Thu, 20 Oct 2022 22:27:01 +0200 Subject: [PATCH 043/243] Update config.json --- nextcloud/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nextcloud/config.json b/nextcloud/config.json index ec444b90e..3ec4f938b 100644 --- a/nextcloud/config.json +++ b/nextcloud/config.json @@ -103,6 +103,6 @@ "slug": "nextcloud_ocr", "uart": true, "url": "https://github.com/alexbelgium/hassio-addons/tree/master/nextcloud", - "version": "25.0.0-6", + "version": "25.0.0-7", "webui": "https://[HOST]:[PORT:443]" } From d81f1b172648745fddbd5d484ad2eff75acb9d79 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 20 Oct 2022 21:48:28 +0000 Subject: [PATCH 044/243] Github bot : issues linked to readme --- nextcloud/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nextcloud/README.md b/nextcloud/README.md index f6f0d2199..278cc0619 100644 --- a/nextcloud/README.md +++ b/nextcloud/README.md @@ -1,4 +1,6 @@ ## ⚠ Open Issue : [🐛 [Nextcloud] Stange version of update pop up (opened 2022-10-20)](https://github.com/alexbelgium/hassio-addons/issues/518) by [@michelebossa](https://github.com/michelebossa) +## ⚠ Open Issue : [🐛 [Nextcloud] Addon fails to start fater update to 25.0.0 (opened 2022-10-20)](https://github.com/alexbelgium/hassio-addons/issues/519) by [@kulmegil](https://github.com/kulmegil) +## ⚠ Open Request : [[Nextcloud] how to pass extra param(s) to config.php ? (opened 2022-10-20)](https://github.com/alexbelgium/hassio-addons/issues/520) by [@kulmegil](https://github.com/kulmegil) # Home assistant add-on: Nextcloud [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) From b30a0bcea298fcee5b5946acb6e85a4237fc683b Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 20 Oct 2022 22:17:39 +0000 Subject: [PATCH 045/243] Github bot : issues linked to readme --- nextcloud/README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/nextcloud/README.md b/nextcloud/README.md index 278cc0619..ac5506288 100644 --- a/nextcloud/README.md +++ b/nextcloud/README.md @@ -1,6 +1,5 @@ ## ⚠ Open Issue : [🐛 [Nextcloud] Stange version of update pop up (opened 2022-10-20)](https://github.com/alexbelgium/hassio-addons/issues/518) by [@michelebossa](https://github.com/michelebossa) ## ⚠ Open Issue : [🐛 [Nextcloud] Addon fails to start fater update to 25.0.0 (opened 2022-10-20)](https://github.com/alexbelgium/hassio-addons/issues/519) by [@kulmegil](https://github.com/kulmegil) -## ⚠ Open Request : [[Nextcloud] how to pass extra param(s) to config.php ? (opened 2022-10-20)](https://github.com/alexbelgium/hassio-addons/issues/520) by [@kulmegil](https://github.com/kulmegil) # Home assistant add-on: Nextcloud [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) From 06e041c718dbfefe893e4734743301ce6ceb33dd Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Fri, 21 Oct 2022 07:57:20 +0200 Subject: [PATCH 046/243] Update build.json --- omada/build.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/omada/build.json b/omada/build.json index 738f39912..04307bf7b 100644 --- a/omada/build.json +++ b/omada/build.json @@ -1,7 +1,7 @@ { "build_from": { - "aarch64": "mbentley/omada-controller:latest-arm64", - "amd64": "mbentley/omada-controller:latest-amd64" + "aarch64": "mbentley/omada-controller:5.3-arm64", + "amd64": "mbentley/omada-controller:5.3-amd64" }, "codenotary": { "signer": "alexandrep.github@gmail.com" From 12da1e3f2a87719d2bd9c3d19b8061bd9d79fb26 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Fri, 21 Oct 2022 07:57:43 +0200 Subject: [PATCH 047/243] Update config.json --- omada/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omada/config.json b/omada/config.json index c74f227a5..63c58b090 100644 --- a/omada/config.json +++ b/omada/config.json @@ -45,6 +45,6 @@ }, "slug": "omada", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "5.5-chromium-amd64-2022-10-19", + "version": "5.5-chromium-amd64-2022-10-19-2", "webui": "[PROTO:ssl]://[HOST]:[PORT:8088]" } From 041d0b788b5aeb544b279c3e91c49d0e237a0dd2 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 21 Oct 2022 06:51:30 +0000 Subject: [PATCH 048/243] Github bot : issues linked to readme --- nextcloud/README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/nextcloud/README.md b/nextcloud/README.md index ac5506288..6885aaf93 100644 --- a/nextcloud/README.md +++ b/nextcloud/README.md @@ -1,4 +1,3 @@ -## ⚠ Open Issue : [🐛 [Nextcloud] Stange version of update pop up (opened 2022-10-20)](https://github.com/alexbelgium/hassio-addons/issues/518) by [@michelebossa](https://github.com/michelebossa) ## ⚠ Open Issue : [🐛 [Nextcloud] Addon fails to start fater update to 25.0.0 (opened 2022-10-20)](https://github.com/alexbelgium/hassio-addons/issues/519) by [@kulmegil](https://github.com/kulmegil) # Home assistant add-on: Nextcloud From 450713197a6c8bf7b3c3699fe946d5fe3ea302f6 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Fri, 21 Oct 2022 09:57:28 +0200 Subject: [PATCH 049/243] Switch to php https://github.com/alexbelgium/hassio-addons/issues/519#issuecomment-1286557225 --- nextcloud/rootfs/etc/cont-init.d/99-custom_scripts.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nextcloud/rootfs/etc/cont-init.d/99-custom_scripts.sh b/nextcloud/rootfs/etc/cont-init.d/99-custom_scripts.sh index 626d33299..73813ed6c 100644 --- a/nextcloud/rootfs/etc/cont-init.d/99-custom_scripts.sh +++ b/nextcloud/rootfs/etc/cont-init.d/99-custom_scripts.sh @@ -8,3 +8,8 @@ do bash "$file" fi done + +# Use php7 +if [ -f /data/config/crontabs/root ]; then + sed -i "s|php7|php|g" /data/config/crontabs/root +fi From c58358ea4cf9bd7b1775e1bbbb1e8510024b2176 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Fri, 21 Oct 2022 09:57:47 +0200 Subject: [PATCH 050/243] Update config.json https://github.com/alexbelgium/hassio-addons/issues/519#issuecomment-1286557225 --- nextcloud/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nextcloud/config.json b/nextcloud/config.json index 3ec4f938b..9c6ae67e9 100644 --- a/nextcloud/config.json +++ b/nextcloud/config.json @@ -103,6 +103,6 @@ "slug": "nextcloud_ocr", "uart": true, "url": "https://github.com/alexbelgium/hassio-addons/tree/master/nextcloud", - "version": "25.0.0-7", + "version": "25.0.0-8", "webui": "https://[HOST]:[PORT:443]" } From e9c36764205926733e9d9dc12fa65236544096fc Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 21 Oct 2022 14:20:51 +0000 Subject: [PATCH 051/243] Github bot : issues linked to readme --- portainer/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/portainer/README.md b/portainer/README.md index 474ec0db7..97570277c 100644 --- a/portainer/README.md +++ b/portainer/README.md @@ -1,3 +1,4 @@ +## ⚠ Open Issue : [🐛 [portainer] Addon fails to start (opened 2022-10-20)](https://github.com/alexbelgium/hassio-addons/issues/522) by [@cuihaijun](https://github.com/cuihaijun) # Home assistant add-on: Portainer [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) From 39d0c46467b574f970efc0df0893da4c01899b92 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Fri, 21 Oct 2022 18:03:05 +0100 Subject: [PATCH 052/243] Test with uid https://github.com/alexbelgium/hassio-addons/issues/523 --- .templates/92-local_mounts.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.templates/92-local_mounts.sh b/.templates/92-local_mounts.sh index 0edb9d349..d999c3261 100644 --- a/.templates/92-local_mounts.sh +++ b/.templates/92-local_mounts.sh @@ -44,7 +44,8 @@ if bashio::config.has_value 'localdisks'; then [ -d /share/"$disk" ] && mount "$devpath"/"$disk" /share/"$disk" || true # Mount # shellcheck disable=SC2015 - mount "$devpath"/"$disk" -o "uid=$PUID,gid=$PGID" /mnt/"$disk" && bashio::log.info "Success! $disk mounted to /mnt/$disk" || (bashio::log.fatal "Unable to mount local drives! Please check the name." && rmdir /mnt/$disk) + mount "$devpath"/"$disk" -o "uid=$PUID,gid=$PGID" /mnt/"$disk" && bashio::log.info "Success! $disk mounted to /mnt/$disk" || \ + mount "$devpath"/"$disk" /mnt/"$disk" && bashio::log.info "Success! $disk mounted to /mnt/$disk" && bashio::log.info "Success! $disk mounted to /mnt/$disk" || (bashio::log.fatal "Unable to mount local drives! Please check the name." && rmdir /mnt/$disk) done From 5b251b3ac428fa1bc59e96aabdbbbe88f36f4dec Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Sat, 22 Oct 2022 01:56:12 +0200 Subject: [PATCH 053/243] Updater bot : cloudcommander updated to 16.6.1 --- cloudcommander/CHANGELOG.md | 3 +++ cloudcommander/config.json | 2 +- cloudcommander/updater.json | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cloudcommander/CHANGELOG.md b/cloudcommander/CHANGELOG.md index 5168d1535..0d62f458e 100644 --- a/cloudcommander/CHANGELOG.md +++ b/cloudcommander/CHANGELOG.md @@ -1,4 +1,7 @@ +## 16.6.1 (22-10-2022) +- Update to latest version from coderaiser/cloudcmd + ## 16.6.0 (11-10-2022) - Update to latest version from coderaiser/cloudcmd diff --git a/cloudcommander/config.json b/cloudcommander/config.json index 8c5e9e35a..68edb06c2 100644 --- a/cloudcommander/config.json +++ b/cloudcommander/config.json @@ -74,5 +74,5 @@ }, "slug": "cloudcommander", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/cloudcommander", - "version": "16.6.0" + "version": "16.6.1" } diff --git a/cloudcommander/updater.json b/cloudcommander/updater.json index 5e3b6f8db..265869126 100644 --- a/cloudcommander/updater.json +++ b/cloudcommander/updater.json @@ -1,8 +1,8 @@ { - "last_update": "11-10-2022", + "last_update": "22-10-2022", "repository": "alexbelgium/hassio-addons", "slug": "cloudcommander", "source": "github", "upstream_repo": "coderaiser/cloudcmd", - "upstream_version": "16.6.0" + "upstream_version": "16.6.1" } From 8d4cfbafba54347e61998093f95cee86026ddb1d Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Sat, 22 Oct 2022 01:56:27 +0200 Subject: [PATCH 054/243] Updater bot : emby updated to 4.8.0.13 --- emby/CHANGELOG.md | 3 +++ emby/config.json | 2 +- emby/updater.json | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/emby/CHANGELOG.md b/emby/CHANGELOG.md index 5e83af5e0..3040027b0 100644 --- a/emby/CHANGELOG.md +++ b/emby/CHANGELOG.md @@ -1,4 +1,7 @@ +## 4.8.0.13 (22-10-2022) +- Update to latest version from linuxserver/docker-emby + ## 4.8.0.12 (15-10-2022) - Update to latest version from linuxserver/docker-emby diff --git a/emby/config.json b/emby/config.json index 402444fe7..4b1e456e1 100644 --- a/emby/config.json +++ b/emby/config.json @@ -107,6 +107,6 @@ }, "slug": "emby_nas", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/emby", - "version": "4.8.0.12", + "version": "4.8.0.13", "video": true } diff --git a/emby/updater.json b/emby/updater.json index d93cb8376..f804592f4 100644 --- a/emby/updater.json +++ b/emby/updater.json @@ -1,9 +1,9 @@ { "github_beta": "true", - "last_update": "15-10-2022", + "last_update": "22-10-2022", "repository": "alexbelgium/hassio-addons", "slug": "emby", "source": "github", "upstream_repo": "linuxserver/docker-emby", - "upstream_version": "4.8.0.12" + "upstream_version": "4.8.0.13" } From 70950099b2382d758c1fbf6fd8d735c5629e176b Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Sat, 22 Oct 2022 01:57:08 +0200 Subject: [PATCH 055/243] Updater bot : flexget updated to 3.3.39 --- flexget/CHANGELOG.md | 3 +++ flexget/config.json | 4 ++-- flexget/updater.json | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/flexget/CHANGELOG.md b/flexget/CHANGELOG.md index 3dea925fb..4a1ea295b 100644 --- a/flexget/CHANGELOG.md +++ b/flexget/CHANGELOG.md @@ -1,4 +1,7 @@ +## 3.3.39 (22-10-2022) +- Update to latest version from wiserain/flexget + ## 3.3.35 (15-10-2022) - Update to latest version from wiserain/flexget diff --git a/flexget/config.json b/flexget/config.json index e53f6c0b0..83293967f 100644 --- a/flexget/config.json +++ b/flexget/config.json @@ -37,6 +37,6 @@ }, "slug": "flexget", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "3.3.35-2", + "version": "3.3.39", "webui": "[PROTO:ssl]://[HOST]:[PORT:5050]" -} \ No newline at end of file +} diff --git a/flexget/updater.json b/flexget/updater.json index afc117d08..8b9f8fadf 100644 --- a/flexget/updater.json +++ b/flexget/updater.json @@ -1,8 +1,8 @@ { - "last_update": "15-10-2022", + "last_update": "22-10-2022", "repository": "alexbelgium/hassio-addons", "slug": "flexget", "source": "dockerhub", "upstream_repo": "wiserain/flexget", - "upstream_version": "3.3.35" + "upstream_version": "3.3.39" } From d332cfba2ccba683af9285c82ad0e6255f5e9d6e Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Sat, 22 Oct 2022 01:57:49 +0200 Subject: [PATCH 056/243] Updater bot : jackett updated to 0.20.2134 --- jackett/CHANGELOG.md | 3 +++ jackett/config.json | 2 +- jackett/updater.json | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/jackett/CHANGELOG.md b/jackett/CHANGELOG.md index 8b53ddb65..36c2d329e 100644 --- a/jackett/CHANGELOG.md +++ b/jackett/CHANGELOG.md @@ -1,4 +1,7 @@ +## 0.20.2134 (22-10-2022) +- Update to latest version from linuxserver/docker-jackett + ## 0.20.2124 (20-10-2022) - Update to latest version from linuxserver/docker-jackett diff --git a/jackett/config.json b/jackett/config.json index c99b218c3..6718d155f 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.2124", + "version": "0.20.2134", "webui": "[PROTO:ssl]://[HOST]:[PORT:9117]" } diff --git a/jackett/updater.json b/jackett/updater.json index d4f767f40..984f90e8c 100644 --- a/jackett/updater.json +++ b/jackett/updater.json @@ -1,8 +1,8 @@ { - "last_update": "20-10-2022", + "last_update": "22-10-2022", "repository": "alexbelgium/hassio-addons", "slug": "jackett", "source": "github", "upstream_repo": "linuxserver/docker-jackett", - "upstream_version": "0.20.2124" + "upstream_version": "0.20.2134" } From ecc7c063093250049f559358f2b434169ef05998 Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Sat, 22 Oct 2022 01:57:57 +0200 Subject: [PATCH 057/243] Updater bot : jellyfin updated to 10.8.5-1-ls183 --- jellyfin/CHANGELOG.md | 3 +++ jellyfin/config.json | 2 +- jellyfin/updater.json | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/jellyfin/CHANGELOG.md b/jellyfin/CHANGELOG.md index efa3de1ad..5902f4006 100644 --- a/jellyfin/CHANGELOG.md +++ b/jellyfin/CHANGELOG.md @@ -1,4 +1,7 @@ +## 10.8.5-1-ls183 (22-10-2022) +- Update to latest version from linuxserver/docker-jellyfin + ## 10.8.5-1-ls182 (15-10-2022) - Update to latest version from linuxserver/docker-jellyfin diff --git a/jellyfin/config.json b/jellyfin/config.json index 754d0edfd..e1ce1c6f6 100644 --- a/jellyfin/config.json +++ b/jellyfin/config.json @@ -103,6 +103,6 @@ }, "slug": "jellyfin", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "10.8.5-1-ls182", + "version": "10.8.5-1-ls183", "video": true } diff --git a/jellyfin/updater.json b/jellyfin/updater.json index 6f37822c3..00b23c1b8 100644 --- a/jellyfin/updater.json +++ b/jellyfin/updater.json @@ -1,9 +1,9 @@ { "github_fulltag": "true", - "last_update": "15-10-2022", + "last_update": "22-10-2022", "repository": "alexbelgium/hassio-addons", "slug": "jellyfin", "source": "github", "upstream_repo": "linuxserver/docker-jellyfin", - "upstream_version": "10.8.5-1-ls182" + "upstream_version": "10.8.5-1-ls183" } From b4d09f45c683cba24f12e56635aec70e7472a073 Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Sat, 22 Oct 2022 01:58:42 +0200 Subject: [PATCH 058/243] Updater bot : nzbget updated to v21.1-ls126 --- nzbget/CHANGELOG.md | 3 +++ nzbget/config.json | 2 +- nzbget/updater.json | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/nzbget/CHANGELOG.md b/nzbget/CHANGELOG.md index d4e5fba67..368e31717 100644 --- a/nzbget/CHANGELOG.md +++ b/nzbget/CHANGELOG.md @@ -1,4 +1,7 @@ +## v21.1-ls126 (22-10-2022) +- Update to latest version from linuxserver/docker-nzbget + ## v21.1-ls125 (24-09-2022) - Update to latest version from linuxserver/docker-nzbget diff --git a/nzbget/config.json b/nzbget/config.json index 8fcfa7e2c..b81260222 100644 --- a/nzbget/config.json +++ b/nzbget/config.json @@ -79,5 +79,5 @@ }, "slug": "nzbget", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "v21.1-ls125" + "version": "v21.1-ls126" } diff --git a/nzbget/updater.json b/nzbget/updater.json index 4370e95f7..eb3eeb5d4 100644 --- a/nzbget/updater.json +++ b/nzbget/updater.json @@ -1,9 +1,9 @@ { "github_fulltag": "true", - "last_update": "24-09-2022", + "last_update": "22-10-2022", "repository": "alexbelgium/hassio-addons", "slug": "nzbget", "source": "github", "upstream_repo": "linuxserver/docker-nzbget", - "upstream_version": "v21.1-ls125" + "upstream_version": "v21.1-ls126" } From 8212225a56c905c7f4929c04c31972ea52f77874 Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Sat, 22 Oct 2022 01:58:49 +0200 Subject: [PATCH 059/243] Updater bot : omada updated to 5.5-chromium-amd64-2022-10-21 --- omada/CHANGELOG.md | 3 +++ omada/Dockerfile | 2 +- omada/config.json | 2 +- omada/updater.json | 4 ++-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/omada/CHANGELOG.md b/omada/CHANGELOG.md index 2f4f904c0..3b2a946c1 100644 --- a/omada/CHANGELOG.md +++ b/omada/CHANGELOG.md @@ -1,4 +1,7 @@ +## 5.5-chromium-amd64-2022-10-21 (2022-10-21) +- Update to latest version from mbentley/omada-controller + ## 5.5-chromium-amd64-2022-10-19 (2022-10-19) - Update to latest version from mbentley/omada-controller diff --git a/omada/Dockerfile b/omada/Dockerfile index 81a511a11..0778b2cce 100644 --- a/omada/Dockerfile +++ b/omada/Dockerfile @@ -16,7 +16,7 @@ ARG BUILD_FROM ARG BUILD_VERSION -ARG BUILD_UPSTREAM="5.5-chromium-amd64-2022-10-19" +ARG BUILD_UPSTREAM="5.5-chromium-amd64-2022-10-21" FROM ${BUILD_FROM} ################## diff --git a/omada/config.json b/omada/config.json index 63c58b090..9fff0e48b 100644 --- a/omada/config.json +++ b/omada/config.json @@ -45,6 +45,6 @@ }, "slug": "omada", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "5.5-chromium-amd64-2022-10-19-2", + "version": "5.5-chromium-amd64-2022-10-21", "webui": "[PROTO:ssl]://[HOST]:[PORT:8088]" } diff --git a/omada/updater.json b/omada/updater.json index 59453ecb3..19c8afa0b 100644 --- a/omada/updater.json +++ b/omada/updater.json @@ -1,9 +1,9 @@ { "dockerhub_by_date": true, - "last_update": "2022-10-19", + "last_update": "2022-10-21", "repository": "alexbelgium/hassio-addons", "slug": "omada", "source": "dockerhub", "upstream_repo": "mbentley/omada-controller", - "upstream_version": "5.5-chromium-amd64-2022-10-19" + "upstream_version": "5.5-chromium-amd64-2022-10-21" } From f1378d25ca20f50ef1e544d6e65ee5291aefcefc Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Sat, 22 Oct 2022 01:58:55 +0200 Subject: [PATCH 060/243] Updater bot : omada_v3 updated to 5.5-chromium-amd64-2022-10-21 --- omada_v3/CHANGELOG.md | 3 +++ omada_v3/Dockerfile | 2 +- omada_v3/config.json | 2 +- omada_v3/updater.json | 4 ++-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/omada_v3/CHANGELOG.md b/omada_v3/CHANGELOG.md index 2f4f904c0..3b2a946c1 100644 --- a/omada_v3/CHANGELOG.md +++ b/omada_v3/CHANGELOG.md @@ -1,4 +1,7 @@ +## 5.5-chromium-amd64-2022-10-21 (2022-10-21) +- Update to latest version from mbentley/omada-controller + ## 5.5-chromium-amd64-2022-10-19 (2022-10-19) - Update to latest version from mbentley/omada-controller diff --git a/omada_v3/Dockerfile b/omada_v3/Dockerfile index 04d7fd4fe..edd5229c7 100644 --- a/omada_v3/Dockerfile +++ b/omada_v3/Dockerfile @@ -16,7 +16,7 @@ ARG BUILD_FROM ARG BUILD_VERSION -ARG BUILD_UPSTREAM="5.5-chromium-amd64-2022-10-19" +ARG BUILD_UPSTREAM="5.5-chromium-amd64-2022-10-21" FROM ${BUILD_FROM} ################## diff --git a/omada_v3/config.json b/omada_v3/config.json index db38bfd50..3102113dd 100644 --- a/omada_v3/config.json +++ b/omada_v3/config.json @@ -45,6 +45,6 @@ }, "slug": "omada_v3", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "5.5-chromium-amd64-2022-10-19", + "version": "5.5-chromium-amd64-2022-10-21", "webui": "[PROTO:ssl]://[HOST]:[PORT:8088]" } diff --git a/omada_v3/updater.json b/omada_v3/updater.json index 42b3ddcd7..29c18d8de 100644 --- a/omada_v3/updater.json +++ b/omada_v3/updater.json @@ -1,9 +1,9 @@ { "dockerhub_by_date": true, - "last_update": "2022-10-19", + "last_update": "2022-10-21", "repository": "alexbelgium/hassio-addons", "slug": "omada_v3", "source": "dockerhub", "upstream_repo": "mbentley/omada-controller", - "upstream_version": "5.5-chromium-amd64-2022-10-19" + "upstream_version": "5.5-chromium-amd64-2022-10-21" } From 4d50ac235caa7b6f1b168c3b5a1b40957675c30e Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Sat, 22 Oct 2022 01:59:48 +0200 Subject: [PATCH 061/243] Updater bot : plex updated to 1.29.1.6316-f4cdfea9c-ls139 --- plex/CHANGELOG.md | 3 +++ plex/config.json | 2 +- plex/updater.json | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/plex/CHANGELOG.md b/plex/CHANGELOG.md index f1806dda0..f99e79a4f 100644 --- a/plex/CHANGELOG.md +++ b/plex/CHANGELOG.md @@ -1,4 +1,7 @@ +## 1.29.1.6316-f4cdfea9c-ls139 (22-10-2022) +- Update to latest version from linuxserver/docker-plex + ## 1.29.1.6313-f4cdfea9c-ls135 (20-10-2022) - Update to latest version from linuxserver/docker-plex diff --git a/plex/config.json b/plex/config.json index 99334d18d..df0110655 100644 --- a/plex/config.json +++ b/plex/config.json @@ -115,7 +115,7 @@ }, "slug": "plex_nas", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/plex", - "version": "1.29.1.6313-f4cdfea9c-ls135", + "version": "1.29.1.6316-f4cdfea9c-ls139", "video": true, "webui": "[PROTO:ssl]://[HOST]:[PORT:32400]/web" } diff --git a/plex/updater.json b/plex/updater.json index 3afbd7530..cca9bf813 100644 --- a/plex/updater.json +++ b/plex/updater.json @@ -1,9 +1,9 @@ { "github_fulltag": "true", - "last_update": "20-10-2022", + "last_update": "22-10-2022", "repository": "alexbelgium/hassio-addons", "slug": "plex", "source": "github", "upstream_repo": "linuxserver/docker-plex", - "upstream_version": "1.29.1.6313-f4cdfea9c-ls135" + "upstream_version": "1.29.1.6316-f4cdfea9c-ls139" } From efbb85c80231efb49d8ccbf423e962b37bb8dcfc Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Sat, 22 Oct 2022 02:02:23 +0200 Subject: [PATCH 062/243] Updater bot : xteve updated to 2.5.3 --- xteve/CHANGELOG.md | 3 +++ xteve/Dockerfile | 2 +- xteve/config.json | 2 +- xteve/updater.json | 4 ++-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/xteve/CHANGELOG.md b/xteve/CHANGELOG.md index d93464e38..86d7bea76 100644 --- a/xteve/CHANGELOG.md +++ b/xteve/CHANGELOG.md @@ -1,4 +1,7 @@ +## 2.5.3 (22-10-2022) +- Update to latest version from SenexCrenshaw/xTeVe + ## 2.5.2 (01-09-2022) - Update to latest version from SenexCrenshaw/xTeVe diff --git a/xteve/Dockerfile b/xteve/Dockerfile index 59e8f0009..49c0d0ca6 100644 --- a/xteve/Dockerfile +++ b/xteve/Dockerfile @@ -16,7 +16,7 @@ ARG BUILD_FROM ARG BUILD_VERSION -ARG BUILD_UPSTREAM="2.5.2" +ARG BUILD_UPSTREAM="2.5.3" FROM $BUILD_FROM ################## diff --git a/xteve/config.json b/xteve/config.json index f8c9ce78a..fc6fd1834 100644 --- a/xteve/config.json +++ b/xteve/config.json @@ -24,6 +24,6 @@ }, "slug": "xteve", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "2.5.2", + "version": "2.5.3", "webui": "[PROTO:ssl]://[HOST]:[PORT:34400]/web" } diff --git a/xteve/updater.json b/xteve/updater.json index b6463ade4..5c6f9ca26 100644 --- a/xteve/updater.json +++ b/xteve/updater.json @@ -1,8 +1,8 @@ { - "last_update": "01-09-2022", + "last_update": "22-10-2022", "repository": "alexbelgium/hassio-addons", "slug": "xteve", "source": "github", "upstream_repo": "SenexCrenshaw/xTeVe", - "upstream_version": "2.5.2" + "upstream_version": "2.5.3" } From 256d49a9ce722419f8d1240f440070afed4fb0f6 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 22 Oct 2022 03:56:51 +0000 Subject: [PATCH 063/243] Github bot : issues linked to readme --- xteve/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/xteve/README.md b/xteve/README.md index 50664980d..db6ff84d5 100644 --- a/xteve/README.md +++ b/xteve/README.md @@ -1,3 +1,4 @@ +## ⚠ Open Request : [✨ [REQUEST] Xteve (opened 2022-10-21)](https://github.com/alexbelgium/hassio-addons/issues/524) by [@thetux07](https://github.com/thetux07) # Home assistant add-on: xTeVe [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) From ff4825f446796980c97b92015da78f0b376d6a89 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sat, 22 Oct 2022 07:47:10 +0100 Subject: [PATCH 064/243] Allow multiple elements https://github.com/alexbelgium/hassio-addons/issues/525 --- plex/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plex/Dockerfile b/plex/Dockerfile index d0460ac20..acd814de8 100644 --- a/plex/Dockerfile +++ b/plex/Dockerfile @@ -31,10 +31,10 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # hadolint ignore=SC2016 RUN \ # CORRECT PLEX CLAIM - file="$(grep -sril 'Server claimed successfully, navigate to http://serverip:32400/web to complete plex setup' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d)" \ - && sed -i 's/with-contenv bash/with-contenv bashio/g' "$file" \ - && sed -i '2iexport PLEX_CLAIM=$(bashio::config "claim")' "$file" \ - && sed -i '3i[ $PLEX_CLAIM = "Get_from_https://www.plex.tv/claim" ] && bashio::log.warning "Please change the PLEX_CLAIM code from the options" && exit 1 || true' "$file" + file=$(grep -sril 'Server claimed successfully) \ + && sed -i 's/bash/bashio/g' $file \ + && sed -i '2iexport PLEX_CLAIM=$(bashio::config "claim")' $file \ + && sed -i '3i[ $PLEX_CLAIM = "Get_from_https://www.plex.tv/claim" ] && bashio::log.warning "Please change the PLEX_CLAIM code from the options" && exit 1 || true' $file # Global LSIO modifications ARG CONFIGLOCATION="/config" From 270b90faf709d467034e36e47967f2493d92c8fa Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sat, 22 Oct 2022 07:48:07 +0100 Subject: [PATCH 065/243] Update config.json --- plex/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plex/config.json b/plex/config.json index df0110655..ae9a40171 100644 --- a/plex/config.json +++ b/plex/config.json @@ -115,7 +115,7 @@ }, "slug": "plex_nas", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/plex", - "version": "1.29.1.6316-f4cdfea9c-ls139", + "version": "1.29.1.6316-f4cdfea9c-ls139-2", "video": true, "webui": "[PROTO:ssl]://[HOST]:[PORT:32400]/web" } From c0037086d36028aaf6ba9872fadfd31eba0de835 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sat, 22 Oct 2022 07:56:01 +0100 Subject: [PATCH 066/243] Update Dockerfile --- plex/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plex/Dockerfile b/plex/Dockerfile index acd814de8..d9650e70a 100644 --- a/plex/Dockerfile +++ b/plex/Dockerfile @@ -31,7 +31,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # hadolint ignore=SC2016 RUN \ # CORRECT PLEX CLAIM - file=$(grep -sril 'Server claimed successfully) \ + file=$(grep -sril 'Server claimed successfully' /etc) \ && sed -i 's/bash/bashio/g' $file \ && sed -i '2iexport PLEX_CLAIM=$(bashio::config "claim")' $file \ && sed -i '3i[ $PLEX_CLAIM = "Get_from_https://www.plex.tv/claim" ] && bashio::log.warning "Please change the PLEX_CLAIM code from the options" && exit 1 || true' $file From 7e6ec3d9fd892e1d4d9f5544f1d681e04bc6e55a Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sat, 22 Oct 2022 07:56:29 +0100 Subject: [PATCH 067/243] Update config.json --- plex/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plex/config.json b/plex/config.json index ae9a40171..118c80ffd 100644 --- a/plex/config.json +++ b/plex/config.json @@ -115,7 +115,7 @@ }, "slug": "plex_nas", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/plex", - "version": "1.29.1.6316-f4cdfea9c-ls139-2", + "version": "1.29.1.6316-f4cdfea9c-ls139-3", "video": true, "webui": "[PROTO:ssl]://[HOST]:[PORT:32400]/web" } From b29af6f3eb934dffd95eef26725bd3826140dc70 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 22 Oct 2022 12:34:50 +0000 Subject: [PATCH 068/243] Github bot : issues linked to readme --- plex/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/plex/README.md b/plex/README.md index dd2914348..24ed1e3a4 100644 --- a/plex/README.md +++ b/plex/README.md @@ -1,3 +1,4 @@ +## ⚠ Open Issue : [🐛 [Plex NAS] Issue description (opened 2022-10-22)](https://github.com/alexbelgium/hassio-addons/issues/525) by [@NPC-112](https://github.com/NPC-112) # Home assistant add-on: plex [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) From 5fb250af28e01ceebe9ed0ed062a59401d726d23 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sat, 22 Oct 2022 18:12:28 +0100 Subject: [PATCH 069/243] Host network https://github.com/alexbelgium/hassio-addons/issues/524 --- xteve/config.json | 1 + 1 file changed, 1 insertion(+) diff --git a/xteve/config.json b/xteve/config.json index fc6fd1834..505754012 100644 --- a/xteve/config.json +++ b/xteve/config.json @@ -10,6 +10,7 @@ "XTEVE_CONF": "/data/conf", "XTEVE_HOME": "/data" }, + "host_network": "true", "map": [ "config:rw", "share:rw", From 0cfb6e3b9036772a1ce2c7b03607045457fb5a6b Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sat, 22 Oct 2022 18:12:48 +0100 Subject: [PATCH 070/243] Update config.json --- xteve/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xteve/config.json b/xteve/config.json index 505754012..1ca9cb52d 100644 --- a/xteve/config.json +++ b/xteve/config.json @@ -25,6 +25,6 @@ }, "slug": "xteve", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "2.5.3", + "version": "2.5.3-2", "webui": "[PROTO:ssl]://[HOST]:[PORT:34400]/web" } From 24398892bf873b600def178d08fe429dff3fb473 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sat, 22 Oct 2022 18:21:48 +0100 Subject: [PATCH 071/243] Update config.json --- xteve/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xteve/config.json b/xteve/config.json index 1ca9cb52d..6e9734ae1 100644 --- a/xteve/config.json +++ b/xteve/config.json @@ -10,7 +10,7 @@ "XTEVE_CONF": "/data/conf", "XTEVE_HOME": "/data" }, - "host_network": "true", + "host_network": true, "map": [ "config:rw", "share:rw", From 7e61b88a29e8b0855b3647e281e21dfdc0278a63 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 22 Oct 2022 21:53:16 +0000 Subject: [PATCH 072/243] Github bot : issues linked to readme --- portainer/README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/portainer/README.md b/portainer/README.md index 97570277c..474ec0db7 100644 --- a/portainer/README.md +++ b/portainer/README.md @@ -1,4 +1,3 @@ -## ⚠ Open Issue : [🐛 [portainer] Addon fails to start (opened 2022-10-20)](https://github.com/alexbelgium/hassio-addons/issues/522) by [@cuihaijun](https://github.com/cuihaijun) # Home assistant add-on: Portainer [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) From a47e7c48f01611bc32957def977131a55f31d45d Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sat, 22 Oct 2022 23:18:38 +0100 Subject: [PATCH 073/243] Correction https://github.com/alexbelgium/hassio-addons/issues/526 --- plex/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plex/Dockerfile b/plex/Dockerfile index d9650e70a..6a2321cea 100644 --- a/plex/Dockerfile +++ b/plex/Dockerfile @@ -32,7 +32,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ RUN \ # CORRECT PLEX CLAIM file=$(grep -sril 'Server claimed successfully' /etc) \ - && sed -i 's/bash/bashio/g' $file \ + && sed -i 's/with-contenv bash/with-contenv bashio/g' $file \ && sed -i '2iexport PLEX_CLAIM=$(bashio::config "claim")' $file \ && sed -i '3i[ $PLEX_CLAIM = "Get_from_https://www.plex.tv/claim" ] && bashio::log.warning "Please change the PLEX_CLAIM code from the options" && exit 1 || true' $file From 4a9cb2757af18ba7e19a113a7c585e9a8c9be0dc Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sat, 22 Oct 2022 23:19:06 +0100 Subject: [PATCH 074/243] Update config.json --- plex/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plex/config.json b/plex/config.json index 118c80ffd..c56e01eb3 100644 --- a/plex/config.json +++ b/plex/config.json @@ -115,7 +115,7 @@ }, "slug": "plex_nas", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/plex", - "version": "1.29.1.6316-f4cdfea9c-ls139-3", + "version": "1.29.1.6316-f4cdfea9c-ls139-4", "video": true, "webui": "[PROTO:ssl]://[HOST]:[PORT:32400]/web" } From 23d34b30d86e584017b6575c7e271a5a9aad3a44 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 23 Oct 2022 00:21:11 +0000 Subject: [PATCH 075/243] Github bot : script beautyshied --- .templates/92-local_mounts.sh | 2 +- nextcloud/rootfs/etc/cont-init.d/99-custom_scripts.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.templates/92-local_mounts.sh b/.templates/92-local_mounts.sh index d999c3261..177b786d8 100644 --- a/.templates/92-local_mounts.sh +++ b/.templates/92-local_mounts.sh @@ -45,7 +45,7 @@ if bashio::config.has_value 'localdisks'; then # Mount # shellcheck disable=SC2015 mount "$devpath"/"$disk" -o "uid=$PUID,gid=$PGID" /mnt/"$disk" && bashio::log.info "Success! $disk mounted to /mnt/$disk" || \ - mount "$devpath"/"$disk" /mnt/"$disk" && bashio::log.info "Success! $disk mounted to /mnt/$disk" && bashio::log.info "Success! $disk mounted to /mnt/$disk" || (bashio::log.fatal "Unable to mount local drives! Please check the name." && rmdir /mnt/$disk) + mount "$devpath"/"$disk" /mnt/"$disk" && bashio::log.info "Success! $disk mounted to /mnt/$disk" && bashio::log.info "Success! $disk mounted to /mnt/$disk" || (bashio::log.fatal "Unable to mount local drives! Please check the name." && rmdir /mnt/$disk) done diff --git a/nextcloud/rootfs/etc/cont-init.d/99-custom_scripts.sh b/nextcloud/rootfs/etc/cont-init.d/99-custom_scripts.sh index 73813ed6c..02871181d 100644 --- a/nextcloud/rootfs/etc/cont-init.d/99-custom_scripts.sh +++ b/nextcloud/rootfs/etc/cont-init.d/99-custom_scripts.sh @@ -11,5 +11,5 @@ done # Use php7 if [ -f /data/config/crontabs/root ]; then - sed -i "s|php7|php|g" /data/config/crontabs/root + sed -i "s|php7|php|g" /data/config/crontabs/root fi From 9ea7e887579dabf8a3ccf06b77542498ff03bb8b Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sun, 23 Oct 2022 07:49:18 +0100 Subject: [PATCH 076/243] Update restart_addon --- transmission_openvpn/rootfs/usr/bin/restart_addon | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/transmission_openvpn/rootfs/usr/bin/restart_addon b/transmission_openvpn/rootfs/usr/bin/restart_addon index 68bc6662e..c93bb1922 100644 --- a/transmission_openvpn/rootfs/usr/bin/restart_addon +++ b/transmission_openvpn/rootfs/usr/bin/restart_addon @@ -1,12 +1,12 @@ -#!/usr/bin/env bashio +#!/usr/bin/with-contenv bashio bashio::log.fatal 'Tunnel down, addon restarting in 15 seconds' sleep 15 # force container environment -for i in $(/usr/bin/env); do -export "$i" 2>/dev/null || true -done +#for i in $(/usr/bin/env); do +#export "$i" 2>/dev/null || true +#done bashio::addon.restart From 5b8c09b2dda34bc9df01494c71a70c51783612c8 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sun, 23 Oct 2022 07:49:35 +0100 Subject: [PATCH 077/243] Update config.json --- transmission_openvpn/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/transmission_openvpn/config.json b/transmission_openvpn/config.json index c0181adcb..673ab0f88 100644 --- a/transmission_openvpn/config.json +++ b/transmission_openvpn/config.json @@ -105,5 +105,5 @@ }, "slug": "transmission_openvpn", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "4.0-v27" + "version": "4.0-v28" } From 234e7f8b3420d21b4dbd652821532163830b6f21 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 23 Oct 2022 08:22:27 +0000 Subject: [PATCH 078/243] Github bot : issues linked to readme --- plex/README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/plex/README.md b/plex/README.md index 24ed1e3a4..dd2914348 100644 --- a/plex/README.md +++ b/plex/README.md @@ -1,4 +1,3 @@ -## ⚠ Open Issue : [🐛 [Plex NAS] Issue description (opened 2022-10-22)](https://github.com/alexbelgium/hassio-addons/issues/525) by [@NPC-112](https://github.com/NPC-112) # Home assistant add-on: plex [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) From de4ad553c044d6a15e54f12881ef6c1d8dabdd67 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sun, 23 Oct 2022 10:07:27 +0100 Subject: [PATCH 079/243] Latest --- omada/build.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/omada/build.json b/omada/build.json index 04307bf7b..738f39912 100644 --- a/omada/build.json +++ b/omada/build.json @@ -1,7 +1,7 @@ { "build_from": { - "aarch64": "mbentley/omada-controller:5.3-arm64", - "amd64": "mbentley/omada-controller:5.3-amd64" + "aarch64": "mbentley/omada-controller:latest-arm64", + "amd64": "mbentley/omada-controller:latest-amd64" }, "codenotary": { "signer": "alexandrep.github@gmail.com" From 2f51c9fccb67ee015b6e218d53eea1cc4a3b12e1 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sun, 23 Oct 2022 10:07:53 +0100 Subject: [PATCH 080/243] Latest --- omada/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omada/config.json b/omada/config.json index 9fff0e48b..01ee60701 100644 --- a/omada/config.json +++ b/omada/config.json @@ -45,6 +45,6 @@ }, "slug": "omada", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "5.5-chromium-amd64-2022-10-21", + "version": "5.5-chromium-amd64-2022-10-21-2", "webui": "[PROTO:ssl]://[HOST]:[PORT:8088]" } From d665e241fbae837eb82b7f6a080cb4371b23e5fe Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 23 Oct 2022 10:38:35 +0000 Subject: [PATCH 081/243] Github bot : issues linked to readme --- xteve/README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/xteve/README.md b/xteve/README.md index db6ff84d5..50664980d 100644 --- a/xteve/README.md +++ b/xteve/README.md @@ -1,4 +1,3 @@ -## ⚠ Open Request : [✨ [REQUEST] Xteve (opened 2022-10-21)](https://github.com/alexbelgium/hassio-addons/issues/524) by [@thetux07](https://github.com/thetux07) # Home assistant add-on: xTeVe [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) From 5e94d295f89acb97c9e8d8579a933ed3a9326996 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sun, 23 Oct 2022 22:59:12 +0100 Subject: [PATCH 082/243] Test update --- omada/rootfs/etc/cont-init.d/00-folders.sh | 29 ++++++++++++---------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/omada/rootfs/etc/cont-init.d/00-folders.sh b/omada/rootfs/etc/cont-init.d/00-folders.sh index c1c21cb3a..97baec389 100644 --- a/omada/rootfs/etc/cont-init.d/00-folders.sh +++ b/omada/rootfs/etc/cont-init.d/00-folders.sh @@ -17,21 +17,24 @@ if [ ! -f "$CONFIGSOURCE" ]; then fi # Ensure structure is correct -mkdir -p "$CONFIGSOURCE"/db "$CONFIGSOURCE"/html "$CONFIGSOURCE"/pdf cp -rnf /opt/tplink/EAPController/data/* "$CONFIGSOURCE" +echo "Creating symlink" +rm -r /opt/tplink/EAPController/data/* + +mkdir -p "$CONFIGSOURCE"/pdf +mkdir -p "$CONFIGSOURCE"/omada/html +mkdir -p "$CONFIGSOURCE"/db +mkdir -p "$CONFIGSOURCE"/map +mkdir -p "$CONFIGSOURCE"/portal + +ln -s "$CONFIGSOURCE"/pdf /opt/tplink/EAPController/data +ln -s "$CONFIGSOURCE"/omada/html /opt/tplink/EAPController/data +ln -s "$CONFIGSOURCE"/db /opt/tplink/EAPController/data +ln -s "$CONFIGSOURCE"/map /opt/tplink/EAPController/data +ln -s "$CONFIGSOURCE"/portal /opt/tplink/EAPController/data + # Make sure permissions are right echo "Updating permissions" +chmod -R 777 "$CONFIGSOURCE" chown -R "508:508" "$CONFIGSOURCE" - -# Delete previous directories -echo "Removing previous directories" -rm -r /opt/tplink/EAPController/data/html -rm -r /opt/tplink/EAPController/data/pdf -rm -r /opt/tplink/EAPController/data/db - -# Create symlink -echo "Creating symlink" -ln -s /config/addons_config/omada/pdf /opt/tplink/EAPController/data/pdf -ln -s /config/addons_config/omada/html /opt/tplink/EAPController/data/html -ln -s /config/addons_config/omada/db /opt/tplink/EAPController/data/db From e19ffef00ed91dffe9c9cf6ef703466dae60bea5 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sun, 23 Oct 2022 22:59:45 +0100 Subject: [PATCH 083/243] Update 00-folders.sh --- omada_v3/rootfs/etc/cont-init.d/00-folders.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/omada_v3/rootfs/etc/cont-init.d/00-folders.sh b/omada_v3/rootfs/etc/cont-init.d/00-folders.sh index 2aa8bd12c..b76ab0c99 100644 --- a/omada_v3/rootfs/etc/cont-init.d/00-folders.sh +++ b/omada_v3/rootfs/etc/cont-init.d/00-folders.sh @@ -3,6 +3,13 @@ CONFIGSOURCE="/data" +# Use ssl +if [ -d /ssl ]; then + mkdir -p /cert + cp /ssl/* /cert 2>/dev/null + chown -R 508:508 /cert +fi + # Create directory if [ ! -d "$CONFIGSOURCE" ]; then echo "Creating directory" From f18f1db03d236cfd0d48c4cd0ec42aa8c419f981 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sun, 23 Oct 2022 23:00:00 +0100 Subject: [PATCH 084/243] Update 00-folders.sh --- omada/rootfs/etc/cont-init.d/00-folders.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omada/rootfs/etc/cont-init.d/00-folders.sh b/omada/rootfs/etc/cont-init.d/00-folders.sh index 97baec389..88cd317bd 100644 --- a/omada/rootfs/etc/cont-init.d/00-folders.sh +++ b/omada/rootfs/etc/cont-init.d/00-folders.sh @@ -6,7 +6,7 @@ CONFIGSOURCE="/config/addons_config/omada" # Use ssl if [ -d /ssl ]; then mkdir -p /cert - cp /ssl/* /cert + cp /ssl/* /cert 2>/dev/null chown -R 508:508 /cert fi From a1262a4938db57309cd6bfa88fe46c45c37d3b12 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sun, 23 Oct 2022 23:00:21 +0100 Subject: [PATCH 085/243] Update config.json --- omada/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omada/config.json b/omada/config.json index 01ee60701..d981a177f 100644 --- a/omada/config.json +++ b/omada/config.json @@ -45,6 +45,6 @@ }, "slug": "omada", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "5.5-chromium-amd64-2022-10-21-2", + "version": "5.5-chromium-amd64-2022-10-21-3", "webui": "[PROTO:ssl]://[HOST]:[PORT:8088]" } From fcc8e1ba6112853c2c3e4ec10590d0d2b048f317 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Mon, 24 Oct 2022 10:25:49 +0100 Subject: [PATCH 086/243] Update config.json --- nextcloud/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nextcloud/config.json b/nextcloud/config.json index 9c6ae67e9..cf5fd26a8 100644 --- a/nextcloud/config.json +++ b/nextcloud/config.json @@ -103,6 +103,6 @@ "slug": "nextcloud_ocr", "uart": true, "url": "https://github.com/alexbelgium/hassio-addons/tree/master/nextcloud", - "version": "25.0.0-8", + "version": "25.0.0-9", "webui": "https://[HOST]:[PORT:443]" } From c9e4676953a9a6ebaed1e350b8ed45729cfbc12d Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Mon, 24 Oct 2022 23:23:02 +0100 Subject: [PATCH 087/243] Update 00-folders.sh --- omada/rootfs/etc/cont-init.d/00-folders.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omada/rootfs/etc/cont-init.d/00-folders.sh b/omada/rootfs/etc/cont-init.d/00-folders.sh index 88cd317bd..fb299cb7c 100644 --- a/omada/rootfs/etc/cont-init.d/00-folders.sh +++ b/omada/rootfs/etc/cont-init.d/00-folders.sh @@ -1,7 +1,7 @@ #!/bin/bash # shellcheck shell=bash -CONFIGSOURCE="/config/addons_config/omada" +CONFIGSOURCE="/data" # Use ssl if [ -d /ssl ]; then From 5c2f19f8c5ef1638066c32a255f511ed847b1523 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Mon, 24 Oct 2022 23:23:27 +0100 Subject: [PATCH 088/243] Switch to /data --- omada/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omada/config.json b/omada/config.json index d981a177f..5046b99e7 100644 --- a/omada/config.json +++ b/omada/config.json @@ -45,6 +45,6 @@ }, "slug": "omada", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "5.5-chromium-amd64-2022-10-21-3", + "version": "5.5-chromium-amd64-2022-10-21-4", "webui": "[PROTO:ssl]://[HOST]:[PORT:8088]" } From 088b709de66bc3551a9fdbc23597696b4c5f0ecf Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Tue, 25 Oct 2022 01:55:52 +0200 Subject: [PATCH 089/243] Updater bot : calibre updated to v6.7.1-ls189 --- calibre/CHANGELOG.md | 3 +++ calibre/config.json | 2 +- calibre/updater.json | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/calibre/CHANGELOG.md b/calibre/CHANGELOG.md index d481fc44f..8de66f9e3 100644 --- a/calibre/CHANGELOG.md +++ b/calibre/CHANGELOG.md @@ -1,4 +1,7 @@ +## v6.7.1-ls189 (25-10-2022) +- Update to latest version from linuxserver/docker-calibre + ## v6.7.1-ls188 (20-10-2022) - Update to latest version from linuxserver/docker-calibre diff --git a/calibre/config.json b/calibre/config.json index 2e9f5a7a8..7bfb770e8 100644 --- a/calibre/config.json +++ b/calibre/config.json @@ -89,6 +89,6 @@ }, "slug": "calibre", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/calibre", - "version": "v6.7.1-ls188", + "version": "v6.7.1-ls189", "video": true } diff --git a/calibre/updater.json b/calibre/updater.json index 0e389f460..6789ead9d 100644 --- a/calibre/updater.json +++ b/calibre/updater.json @@ -1,10 +1,10 @@ { "github_fulltag": "true", - "last_update": "20-10-2022", + "last_update": "25-10-2022", "paused": false, "repository": "alexbelgium/hassio-addons", "slug": "calibre", "source": "github", "upstream_repo": "linuxserver/docker-calibre", - "upstream_version": "v6.7.1-ls188" + "upstream_version": "v6.7.1-ls189" } From 0aacad7924800d9d41fe9b01d4820d9314906759 Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Tue, 25 Oct 2022 01:56:00 +0200 Subject: [PATCH 090/243] Updater bot : calibre_web updated to 0.6.19-ls180 --- calibre_web/CHANGELOG.md | 3 +++ calibre_web/config.json | 2 +- calibre_web/updater.json | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/calibre_web/CHANGELOG.md b/calibre_web/CHANGELOG.md index 7702b576e..e5a615069 100644 --- a/calibre_web/CHANGELOG.md +++ b/calibre_web/CHANGELOG.md @@ -1,4 +1,7 @@ +## 0.6.19-ls180 (25-10-2022) +- Update to latest version from linuxserver/docker-calibre-web + ## 0.6.19-ls179 (20-10-2022) - Update to latest version from linuxserver/docker-calibre-web diff --git a/calibre_web/config.json b/calibre_web/config.json index 3bffab97d..718cb6c84 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-ls179", + "version": "0.6.19-ls180", "video": true } diff --git a/calibre_web/updater.json b/calibre_web/updater.json index f848e3e02..96f228a5c 100644 --- a/calibre_web/updater.json +++ b/calibre_web/updater.json @@ -1,10 +1,10 @@ { "github_fulltag": "true", - "last_update": "20-10-2022", + "last_update": "25-10-2022", "paused": false, "repository": "alexbelgium/hassio-addons", "slug": "calibre-web", "source": "github", "upstream_repo": "linuxserver/docker-calibre-web", - "upstream_version": "0.6.19-ls179" + "upstream_version": "0.6.19-ls180" } From 2e26b9055c17533d5094daa2570b070766dc4bea Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Tue, 25 Oct 2022 01:56:33 +0200 Subject: [PATCH 091/243] Updater bot : epicgamesfree updated to ee3dff4b29757e28282cada9bcb3e8f84f1c3041-2022-10-23 --- epicgamesfree/CHANGELOG.md | 3 +++ epicgamesfree/config.json | 2 +- epicgamesfree/updater.json | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/epicgamesfree/CHANGELOG.md b/epicgamesfree/CHANGELOG.md index 1918551d0..f5db733d3 100644 --- a/epicgamesfree/CHANGELOG.md +++ b/epicgamesfree/CHANGELOG.md @@ -1,4 +1,7 @@ +## ee3dff4b29757e28282cada9bcb3e8f84f1c3041-2022-10-23 (2022-10-23) +- Update to latest version from charlocharlie/epicgames-freegames + ## 80fdb2447c8846bee011c0d6d5c44c56210cb24a-2022-09-23 (2022-09-23) - Update to latest version from charlocharlie/epicgames-freegames diff --git a/epicgamesfree/config.json b/epicgamesfree/config.json index 0f3a05b67..0f3b053da 100644 --- a/epicgamesfree/config.json +++ b/epicgamesfree/config.json @@ -19,6 +19,6 @@ }, "slug": "epicgamesfree", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "80fdb2447c8846bee011c0d6d5c44c56210cb24a-2022-09-23", + "version": "ee3dff4b29757e28282cada9bcb3e8f84f1c3041-2022-10-23", "webui": "[PROTO:ssl]://[HOST]:[PORT:3000]" } diff --git a/epicgamesfree/updater.json b/epicgamesfree/updater.json index d97564688..88aebb379 100644 --- a/epicgamesfree/updater.json +++ b/epicgamesfree/updater.json @@ -1,10 +1,10 @@ { "dockerhub_by_date": true, "dockerhub_list_size": 2, - "last_update": "2022-09-23", + "last_update": "2022-10-23", "repository": "alexbelgium/hassio-addons", "slug": "epicgamesfree", "source": "dockerhub", "upstream_repo": "charlocharlie/epicgames-freegames", - "upstream_version": "80fdb2447c8846bee011c0d6d5c44c56210cb24a-2022-09-23" + "upstream_version": "ee3dff4b29757e28282cada9bcb3e8f84f1c3041-2022-10-23" } From 4c548267c3747a79ec910ef66a8d8e41c4d384f6 Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Tue, 25 Oct 2022 01:56:51 +0200 Subject: [PATCH 092/243] Updater bot : fireflyiii_data_importer updated to version-0.9.17 --- fireflyiii_data_importer/CHANGELOG.md | 3 +++ fireflyiii_data_importer/Dockerfile | 2 +- fireflyiii_data_importer/config.json | 2 +- fireflyiii_data_importer/updater.json | 4 ++-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/fireflyiii_data_importer/CHANGELOG.md b/fireflyiii_data_importer/CHANGELOG.md index e185bae65..3f3c1c118 100644 --- a/fireflyiii_data_importer/CHANGELOG.md +++ b/fireflyiii_data_importer/CHANGELOG.md @@ -1,4 +1,7 @@ +## version-0.9.17 (25-10-2022) +- Update to latest version from fireflyiii/data-importer + ## version-0.9.16 (13-09-2022) - Update to latest version from fireflyiii/data-importer diff --git a/fireflyiii_data_importer/Dockerfile b/fireflyiii_data_importer/Dockerfile index f888a8944..040a6426a 100644 --- a/fireflyiii_data_importer/Dockerfile +++ b/fireflyiii_data_importer/Dockerfile @@ -16,7 +16,7 @@ ARG BUILD_FROM ARG BUILD_VERSION -ARG BUILD_UPSTREAM="version-0.9.16" +ARG BUILD_UPSTREAM="version-0.9.17" FROM ${BUILD_FROM} ################## diff --git a/fireflyiii_data_importer/config.json b/fireflyiii_data_importer/config.json index 9405f89fe..e63979983 100644 --- a/fireflyiii_data_importer/config.json +++ b/fireflyiii_data_importer/config.json @@ -39,6 +39,6 @@ }, "slug": "fireflyiii_data_importer", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "version-0.9.16", + "version": "version-0.9.17", "webui": "[PROTO:ssl]://[HOST]:[PORT:8080]" } diff --git a/fireflyiii_data_importer/updater.json b/fireflyiii_data_importer/updater.json index a982fbcb7..b832a18e5 100644 --- a/fireflyiii_data_importer/updater.json +++ b/fireflyiii_data_importer/updater.json @@ -1,8 +1,8 @@ { - "last_update": "13-09-2022", + "last_update": "25-10-2022", "repository": "alexbelgium/hassio-addons", "slug": "fireflyiii_data_importer", "source": "dockerhub", "upstream_repo": "fireflyiii/data-importer", - "upstream_version": "version-0.9.16" + "upstream_version": "version-0.9.17" } From aefa1a66aa673d6135d88df3ce26639287551cc3 Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Tue, 25 Oct 2022 01:56:59 +0200 Subject: [PATCH 093/243] Updater bot : flaresolverr updated to 2.2.10 --- flaresolverr/CHANGELOG.md | 3 +++ flaresolverr/config.json | 2 +- flaresolverr/updater.json | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/flaresolverr/CHANGELOG.md b/flaresolverr/CHANGELOG.md index 5ec325781..de32e8596 100644 --- a/flaresolverr/CHANGELOG.md +++ b/flaresolverr/CHANGELOG.md @@ -1,4 +1,7 @@ +## 2.2.10 (25-10-2022) +- Update to latest version from FlareSolverr/FlareSolverr + ## 2.2.9 (27-09-2022) - Update to latest version from FlareSolverr/FlareSolverr diff --git a/flaresolverr/config.json b/flaresolverr/config.json index 0e56bca25..80d33a6bb 100644 --- a/flaresolverr/config.json +++ b/flaresolverr/config.json @@ -15,6 +15,6 @@ }, "slug": "flaresolverr", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "2.2.9", + "version": "2.2.10", "webui": "[PROTO:ssl]://[HOST]:[PORT:8191]" } diff --git a/flaresolverr/updater.json b/flaresolverr/updater.json index 6f3dd1a6a..c15d2f1ab 100644 --- a/flaresolverr/updater.json +++ b/flaresolverr/updater.json @@ -1,8 +1,8 @@ { - "last_update": "27-09-2022", + "last_update": "25-10-2022", "repository": "alexbelgium/hassio-addons", "slug": "flaresolverr", "source": "github", "upstream_repo": "FlareSolverr/FlareSolverr", - "upstream_version": "2.2.9" + "upstream_version": "2.2.10" } From 719cae7fad96452fd6aaf07c2e193109ca865a85 Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Tue, 25 Oct 2022 01:57:43 +0200 Subject: [PATCH 094/243] Updater bot : jackett updated to 0.20.2158 --- jackett/CHANGELOG.md | 3 +++ jackett/config.json | 2 +- jackett/updater.json | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/jackett/CHANGELOG.md b/jackett/CHANGELOG.md index 36c2d329e..ba624ba3c 100644 --- a/jackett/CHANGELOG.md +++ b/jackett/CHANGELOG.md @@ -1,4 +1,7 @@ +## 0.20.2158 (25-10-2022) +- Update to latest version from linuxserver/docker-jackett + ## 0.20.2134 (22-10-2022) - Update to latest version from linuxserver/docker-jackett diff --git a/jackett/config.json b/jackett/config.json index 6718d155f..d84bc0fdd 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.2134", + "version": "0.20.2158", "webui": "[PROTO:ssl]://[HOST]:[PORT:9117]" } diff --git a/jackett/updater.json b/jackett/updater.json index 984f90e8c..7b3eb38e6 100644 --- a/jackett/updater.json +++ b/jackett/updater.json @@ -1,8 +1,8 @@ { - "last_update": "22-10-2022", + "last_update": "25-10-2022", "repository": "alexbelgium/hassio-addons", "slug": "jackett", "source": "github", "upstream_repo": "linuxserver/docker-jackett", - "upstream_version": "0.20.2134" + "upstream_version": "0.20.2158" } From 7540d54ddb8723d36959fdea620e298d831d7633 Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Tue, 25 Oct 2022 01:58:38 +0200 Subject: [PATCH 095/243] Updater bot : omada updated to 5.6-chromium-amd64-2022-10-24 --- omada/CHANGELOG.md | 3 +++ omada/Dockerfile | 2 +- omada/config.json | 2 +- omada/updater.json | 4 ++-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/omada/CHANGELOG.md b/omada/CHANGELOG.md index 3b2a946c1..cfc16d815 100644 --- a/omada/CHANGELOG.md +++ b/omada/CHANGELOG.md @@ -1,4 +1,7 @@ +## 5.6-chromium-amd64-2022-10-24 (2022-10-24) +- Update to latest version from mbentley/omada-controller + ## 5.5-chromium-amd64-2022-10-21 (2022-10-21) - Update to latest version from mbentley/omada-controller diff --git a/omada/Dockerfile b/omada/Dockerfile index 0778b2cce..0732dc1b6 100644 --- a/omada/Dockerfile +++ b/omada/Dockerfile @@ -16,7 +16,7 @@ ARG BUILD_FROM ARG BUILD_VERSION -ARG BUILD_UPSTREAM="5.5-chromium-amd64-2022-10-21" +ARG BUILD_UPSTREAM="5.6-chromium-amd64-2022-10-24" FROM ${BUILD_FROM} ################## diff --git a/omada/config.json b/omada/config.json index 5046b99e7..b02544a30 100644 --- a/omada/config.json +++ b/omada/config.json @@ -45,6 +45,6 @@ }, "slug": "omada", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "5.5-chromium-amd64-2022-10-21-4", + "version": "5.6-chromium-amd64-2022-10-24", "webui": "[PROTO:ssl]://[HOST]:[PORT:8088]" } diff --git a/omada/updater.json b/omada/updater.json index 19c8afa0b..1e54e75d0 100644 --- a/omada/updater.json +++ b/omada/updater.json @@ -1,9 +1,9 @@ { "dockerhub_by_date": true, - "last_update": "2022-10-21", + "last_update": "2022-10-24", "repository": "alexbelgium/hassio-addons", "slug": "omada", "source": "dockerhub", "upstream_repo": "mbentley/omada-controller", - "upstream_version": "5.5-chromium-amd64-2022-10-21" + "upstream_version": "5.6-chromium-amd64-2022-10-24" } From f02593d37f7ed97219f98c5305d6a61e02c29e8b Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Tue, 25 Oct 2022 01:58:45 +0200 Subject: [PATCH 096/243] Updater bot : omada_v3 updated to 5.6-chromium-amd64-2022-10-24 --- omada_v3/CHANGELOG.md | 3 +++ omada_v3/Dockerfile | 2 +- omada_v3/config.json | 2 +- omada_v3/updater.json | 4 ++-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/omada_v3/CHANGELOG.md b/omada_v3/CHANGELOG.md index 3b2a946c1..cfc16d815 100644 --- a/omada_v3/CHANGELOG.md +++ b/omada_v3/CHANGELOG.md @@ -1,4 +1,7 @@ +## 5.6-chromium-amd64-2022-10-24 (2022-10-24) +- Update to latest version from mbentley/omada-controller + ## 5.5-chromium-amd64-2022-10-21 (2022-10-21) - Update to latest version from mbentley/omada-controller diff --git a/omada_v3/Dockerfile b/omada_v3/Dockerfile index edd5229c7..17e4c3278 100644 --- a/omada_v3/Dockerfile +++ b/omada_v3/Dockerfile @@ -16,7 +16,7 @@ ARG BUILD_FROM ARG BUILD_VERSION -ARG BUILD_UPSTREAM="5.5-chromium-amd64-2022-10-21" +ARG BUILD_UPSTREAM="5.6-chromium-amd64-2022-10-24" FROM ${BUILD_FROM} ################## diff --git a/omada_v3/config.json b/omada_v3/config.json index 3102113dd..099fd0592 100644 --- a/omada_v3/config.json +++ b/omada_v3/config.json @@ -45,6 +45,6 @@ }, "slug": "omada_v3", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "5.5-chromium-amd64-2022-10-21", + "version": "5.6-chromium-amd64-2022-10-24", "webui": "[PROTO:ssl]://[HOST]:[PORT:8088]" } diff --git a/omada_v3/updater.json b/omada_v3/updater.json index 29c18d8de..c55e1d2aa 100644 --- a/omada_v3/updater.json +++ b/omada_v3/updater.json @@ -1,9 +1,9 @@ { "dockerhub_by_date": true, - "last_update": "2022-10-21", + "last_update": "2022-10-24", "repository": "alexbelgium/hassio-addons", "slug": "omada_v3", "source": "dockerhub", "upstream_repo": "mbentley/omada-controller", - "upstream_version": "5.5-chromium-amd64-2022-10-21" + "upstream_version": "5.6-chromium-amd64-2022-10-24" } From 67e6824d63762c3b64f3a13e43bf9547196dbead Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Tue, 25 Oct 2022 01:59:30 +0200 Subject: [PATCH 097/243] Updater bot : piwigo updated to 13.1.0 --- piwigo/CHANGELOG.md | 3 +++ piwigo/config.json | 2 +- piwigo/updater.json | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/piwigo/CHANGELOG.md b/piwigo/CHANGELOG.md index 69b646550..4b2261cbe 100644 --- a/piwigo/CHANGELOG.md +++ b/piwigo/CHANGELOG.md @@ -1,4 +1,7 @@ +## 13.1.0 (25-10-2022) +- Update to latest version from linuxserver/docker-piwigo + ## 13.0.0 (13-10-2022) - Update to latest version from linuxserver/docker-piwigo diff --git a/piwigo/config.json b/piwigo/config.json index 6c31c35fc..74811e75b 100644 --- a/piwigo/config.json +++ b/piwigo/config.json @@ -77,6 +77,6 @@ "slug": "piwigo", "stage": "experimental", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "13.0.0", + "version": "13.1.0", "webui": "[PROTO:ssl]://[HOST]:[PORT:80]" } diff --git a/piwigo/updater.json b/piwigo/updater.json index 583219de5..fa8e444c5 100644 --- a/piwigo/updater.json +++ b/piwigo/updater.json @@ -1,8 +1,8 @@ { - "last_update": "13-10-2022", + "last_update": "25-10-2022", "repository": "alexbelgium/hassio-addons", "slug": "piwigo", "source": "github", "upstream_repo": "linuxserver/docker-piwigo", - "upstream_version": "13.0.0" + "upstream_version": "13.1.0" } From 5d019a2798f0a58b2b66e6d05820592354b14874 Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Tue, 25 Oct 2022 01:59:38 +0200 Subject: [PATCH 098/243] Updater bot : plex updated to 1.29.1.6316-f4cdfea9c-ls140 --- plex/CHANGELOG.md | 3 +++ plex/config.json | 2 +- plex/updater.json | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/plex/CHANGELOG.md b/plex/CHANGELOG.md index f99e79a4f..2244cb9b1 100644 --- a/plex/CHANGELOG.md +++ b/plex/CHANGELOG.md @@ -1,4 +1,7 @@ +## 1.29.1.6316-f4cdfea9c-ls140 (25-10-2022) +- Update to latest version from linuxserver/docker-plex + ## 1.29.1.6316-f4cdfea9c-ls139 (22-10-2022) - Update to latest version from linuxserver/docker-plex diff --git a/plex/config.json b/plex/config.json index c56e01eb3..576e11544 100644 --- a/plex/config.json +++ b/plex/config.json @@ -115,7 +115,7 @@ }, "slug": "plex_nas", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/plex", - "version": "1.29.1.6316-f4cdfea9c-ls139-4", + "version": "1.29.1.6316-f4cdfea9c-ls140", "video": true, "webui": "[PROTO:ssl]://[HOST]:[PORT:32400]/web" } diff --git a/plex/updater.json b/plex/updater.json index cca9bf813..facb1335d 100644 --- a/plex/updater.json +++ b/plex/updater.json @@ -1,9 +1,9 @@ { "github_fulltag": "true", - "last_update": "22-10-2022", + "last_update": "25-10-2022", "repository": "alexbelgium/hassio-addons", "slug": "plex", "source": "github", "upstream_repo": "linuxserver/docker-plex", - "upstream_version": "1.29.1.6316-f4cdfea9c-ls139" + "upstream_version": "1.29.1.6316-f4cdfea9c-ls140" } From a3c7ce6f607391474ae0107b160dcdf0e7be3cb1 Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Tue, 25 Oct 2022 02:00:07 +0200 Subject: [PATCH 099/243] Updater bot : qbittorrent updated to 4.4.5-r2-ls224 --- qbittorrent/CHANGELOG.md | 3 +++ qbittorrent/Dockerfile | 2 +- qbittorrent/config.json | 2 +- qbittorrent/updater.json | 4 ++-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/qbittorrent/CHANGELOG.md b/qbittorrent/CHANGELOG.md index a96dafb4b..be1826125 100644 --- a/qbittorrent/CHANGELOG.md +++ b/qbittorrent/CHANGELOG.md @@ -1,4 +1,7 @@ +## 4.4.5-r2-ls224 (25-10-2022) +- Update to latest version from linuxserver/docker-qbittorrent + ## 4.4.5-r1-ls223 (20-10-2022) - Update to latest version from linuxserver/docker-qbittorrent diff --git a/qbittorrent/Dockerfile b/qbittorrent/Dockerfile index 9122e20fa..f93d980dc 100644 --- a/qbittorrent/Dockerfile +++ b/qbittorrent/Dockerfile @@ -16,7 +16,7 @@ ARG BUILD_FROM ARG BUILD_VERSION -ARG BUILD_UPSTREAM="4.4.5-r1-ls223" +ARG BUILD_UPSTREAM="4.4.5-r2-ls224" FROM ${BUILD_FROM}-$BUILD_UPSTREAM ################## diff --git a/qbittorrent/config.json b/qbittorrent/config.json index 111d756f6..2fbbafe88 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-r1-ls223" + "version": "4.4.5-r2-ls224" } diff --git a/qbittorrent/updater.json b/qbittorrent/updater.json index f650ec196..65eed68a7 100644 --- a/qbittorrent/updater.json +++ b/qbittorrent/updater.json @@ -1,9 +1,9 @@ { "github_fulltag": "true", - "last_update": "20-10-2022", + "last_update": "25-10-2022", "repository": "alexbelgium/hassio-addons", "slug": "qbittorrent", "source": "github", "upstream_repo": "linuxserver/docker-qbittorrent", - "upstream_version": "4.4.5-r1-ls223" + "upstream_version": "4.4.5-r2-ls224" } From feb83f74e74280facc8acce2f5a35312799695ee Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Tue, 25 Oct 2022 02:01:54 +0200 Subject: [PATCH 100/243] Updater bot : webtop_kde updated to 4.16-r0-ls75 --- webtop_kde/CHANGELOG.md | 3 +++ webtop_kde/config.json | 2 +- webtop_kde/updater.json | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/webtop_kde/CHANGELOG.md b/webtop_kde/CHANGELOG.md index 250174dad..42321df70 100644 --- a/webtop_kde/CHANGELOG.md +++ b/webtop_kde/CHANGELOG.md @@ -1,4 +1,7 @@ +## 4.16-r0-ls75 (25-10-2022) +- Update to latest version from linuxserver/docker-webtop + ## 4.16-r0-ls74 (20-10-2022) - Update to latest version from linuxserver/docker-webtop diff --git a/webtop_kde/config.json b/webtop_kde/config.json index 7e75eaca7..aff66d3cf 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-ls74", + "version": "4.16-r0-ls75", "video": true } diff --git a/webtop_kde/updater.json b/webtop_kde/updater.json index 427f449ed..6037d82a1 100644 --- a/webtop_kde/updater.json +++ b/webtop_kde/updater.json @@ -1,9 +1,9 @@ { "github_fulltag": "true", - "last_update": "20-10-2022", + "last_update": "25-10-2022", "repository": "alexbelgium/hassio-addons", "slug": "webtop_kde", "source": "github", "upstream_repo": "linuxserver/docker-webtop", - "upstream_version": "4.16-r0-ls74" + "upstream_version": "4.16-r0-ls75" } From cf09803ecf9ab6d94f3e423b63a53c09905d8264 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 25 Oct 2022 06:52:45 +0100 Subject: [PATCH 101/243] Update Dockerfile --- webtop_kde/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webtop_kde/Dockerfile b/webtop_kde/Dockerfile index 4e495980f..a68406a33 100644 --- a/webtop_kde/Dockerfile +++ b/webtop_kde/Dockerfile @@ -34,7 +34,7 @@ RUN \ usermod --home /share/webtop_kde abc \ \ # Correct error in upstream image - && sed -i 's|startwm |startwm.sh |g' /etc/cont-init.d/30-config \ + && for file in $(grep -srl "startwm " /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/startwm /startwm.sh /g' "$file"; done \ \ # Update distribution # hadolint ignore=DL3017 From d43abdf277336a6c130652c7b6e984940270061c Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 25 Oct 2022 06:53:30 +0100 Subject: [PATCH 102/243] Adapt to upstream --- webtop_kde/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webtop_kde/config.json b/webtop_kde/config.json index aff66d3cf..02b4b2c0e 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-ls75", + "version": "4.16-r0-ls75-2", "video": true } From 79da409c29e56176fa3565447108d5b7d0c43d78 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 25 Oct 2022 07:14:11 +0100 Subject: [PATCH 103/243] Update 80-configuration.sh --- webtop_kde/rootfs/etc/cont-init.d/80-configuration.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webtop_kde/rootfs/etc/cont-init.d/80-configuration.sh b/webtop_kde/rootfs/etc/cont-init.d/80-configuration.sh index 1f3eabaa7..2ad700137 100644 --- a/webtop_kde/rootfs/etc/cont-init.d/80-configuration.sh +++ b/webtop_kde/rootfs/etc/cont-init.d/80-configuration.sh @@ -47,7 +47,7 @@ fi if bashio::config.has_value 'KEYBOARD'; then KEYBOARD=$(bashio::config 'KEYBOARD') bashio::log.info "Setting keyboard to $KEYBOARD" - sed -i "1a export KEYBOARD=$KEYBOARD" /etc/services.d/web/run + sed -i "1a export KEYBOARD=$KEYBOARD" /etc/s6-overlay/s6-rc.d/svc-web/run fi # Set password From 31f5290f665f0265dc378b624b3178b137b58c50 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 25 Oct 2022 07:15:56 +0100 Subject: [PATCH 104/243] Update 00-data_location.sh --- webtop_kde/rootfs/etc/cont-init.d/00-data_location.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/webtop_kde/rootfs/etc/cont-init.d/00-data_location.sh b/webtop_kde/rootfs/etc/cont-init.d/00-data_location.sh index 2475f9d73..4bf5c02da 100644 --- a/webtop_kde/rootfs/etc/cont-init.d/00-data_location.sh +++ b/webtop_kde/rootfs/etc/cont-init.d/00-data_location.sh @@ -31,11 +31,12 @@ fi # Set data location bashio::log.info "Setting data location to $LOCATION" -sed -i "1a export HOME=$LOCATION" /etc/services.d/web/run -sed -i "1a export FM_HOME=$LOCATION" /etc/services.d/web/run +sed -i "1a export HOME=$LOCATION" /etc/s6-overlay/s6-rc.d/svc-web/run +sed -i "1a export FM_HOME=$LOCATION" /etc/s6-overlay/s6-rc.d/svc-web/run sed -i "s|/share/webtop_kde|$LOCATION|g" /defaults/* sed -i "s|/share/webtop_kde|$LOCATION|g" /etc/cont-init.d/* sed -i "s|/share/webtop_kde|$LOCATION|g" /etc/services.d/*/run +sed -i "s|/share/webtop_kde|$LOCATION|g" /etc/s6-overlay/s6-rc.d/*/run usermod --home "$LOCATION" abc # Create folder From ddcd2950526f98e1e20179ce57804dde7af8fc3a Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 25 Oct 2022 07:21:47 +0100 Subject: [PATCH 105/243] Update 90-ingress.sh --- webtop_kde/rootfs/etc/cont-init.d/90-ingress.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webtop_kde/rootfs/etc/cont-init.d/90-ingress.sh b/webtop_kde/rootfs/etc/cont-init.d/90-ingress.sh index 2aba20d0a..b2f8e2865 100644 --- a/webtop_kde/rootfs/etc/cont-init.d/90-ingress.sh +++ b/webtop_kde/rootfs/etc/cont-init.d/90-ingress.sh @@ -33,4 +33,4 @@ sed -i "s/%%port%%/${ingress_port}/g" /etc/nginx/servers/ingress.conf sed -i "s/%%interface%%/${ingress_interface}/g" /etc/nginx/servers/ingress.conf # Implement SUBFOLDER value -sed -i "1a SUBFOLDER=$(bashio::addon.ingress_url)" /etc/services.d/autostart/run +sed -i "1a SUBFOLDER=$(bashio::addon.ingress_url)" /etc/services.d/autostart/run /etc/s6-overlay/s6-rc.d/*/run From b2b2829ea7c959061de3f291b6c718063491f877 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 25 Oct 2022 07:22:08 +0100 Subject: [PATCH 106/243] Update config.json --- webtop_kde/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webtop_kde/config.json b/webtop_kde/config.json index 02b4b2c0e..94a196c53 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-ls75-2", + "version": "4.16-r0-ls75-3", "video": true } From d90b43b502a9e3d0625323136d9ac351d9b8a05e Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 25 Oct 2022 07:47:49 +0100 Subject: [PATCH 107/243] Update 90-ingress.sh --- webtop_kde/rootfs/etc/cont-init.d/90-ingress.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webtop_kde/rootfs/etc/cont-init.d/90-ingress.sh b/webtop_kde/rootfs/etc/cont-init.d/90-ingress.sh index b2f8e2865..e8902cbd1 100644 --- a/webtop_kde/rootfs/etc/cont-init.d/90-ingress.sh +++ b/webtop_kde/rootfs/etc/cont-init.d/90-ingress.sh @@ -33,4 +33,4 @@ sed -i "s/%%port%%/${ingress_port}/g" /etc/nginx/servers/ingress.conf sed -i "s/%%interface%%/${ingress_interface}/g" /etc/nginx/servers/ingress.conf # Implement SUBFOLDER value -sed -i "1a SUBFOLDER=$(bashio::addon.ingress_url)" /etc/services.d/autostart/run /etc/s6-overlay/s6-rc.d/*/run +sed -i "1a SUBFOLDER=$(bashio::addon.ingress_url)" /etc/s6-overlay/s6-rc.d/*/run From 773915ddab872f7afaaab1e4f2a175c30a32305d Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 25 Oct 2022 07:48:23 +0100 Subject: [PATCH 108/243] Update config.json --- webtop_kde/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webtop_kde/config.json b/webtop_kde/config.json index 94a196c53..5e1c132fb 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-ls75-3", + "version": "4.16-r0-ls75-4", "video": true } From b98c727caea8d97c28e3c20b7d011c082cc08e43 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 25 Oct 2022 08:20:59 +0100 Subject: [PATCH 109/243] Update 90-ingress.sh --- webtop_kde/rootfs/etc/cont-init.d/90-ingress.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webtop_kde/rootfs/etc/cont-init.d/90-ingress.sh b/webtop_kde/rootfs/etc/cont-init.d/90-ingress.sh index e8902cbd1..36fb0dd88 100644 --- a/webtop_kde/rootfs/etc/cont-init.d/90-ingress.sh +++ b/webtop_kde/rootfs/etc/cont-init.d/90-ingress.sh @@ -33,4 +33,4 @@ sed -i "s/%%port%%/${ingress_port}/g" /etc/nginx/servers/ingress.conf sed -i "s/%%interface%%/${ingress_interface}/g" /etc/nginx/servers/ingress.conf # Implement SUBFOLDER value -sed -i "1a SUBFOLDER=$(bashio::addon.ingress_url)" /etc/s6-overlay/s6-rc.d/*/run +sed -i "1a SUBFOLDER=$(bashio::addon.ingress_url)" /s6-overlay/s6-rc.d/svc-autostart/run From 304aeebfeab2b77eb37f778954f8daa32794b706 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 25 Oct 2022 08:27:42 +0100 Subject: [PATCH 110/243] Update 00-data_location.sh --- webtop_kde/rootfs/etc/cont-init.d/00-data_location.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/webtop_kde/rootfs/etc/cont-init.d/00-data_location.sh b/webtop_kde/rootfs/etc/cont-init.d/00-data_location.sh index 4bf5c02da..7222e456e 100644 --- a/webtop_kde/rootfs/etc/cont-init.d/00-data_location.sh +++ b/webtop_kde/rootfs/etc/cont-init.d/00-data_location.sh @@ -31,12 +31,13 @@ fi # Set data location bashio::log.info "Setting data location to $LOCATION" -sed -i "1a export HOME=$LOCATION" /etc/s6-overlay/s6-rc.d/svc-web/run -sed -i "1a export FM_HOME=$LOCATION" /etc/s6-overlay/s6-rc.d/svc-web/run -sed -i "s|/share/webtop_kde|$LOCATION|g" /defaults/* + +sed -i "1a export HOME=$LOCATION" /etc/s6-overlay/s6-rc.d/svc-web/run || true +sed -i "1a export FM_HOME=$LOCATION" /etc/s6-overlay/s6-rc.d/svc-web/run || true +sed -i "s|/share/webtop_kde|$LOCATION|g" /defaults/* || true +sed -i "s|/share/webtop_kde|$LOCATION|g" /etc/s6-overlay/s6-rc.d/*/* || true +sed -i "s|/share/webtop_kde|$LOCATION|g" /etc/s6-overlay/s6-rc.d/*/run || true sed -i "s|/share/webtop_kde|$LOCATION|g" /etc/cont-init.d/* -sed -i "s|/share/webtop_kde|$LOCATION|g" /etc/services.d/*/run -sed -i "s|/share/webtop_kde|$LOCATION|g" /etc/s6-overlay/s6-rc.d/*/run usermod --home "$LOCATION" abc # Create folder From 83af7d019b8c6ff5d0215b34469cc3c6b35fdacf Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 25 Oct 2022 08:28:37 +0100 Subject: [PATCH 111/243] Update config.json --- webtop_kde/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webtop_kde/config.json b/webtop_kde/config.json index 5e1c132fb..f2076c0eb 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-ls75-4", + "version": "4.16-r0-ls75-5", "video": true } From f142eed0a91bd5f08384034d21c7d59fb2c58c89 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 25 Oct 2022 10:20:43 +0100 Subject: [PATCH 112/243] Update Dockerfile --- webtop_kde/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webtop_kde/Dockerfile b/webtop_kde/Dockerfile index a68406a33..ea7d89b29 100644 --- a/webtop_kde/Dockerfile +++ b/webtop_kde/Dockerfile @@ -34,7 +34,7 @@ RUN \ usermod --home /share/webtop_kde abc \ \ # Correct error in upstream image - && for file in $(grep -srl "startwm " /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/startwm /startwm.sh /g' "$file"; done \ + && for file in $(grep -srl "startwm " /etc); do sed -i 's/startwm /startwm.sh /g' "$file"; done \ \ # Update distribution # hadolint ignore=DL3017 From 9f911dfd450d4c76867f3d1af1721793e32227c5 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 25 Oct 2022 10:21:49 +0100 Subject: [PATCH 113/243] Update config.json --- webtop_kde/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webtop_kde/config.json b/webtop_kde/config.json index f2076c0eb..934cbb0d0 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-ls75-5", + "version": "4.16-r0-ls75-6", "video": true } From 1fdbd8983562cf0f8f4d7ddfc63b21c9d313d553 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 25 Oct 2022 11:04:30 +0000 Subject: [PATCH 114/243] Github bot : issues linked to readme --- plex/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/plex/README.md b/plex/README.md index dd2914348..24ed1e3a4 100644 --- a/plex/README.md +++ b/plex/README.md @@ -1,3 +1,4 @@ +## ⚠ Open Issue : [🐛 [Plex NAS] Issue description (opened 2022-10-22)](https://github.com/alexbelgium/hassio-addons/issues/525) by [@NPC-112](https://github.com/NPC-112) # Home assistant add-on: plex [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) From 180addc956d02253a74262e656fcdc1e1ec516da Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 25 Oct 2022 19:40:07 +0100 Subject: [PATCH 115/243] Switch to image build --- joal/config.json | 1 + 1 file changed, 1 insertion(+) diff --git a/joal/config.json b/joal/config.json index 6f6942cdd..029d0134e 100644 --- a/joal/config.json +++ b/joal/config.json @@ -7,6 +7,7 @@ "codenotary": "alexandrep.github@gmail.com", "description": "An open source command line RatioMaster with WebUI", "hassio_api": true, + "image": "ghcr.io/alexbelgium/joal-{arch}", "ingress": true, "map": [ "config:rw" From eb4485f5155fbf5355f090d6d38dace5c5165f86 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 25 Oct 2022 19:40:34 +0100 Subject: [PATCH 116/243] Update config.json --- joal/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/joal/config.json b/joal/config.json index 029d0134e..3439bcea0 100644 --- a/joal/config.json +++ b/joal/config.json @@ -35,5 +35,5 @@ }, "slug": "joal", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "2.1.31" + "version": "2.1.31-2" } From fcea0f3c09700b5e1e21c310f65eb5e851d70b65 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 25 Oct 2022 19:54:55 +0100 Subject: [PATCH 117/243] Switch to image --- emby/config.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/emby/config.json b/emby/config.json index 4b1e456e1..9480e817c 100644 --- a/emby/config.json +++ b/emby/config.json @@ -60,6 +60,7 @@ "/dev/nvme2" ], "host_network": true, + "image": "ghcr.io/alexbelgium/emby-{arch}", "ingress": true, "ingress_port": 0, "ingress_stream": true, @@ -107,6 +108,6 @@ }, "slug": "emby_nas", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/emby", - "version": "4.8.0.13", + "version": "4.8.0.13-image", "video": true } From 9a06fb5516e95a52374774b7c362ca0215ef45a7 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 25 Oct 2022 23:00:34 +0100 Subject: [PATCH 118/243] Revert --- emby/config.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/emby/config.json b/emby/config.json index 9480e817c..4b1e456e1 100644 --- a/emby/config.json +++ b/emby/config.json @@ -60,7 +60,6 @@ "/dev/nvme2" ], "host_network": true, - "image": "ghcr.io/alexbelgium/emby-{arch}", "ingress": true, "ingress_port": 0, "ingress_stream": true, @@ -108,6 +107,6 @@ }, "slug": "emby_nas", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/emby", - "version": "4.8.0.13-image", + "version": "4.8.0.13", "video": true } From ff5e9c7775c5eb9c9c436fc86a0454e4902a521b Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 25 Oct 2022 23:01:11 +0100 Subject: [PATCH 119/243] Revert --- joal/config.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/joal/config.json b/joal/config.json index 3439bcea0..6f6942cdd 100644 --- a/joal/config.json +++ b/joal/config.json @@ -7,7 +7,6 @@ "codenotary": "alexandrep.github@gmail.com", "description": "An open source command line RatioMaster with WebUI", "hassio_api": true, - "image": "ghcr.io/alexbelgium/joal-{arch}", "ingress": true, "map": [ "config:rw" @@ -35,5 +34,5 @@ }, "slug": "joal", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "2.1.31-2" + "version": "2.1.31" } From c6278545c0892650af141ecdd3e81eb3f8f3b9fd Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Wed, 26 Oct 2022 09:43:17 +0100 Subject: [PATCH 120/243] New s6 --- emby/rootfs/etc/cont-init.d/91-silent.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/emby/rootfs/etc/cont-init.d/91-silent.sh b/emby/rootfs/etc/cont-init.d/91-silent.sh index 74bc2dcca..109d4d0b4 100644 --- a/emby/rootfs/etc/cont-init.d/91-silent.sh +++ b/emby/rootfs/etc/cont-init.d/91-silent.sh @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bashio +É#!/usr/bin/with-contenv bashio # shellcheck shell=bash ############### @@ -7,6 +7,6 @@ if bashio::config.true 'silent'; then APPEND=' > /dev/null' - sed -i '$s|$|'"$APPEND"'|' /etc/services.d/*/run + sed -i '$s|$|'"$APPEND"'|' /etc/s6-overlay/s6-rc.d/*/run bashio::log.info 'Silent mode activated, all logs from emby server are hidden. Disable this option if you need to troubleshoot the addon.' fi From c28914ec76687c6595d720bb281ab70cb9bff32b Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Thu, 27 Oct 2022 01:55:59 +0200 Subject: [PATCH 121/243] Updater bot : calibre_web updated to 0.6.19-ls181 --- calibre_web/CHANGELOG.md | 3 +++ calibre_web/config.json | 2 +- calibre_web/updater.json | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/calibre_web/CHANGELOG.md b/calibre_web/CHANGELOG.md index e5a615069..1ee649fbb 100644 --- a/calibre_web/CHANGELOG.md +++ b/calibre_web/CHANGELOG.md @@ -1,4 +1,7 @@ +## 0.6.19-ls181 (27-10-2022) +- Update to latest version from linuxserver/docker-calibre-web + ## 0.6.19-ls180 (25-10-2022) - Update to latest version from linuxserver/docker-calibre-web diff --git a/calibre_web/config.json b/calibre_web/config.json index 718cb6c84..9e89a6763 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-ls180", + "version": "0.6.19-ls181", "video": true } diff --git a/calibre_web/updater.json b/calibre_web/updater.json index 96f228a5c..9bd943561 100644 --- a/calibre_web/updater.json +++ b/calibre_web/updater.json @@ -1,10 +1,10 @@ { "github_fulltag": "true", - "last_update": "25-10-2022", + "last_update": "27-10-2022", "paused": false, "repository": "alexbelgium/hassio-addons", "slug": "calibre-web", "source": "github", "upstream_repo": "linuxserver/docker-calibre-web", - "upstream_version": "0.6.19-ls180" + "upstream_version": "0.6.19-ls181" } From 447ea10685abb69e4957ef77a7a3cce3a86acd8c Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Thu, 27 Oct 2022 01:56:14 +0200 Subject: [PATCH 122/243] Updater bot : code-server updated to 4.8.0 --- code-server/CHANGELOG.md | 3 +++ code-server/config.json | 2 +- code-server/updater.json | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/code-server/CHANGELOG.md b/code-server/CHANGELOG.md index c6ac31b64..e76c15437 100644 --- a/code-server/CHANGELOG.md +++ b/code-server/CHANGELOG.md @@ -1,4 +1,7 @@ +## 4.8.0 (27-10-2022) +- Update to latest version from linuxserver/docker-code-server + ## 4.7.1 (01-10-2022) - Update to latest version from linuxserver/docker-code-server diff --git a/code-server/config.json b/code-server/config.json index 0d3a6a7f2..6a539d256 100644 --- a/code-server/config.json +++ b/code-server/config.json @@ -74,6 +74,6 @@ }, "slug": "code-server", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/coder-server", - "version": "4.7.1", + "version": "4.8.0", "webui": "[PROTO:ssl]://[HOST]:[PORT:8443]" } diff --git a/code-server/updater.json b/code-server/updater.json index dcad6b275..1c24d3469 100644 --- a/code-server/updater.json +++ b/code-server/updater.json @@ -1,8 +1,8 @@ { - "last_update": "01-10-2022", + "last_update": "27-10-2022", "repository": "alexbelgium/hassio-addons", "slug": "code-server", "source": "github", "upstream_repo": "linuxserver/docker-code-server", - "upstream_version": "4.7.1" + "upstream_version": "4.8.0" } From 4c3294f127a62c7cf04cbd3215fac35afbbbe573 Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Thu, 27 Oct 2022 01:56:58 +0200 Subject: [PATCH 123/243] Updater bot : flexget updated to 3.4.0 --- flexget/CHANGELOG.md | 3 +++ flexget/config.json | 2 +- flexget/updater.json | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/flexget/CHANGELOG.md b/flexget/CHANGELOG.md index 4a1ea295b..6d8c2df44 100644 --- a/flexget/CHANGELOG.md +++ b/flexget/CHANGELOG.md @@ -1,4 +1,7 @@ +## 3.4.0 (27-10-2022) +- Update to latest version from wiserain/flexget + ## 3.3.39 (22-10-2022) - Update to latest version from wiserain/flexget diff --git a/flexget/config.json b/flexget/config.json index 83293967f..b882b1109 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.39", + "version": "3.4.0", "webui": "[PROTO:ssl]://[HOST]:[PORT:5050]" } diff --git a/flexget/updater.json b/flexget/updater.json index 8b9f8fadf..2fad90fc6 100644 --- a/flexget/updater.json +++ b/flexget/updater.json @@ -1,8 +1,8 @@ { - "last_update": "22-10-2022", + "last_update": "27-10-2022", "repository": "alexbelgium/hassio-addons", "slug": "flexget", "source": "dockerhub", "upstream_repo": "wiserain/flexget", - "upstream_version": "3.3.39" + "upstream_version": "3.4.0" } From 8e619f0ac820f8ea1df25b78c05eb37c6dc19ce9 Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Thu, 27 Oct 2022 01:57:39 +0200 Subject: [PATCH 124/243] Updater bot : jackett updated to 0.20.2167 --- jackett/CHANGELOG.md | 3 +++ jackett/config.json | 2 +- jackett/updater.json | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/jackett/CHANGELOG.md b/jackett/CHANGELOG.md index ba624ba3c..fabbfb8d2 100644 --- a/jackett/CHANGELOG.md +++ b/jackett/CHANGELOG.md @@ -1,4 +1,7 @@ +## 0.20.2167 (27-10-2022) +- Update to latest version from linuxserver/docker-jackett + ## 0.20.2158 (25-10-2022) - Update to latest version from linuxserver/docker-jackett diff --git a/jackett/config.json b/jackett/config.json index d84bc0fdd..bb6b34cb2 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.2158", + "version": "0.20.2167", "webui": "[PROTO:ssl]://[HOST]:[PORT:9117]" } diff --git a/jackett/updater.json b/jackett/updater.json index 7b3eb38e6..4c6991c31 100644 --- a/jackett/updater.json +++ b/jackett/updater.json @@ -1,8 +1,8 @@ { - "last_update": "25-10-2022", + "last_update": "27-10-2022", "repository": "alexbelgium/hassio-addons", "slug": "jackett", "source": "github", "upstream_repo": "linuxserver/docker-jackett", - "upstream_version": "0.20.2158" + "upstream_version": "0.20.2167" } From d942f80b09336d21a10f09b3e9e12e82131bcce3 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Thu, 27 Oct 2022 03:38:35 +0100 Subject: [PATCH 125/243] Correct --- flexget/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flexget/Dockerfile b/flexget/Dockerfile index 6ee95b844..93680c5aa 100644 --- a/flexget/Dockerfile +++ b/flexget/Dockerfile @@ -32,10 +32,10 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] # hadolint ignore=SC2016 RUN \ # Set password - files="$(grep -sril "set FG_WEBUI_PASSWD" /etc/cont-init.d /etc/s6-overlay/s6-rc.d)" \ - && sed -i 's/bash/bashio/g' "$files" \ - && sed -i 's/# set FG_WEBUI_PASSWD/if bashio::config.has_value "WebuiPass"; then FG_WEBUI_PASSWD=$(bashio::config "WebuiPass"); else FG_WEBUI_PASSWD=""; fi/g' "$files" \ - && sed -i 's/# install custom plugins/if bashio::config.has_value "FG_PLUGINS"; then FG_PLUGINS=$(bashio::config "FG_PLUGINS"); else FG_PLUGINS=""; fi/g' "$files" + files=$(grep -sril "set FG_WEBUI_PASSWD" /etc/cont-init.d /etc/s6-overlay/s6-rc.d) \ + && sed -i 's/bash/bashio/g' $files \ + && sed -i 's/# set FG_WEBUI_PASSWD/if bashio::config.has_value "WebuiPass"; then FG_WEBUI_PASSWD=$(bashio::config "WebuiPass"); else FG_WEBUI_PASSWD=""; fi/g' $files \ + && sed -i 's/# install custom plugins/if bashio::config.has_value "FG_PLUGINS"; then FG_PLUGINS=$(bashio::config "FG_PLUGINS"); else FG_PLUGINS=""; fi/g' $files # Global LSIO modifications ARG CONFIGLOCATION="/config/addons_config/flexget" From 99ed6fc5e2e46c621cfcca5c1e737dc0deabb363 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Thu, 27 Oct 2022 03:41:08 +0100 Subject: [PATCH 127/243] Update config.json --- flexget/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flexget/config.json b/flexget/config.json index b882b1109..a846875b6 100644 --- a/flexget/config.json +++ b/flexget/config.json @@ -37,6 +37,6 @@ }, "slug": "flexget", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "3.4.0", + "version": "3.4.0-2", "webui": "[PROTO:ssl]://[HOST]:[PORT:5050]" } From 7dd0e14be99b316a508a1e35d840dcc8c41e1f8b Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Thu, 27 Oct 2022 03:41:20 +0100 Subject: [PATCH 128/243] Update config.json --- flexget/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flexget/config.json b/flexget/config.json index a846875b6..b882b1109 100644 --- a/flexget/config.json +++ b/flexget/config.json @@ -37,6 +37,6 @@ }, "slug": "flexget", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "3.4.0-2", + "version": "3.4.0", "webui": "[PROTO:ssl]://[HOST]:[PORT:5050]" } From 7b18ce98ede550fa52431e4f2928ed1a6b8643e0 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Thu, 27 Oct 2022 03:54:22 +0100 Subject: [PATCH 129/243] New s6 v3 --- flexget/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flexget/Dockerfile b/flexget/Dockerfile index 93680c5aa..b5245e427 100644 --- a/flexget/Dockerfile +++ b/flexget/Dockerfile @@ -32,7 +32,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] # hadolint ignore=SC2016 RUN \ # Set password - files=$(grep -sril "set FG_WEBUI_PASSWD" /etc/cont-init.d /etc/s6-overlay/s6-rc.d) \ + files=$(grep -sril "set FG_WEBUI_PASSWD" /etc/s6-overlay/s6-rc.d) \ && sed -i 's/bash/bashio/g' $files \ && sed -i 's/# set FG_WEBUI_PASSWD/if bashio::config.has_value "WebuiPass"; then FG_WEBUI_PASSWD=$(bashio::config "WebuiPass"); else FG_WEBUI_PASSWD=""; fi/g' $files \ && sed -i 's/# install custom plugins/if bashio::config.has_value "FG_PLUGINS"; then FG_PLUGINS=$(bashio::config "FG_PLUGINS"); else FG_PLUGINS=""; fi/g' $files From ba760bc9f792ad010e24b19215234475d437cff7 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Thu, 27 Oct 2022 03:54:44 +0100 Subject: [PATCH 130/243] Update config.json --- flexget/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flexget/config.json b/flexget/config.json index b882b1109..a846875b6 100644 --- a/flexget/config.json +++ b/flexget/config.json @@ -37,6 +37,6 @@ }, "slug": "flexget", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "3.4.0", + "version": "3.4.0-2", "webui": "[PROTO:ssl]://[HOST]:[PORT:5050]" } From 2e424e5c72fbaca7e09fda9d0f96ed658a649919 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 27 Oct 2022 12:24:58 +0000 Subject: [PATCH 131/243] Github bot : issues linked to readme --- qbittorrent/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/qbittorrent/README.md b/qbittorrent/README.md index 5000edc26..3ff999d43 100644 --- a/qbittorrent/README.md +++ b/qbittorrent/README.md @@ -1,3 +1,4 @@ +## ⚠ Open Issue : [2 "Bug" for the QBitTorrent web ui (opened 2022-10-25)](https://github.com/alexbelgium/hassio-addons/issues/527) by [@SiriosDev](https://github.com/SiriosDev) # Home assistant add-on: qbittorrent [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) From 811f483915c9619176d7a09e2a1be35ca2efbadc Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 27 Oct 2022 12:43:49 +0000 Subject: [PATCH 132/243] Github bot : issues linked to readme --- qbittorrent/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qbittorrent/README.md b/qbittorrent/README.md index 3ff999d43..2d0c6129f 100644 --- a/qbittorrent/README.md +++ b/qbittorrent/README.md @@ -1,4 +1,4 @@ -## ⚠ Open Issue : [2 "Bug" for the QBitTorrent web ui (opened 2022-10-25)](https://github.com/alexbelgium/hassio-addons/issues/527) by [@SiriosDev](https://github.com/SiriosDev) +## ⚠ Open Issue : [QBitTorrent web ui issue (opened 2022-10-25)](https://github.com/alexbelgium/hassio-addons/issues/527) by [@SiriosDev](https://github.com/SiriosDev) # Home assistant add-on: qbittorrent [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) From a096071a9774f91810f7caa0d5ff33f3b42bbf27 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Fri, 28 Oct 2022 08:17:40 +0100 Subject: [PATCH 133/243] Allow custom ui https://github.com/alexbelgium/hassio-addons/issues/527 --- qbittorrent/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qbittorrent/config.json b/qbittorrent/config.json index 2fbbafe88..42b84b89b 100644 --- a/qbittorrent/config.json +++ b/qbittorrent/config.json @@ -98,7 +98,7 @@ "cifsdomain": "str?", "cifspassword": "str?", "cifsusername": "str?", - "customUI": "list(default|vuetorrent|qbit-matUI|qb-web)?", + "customUI": "list(default|vuetorrent|qbit-matUI|qb-web|custom)?", "keyfile": "str", "localdisks": "str?", "networkdisks": "str?", From 5b91baace5fbe9477ec88e79e871171d1a7f080e Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Fri, 28 Oct 2022 08:18:29 +0100 Subject: [PATCH 134/243] Allow custom ui https://github.com/alexbelgium/hassio-addons/issues/527 --- qbittorrent/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qbittorrent/README.md b/qbittorrent/README.md index 2d0c6129f..408d516c7 100644 --- a/qbittorrent/README.md +++ b/qbittorrent/README.md @@ -51,7 +51,7 @@ ssl: true/false certfile: fullchain.pem #ssl certificate, must be located in /ssl keyfile: privkey.pem #sslkeyfile, must be located in /ssl whitelist: "localhost,192.168.0.0/16" # list ip subnets that won't need a password (optional) -customUI: selection from list # alternative webUI can be set here. Latest version set at each addon start. +customUI: selection from list # alternative webUI can be set here. Latest version set at each addon start. Select 'custom' to fill it yourself in the webui DNS_servers: 8.8.8.8,1.1.1.1 # Keep blank to use router’s DNS, or set custom DNS to avoid spamming in case of local DNS ad-remover SavePath: "/share/qbittorrent" # Define the download directory localdisks: sda1 #put the hardware name of your drive to mount separated by commas, or its label. Ex: sda1, sdb1, MYNAS... From 1f83018d4a8978ab12a189fb89ec3eed907d8089 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Fri, 28 Oct 2022 08:21:10 +0100 Subject: [PATCH 135/243] Allow custom ui https://github.com/alexbelgium/hassio-addons/issues/527 --- .../rootfs/etc/cont-init.d/91-qbittorrent_configuration.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/qbittorrent/rootfs/etc/cont-init.d/91-qbittorrent_configuration.sh b/qbittorrent/rootfs/etc/cont-init.d/91-qbittorrent_configuration.sh index 9dcd71e22..9ddfcbc65 100644 --- a/qbittorrent/rootfs/etc/cont-init.d/91-qbittorrent_configuration.sh +++ b/qbittorrent/rootfs/etc/cont-init.d/91-qbittorrent_configuration.sh @@ -137,7 +137,7 @@ mkdir -p /webui chown abc:abc /webui CUSTOMUI=$(bashio::config 'customUI') -if bashio::config.has_value 'customUI' && [ ! "$CUSTOMUI" = default ]; then +if bashio::config.has_value 'customUI' && [ ! "$CUSTOMUI" = default ] && [ ! "$CUSTOMUI" = custom ]; then ### Variables bashio::log.info "Alternate UI enabled : $CUSTOMUI. If webui don't work, disable this option" @@ -163,6 +163,7 @@ if bashio::config.has_value 'customUI' && [ ! "$CUSTOMUI" = default ]; then rm /webui/*.zip CUSTOMUIDIR="$(dirname "$(find /webui/"$CUSTOMUI" -iname "public" -type d)")" # Set qbittorrent + if [[ sed -i "$LINE i\WebUI\\\AlternativeUIEnabled=true" /config/addons_config/qBittorrent/qBittorrent.conf sed -i "$LINE i\WebUI\\\RootFolder=$CUSTOMUIDIR" /config/addons_config/qBittorrent/qBittorrent.conf # Set nginx From f913c2b00830ec0d716347166712a9090b0ba3f4 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Fri, 28 Oct 2022 08:22:21 +0100 Subject: [PATCH 136/243] https://github.com/alexbelgium/hassio-addons/issues/527 --- qbittorrent/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qbittorrent/config.json b/qbittorrent/config.json index 42b84b89b..b48a63b36 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-r2-ls224" + "version": "4.4.5-r2-ls224-2" } From 5a6b8e7d195261c7d08c28adbe3576921b807f43 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Fri, 28 Oct 2022 08:24:12 +0100 Subject: [PATCH 137/243] Update 91-qbittorrent_configuration.sh --- .../rootfs/etc/cont-init.d/91-qbittorrent_configuration.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/qbittorrent/rootfs/etc/cont-init.d/91-qbittorrent_configuration.sh b/qbittorrent/rootfs/etc/cont-init.d/91-qbittorrent_configuration.sh index 9ddfcbc65..421de0e5b 100644 --- a/qbittorrent/rootfs/etc/cont-init.d/91-qbittorrent_configuration.sh +++ b/qbittorrent/rootfs/etc/cont-init.d/91-qbittorrent_configuration.sh @@ -163,7 +163,6 @@ if bashio::config.has_value 'customUI' && [ ! "$CUSTOMUI" = default ] && [ ! "$C rm /webui/*.zip CUSTOMUIDIR="$(dirname "$(find /webui/"$CUSTOMUI" -iname "public" -type d)")" # Set qbittorrent - if [[ sed -i "$LINE i\WebUI\\\AlternativeUIEnabled=true" /config/addons_config/qBittorrent/qBittorrent.conf sed -i "$LINE i\WebUI\\\RootFolder=$CUSTOMUIDIR" /config/addons_config/qBittorrent/qBittorrent.conf # Set nginx From 89d354e0e9e2451701f9e3b87b6c022fd8d22d3b Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Fri, 28 Oct 2022 08:27:48 +0100 Subject: [PATCH 138/243] Update 91-qbittorrent_configuration.sh --- .../91-qbittorrent_configuration.sh | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/qbittorrent/rootfs/etc/cont-init.d/91-qbittorrent_configuration.sh b/qbittorrent/rootfs/etc/cont-init.d/91-qbittorrent_configuration.sh index 421de0e5b..392320843 100644 --- a/qbittorrent/rootfs/etc/cont-init.d/91-qbittorrent_configuration.sh +++ b/qbittorrent/rootfs/etc/cont-init.d/91-qbittorrent_configuration.sh @@ -129,14 +129,18 @@ fi # Alternate UI # ################ -# Clean data -sed -i '/AlternativeUIEnabled/d' qBittorrent.conf -sed -i '/RootFolder/d' qBittorrent.conf -rm -f -r /webui -mkdir -p /webui -chown abc:abc /webui - CUSTOMUI=$(bashio::config 'customUI') + +# Clean data if not custom +if [ ! "$CUSTOMUI" = custom ]; then + sed -i '/AlternativeUIEnabled/d' qBittorrent.conf + sed -i '/RootFolder/d' qBittorrent.conf + rm -f -r /webui + mkdir -p /webui + chown abc:abc /webui +fi + +# Install webui if bashio::config.has_value 'customUI' && [ ! "$CUSTOMUI" = default ] && [ ! "$CUSTOMUI" = custom ]; then ### Variables bashio::log.info "Alternate UI enabled : $CUSTOMUI. If webui don't work, disable this option" From ce190c8784f6a493f97962a576dee95d8d059f9f Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 28 Oct 2022 09:37:52 +0000 Subject: [PATCH 139/243] Github bot : issues linked to readme --- qbittorrent/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qbittorrent/README.md b/qbittorrent/README.md index 408d516c7..e5e9496d7 100644 --- a/qbittorrent/README.md +++ b/qbittorrent/README.md @@ -1,4 +1,4 @@ -## ⚠ Open Issue : [QBitTorrent web ui issue (opened 2022-10-25)](https://github.com/alexbelgium/hassio-addons/issues/527) by [@SiriosDev](https://github.com/SiriosDev) +## ⚠ Open Request : [QBitTorrent web ui issue (opened 2022-10-25)](https://github.com/alexbelgium/hassio-addons/issues/527) by [@SiriosDev](https://github.com/SiriosDev) # Home assistant add-on: qbittorrent [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) From 36b17e4f3ae3dc204ae48211ba80dba50b233212 Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Sat, 29 Oct 2022 01:56:12 +0200 Subject: [PATCH 140/243] Updater bot : code-server updated to 4.8.1 --- code-server/CHANGELOG.md | 3 +++ code-server/config.json | 2 +- code-server/updater.json | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/code-server/CHANGELOG.md b/code-server/CHANGELOG.md index e76c15437..fa20813d9 100644 --- a/code-server/CHANGELOG.md +++ b/code-server/CHANGELOG.md @@ -1,4 +1,7 @@ +## 4.8.1 (29-10-2022) +- Update to latest version from linuxserver/docker-code-server + ## 4.8.0 (27-10-2022) - Update to latest version from linuxserver/docker-code-server diff --git a/code-server/config.json b/code-server/config.json index 6a539d256..fcb1863a7 100644 --- a/code-server/config.json +++ b/code-server/config.json @@ -74,6 +74,6 @@ }, "slug": "code-server", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/coder-server", - "version": "4.8.0", + "version": "4.8.1", "webui": "[PROTO:ssl]://[HOST]:[PORT:8443]" } diff --git a/code-server/updater.json b/code-server/updater.json index 1c24d3469..bbe7a01a9 100644 --- a/code-server/updater.json +++ b/code-server/updater.json @@ -1,8 +1,8 @@ { - "last_update": "27-10-2022", + "last_update": "29-10-2022", "repository": "alexbelgium/hassio-addons", "slug": "code-server", "source": "github", "upstream_repo": "linuxserver/docker-code-server", - "upstream_version": "4.8.0" + "upstream_version": "4.8.1" } From f3bd207bac2dc5781bd85e1e2976afa8da025257 Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Sat, 29 Oct 2022 01:56:21 +0200 Subject: [PATCH 141/243] Updater bot : emby updated to 4.8.0.15 --- emby/CHANGELOG.md | 3 +++ emby/config.json | 2 +- emby/updater.json | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/emby/CHANGELOG.md b/emby/CHANGELOG.md index 3040027b0..1aaf7b01a 100644 --- a/emby/CHANGELOG.md +++ b/emby/CHANGELOG.md @@ -1,4 +1,7 @@ +## 4.8.0.15 (29-10-2022) +- Update to latest version from linuxserver/docker-emby + ## 4.8.0.13 (22-10-2022) - Update to latest version from linuxserver/docker-emby diff --git a/emby/config.json b/emby/config.json index 4b1e456e1..8900e7ddf 100644 --- a/emby/config.json +++ b/emby/config.json @@ -107,6 +107,6 @@ }, "slug": "emby_nas", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/emby", - "version": "4.8.0.13", + "version": "4.8.0.15", "video": true } diff --git a/emby/updater.json b/emby/updater.json index f804592f4..e6e1bc189 100644 --- a/emby/updater.json +++ b/emby/updater.json @@ -1,9 +1,9 @@ { "github_beta": "true", - "last_update": "22-10-2022", + "last_update": "29-10-2022", "repository": "alexbelgium/hassio-addons", "slug": "emby", "source": "github", "upstream_repo": "linuxserver/docker-emby", - "upstream_version": "4.8.0.13" + "upstream_version": "4.8.0.15" } From eadf99178207c4a108c7154d3993d8cd91b16d44 Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Sat, 29 Oct 2022 01:57:00 +0200 Subject: [PATCH 142/243] Updater bot : flexget updated to 3.4.2 --- flexget/CHANGELOG.md | 3 +++ flexget/config.json | 2 +- flexget/updater.json | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/flexget/CHANGELOG.md b/flexget/CHANGELOG.md index 6d8c2df44..6f27cbe6b 100644 --- a/flexget/CHANGELOG.md +++ b/flexget/CHANGELOG.md @@ -1,4 +1,7 @@ +## 3.4.2 (29-10-2022) +- Update to latest version from wiserain/flexget + ## 3.4.0 (27-10-2022) - Update to latest version from wiserain/flexget diff --git a/flexget/config.json b/flexget/config.json index a846875b6..f61b9752b 100644 --- a/flexget/config.json +++ b/flexget/config.json @@ -37,6 +37,6 @@ }, "slug": "flexget", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "3.4.0-2", + "version": "3.4.2", "webui": "[PROTO:ssl]://[HOST]:[PORT:5050]" } diff --git a/flexget/updater.json b/flexget/updater.json index 2fad90fc6..4d1e499d5 100644 --- a/flexget/updater.json +++ b/flexget/updater.json @@ -1,8 +1,8 @@ { - "last_update": "27-10-2022", + "last_update": "29-10-2022", "repository": "alexbelgium/hassio-addons", "slug": "flexget", "source": "dockerhub", "upstream_repo": "wiserain/flexget", - "upstream_version": "3.4.0" + "upstream_version": "3.4.2" } From 4fba2106308cddf88d031f328a70aeacf3c08bd8 Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Sat, 29 Oct 2022 01:57:40 +0200 Subject: [PATCH 143/243] Updater bot : jackett updated to 0.20.2171 --- jackett/CHANGELOG.md | 3 +++ jackett/config.json | 2 +- jackett/updater.json | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/jackett/CHANGELOG.md b/jackett/CHANGELOG.md index fabbfb8d2..4836d554e 100644 --- a/jackett/CHANGELOG.md +++ b/jackett/CHANGELOG.md @@ -1,4 +1,7 @@ +## 0.20.2171 (29-10-2022) +- Update to latest version from linuxserver/docker-jackett + ## 0.20.2167 (27-10-2022) - Update to latest version from linuxserver/docker-jackett diff --git a/jackett/config.json b/jackett/config.json index bb6b34cb2..727b0b7c1 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.2167", + "version": "0.20.2171", "webui": "[PROTO:ssl]://[HOST]:[PORT:9117]" } diff --git a/jackett/updater.json b/jackett/updater.json index 4c6991c31..d37dd1957 100644 --- a/jackett/updater.json +++ b/jackett/updater.json @@ -1,8 +1,8 @@ { - "last_update": "27-10-2022", + "last_update": "29-10-2022", "repository": "alexbelgium/hassio-addons", "slug": "jackett", "source": "github", "upstream_repo": "linuxserver/docker-jackett", - "upstream_version": "0.20.2167" + "upstream_version": "0.20.2171" } From 30cfdb94a5e38de909e211180bb2c8e5e90cc0ae Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Sat, 29 Oct 2022 01:57:48 +0200 Subject: [PATCH 144/243] Updater bot : jellyfin updated to 10.8.5-1-ls184 --- jellyfin/CHANGELOG.md | 3 +++ jellyfin/config.json | 2 +- jellyfin/updater.json | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/jellyfin/CHANGELOG.md b/jellyfin/CHANGELOG.md index 5902f4006..a800cc694 100644 --- a/jellyfin/CHANGELOG.md +++ b/jellyfin/CHANGELOG.md @@ -1,4 +1,7 @@ +## 10.8.5-1-ls184 (29-10-2022) +- Update to latest version from linuxserver/docker-jellyfin + ## 10.8.5-1-ls183 (22-10-2022) - Update to latest version from linuxserver/docker-jellyfin diff --git a/jellyfin/config.json b/jellyfin/config.json index e1ce1c6f6..f94c780d2 100644 --- a/jellyfin/config.json +++ b/jellyfin/config.json @@ -103,6 +103,6 @@ }, "slug": "jellyfin", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "10.8.5-1-ls183", + "version": "10.8.5-1-ls184", "video": true } diff --git a/jellyfin/updater.json b/jellyfin/updater.json index 00b23c1b8..e2c7c8ea7 100644 --- a/jellyfin/updater.json +++ b/jellyfin/updater.json @@ -1,9 +1,9 @@ { "github_fulltag": "true", - "last_update": "22-10-2022", + "last_update": "29-10-2022", "repository": "alexbelgium/hassio-addons", "slug": "jellyfin", "source": "github", "upstream_repo": "linuxserver/docker-jellyfin", - "upstream_version": "10.8.5-1-ls183" + "upstream_version": "10.8.5-1-ls184" } From ca393b014e5e4f8095fec0b240879b1b8d76a5db Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Sat, 29 Oct 2022 01:58:33 +0200 Subject: [PATCH 145/243] Updater bot : nzbget updated to v21.1-ls127 --- nzbget/CHANGELOG.md | 3 +++ nzbget/config.json | 2 +- nzbget/updater.json | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/nzbget/CHANGELOG.md b/nzbget/CHANGELOG.md index 368e31717..8c26aeeed 100644 --- a/nzbget/CHANGELOG.md +++ b/nzbget/CHANGELOG.md @@ -1,4 +1,7 @@ +## v21.1-ls127 (29-10-2022) +- Update to latest version from linuxserver/docker-nzbget + ## v21.1-ls126 (22-10-2022) - Update to latest version from linuxserver/docker-nzbget diff --git a/nzbget/config.json b/nzbget/config.json index b81260222..d63f09147 100644 --- a/nzbget/config.json +++ b/nzbget/config.json @@ -79,5 +79,5 @@ }, "slug": "nzbget", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "v21.1-ls126" + "version": "v21.1-ls127" } diff --git a/nzbget/updater.json b/nzbget/updater.json index eb3eeb5d4..a463d5668 100644 --- a/nzbget/updater.json +++ b/nzbget/updater.json @@ -1,9 +1,9 @@ { "github_fulltag": "true", - "last_update": "22-10-2022", + "last_update": "29-10-2022", "repository": "alexbelgium/hassio-addons", "slug": "nzbget", "source": "github", "upstream_repo": "linuxserver/docker-nzbget", - "upstream_version": "v21.1-ls126" + "upstream_version": "v21.1-ls127" } From 52deaddda19ca1649f92b8f10f9cc0a497211ce6 Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Sat, 29 Oct 2022 01:58:39 +0200 Subject: [PATCH 146/243] Updater bot : omada updated to 5.6-chromium-amd64-2022-10-28 --- omada/CHANGELOG.md | 3 +++ omada/Dockerfile | 2 +- omada/config.json | 2 +- omada/updater.json | 4 ++-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/omada/CHANGELOG.md b/omada/CHANGELOG.md index cfc16d815..6a1e41139 100644 --- a/omada/CHANGELOG.md +++ b/omada/CHANGELOG.md @@ -1,4 +1,7 @@ +## 5.6-chromium-amd64-2022-10-28 (2022-10-28) +- Update to latest version from mbentley/omada-controller + ## 5.6-chromium-amd64-2022-10-24 (2022-10-24) - Update to latest version from mbentley/omada-controller diff --git a/omada/Dockerfile b/omada/Dockerfile index 0732dc1b6..cce70ad09 100644 --- a/omada/Dockerfile +++ b/omada/Dockerfile @@ -16,7 +16,7 @@ ARG BUILD_FROM ARG BUILD_VERSION -ARG BUILD_UPSTREAM="5.6-chromium-amd64-2022-10-24" +ARG BUILD_UPSTREAM="5.6-chromium-amd64-2022-10-28" FROM ${BUILD_FROM} ################## diff --git a/omada/config.json b/omada/config.json index b02544a30..01da3a196 100644 --- a/omada/config.json +++ b/omada/config.json @@ -45,6 +45,6 @@ }, "slug": "omada", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "5.6-chromium-amd64-2022-10-24", + "version": "5.6-chromium-amd64-2022-10-28", "webui": "[PROTO:ssl]://[HOST]:[PORT:8088]" } diff --git a/omada/updater.json b/omada/updater.json index 1e54e75d0..fd8a09614 100644 --- a/omada/updater.json +++ b/omada/updater.json @@ -1,9 +1,9 @@ { "dockerhub_by_date": true, - "last_update": "2022-10-24", + "last_update": "2022-10-28", "repository": "alexbelgium/hassio-addons", "slug": "omada", "source": "dockerhub", "upstream_repo": "mbentley/omada-controller", - "upstream_version": "5.6-chromium-amd64-2022-10-24" + "upstream_version": "5.6-chromium-amd64-2022-10-28" } From 3b484e5df41af188ec1fc65ed6ac165089be67bf Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Sat, 29 Oct 2022 01:58:46 +0200 Subject: [PATCH 147/243] Updater bot : omada_v3 updated to 5.6-chromium-amd64-2022-10-28 --- omada_v3/CHANGELOG.md | 3 +++ omada_v3/Dockerfile | 2 +- omada_v3/config.json | 2 +- omada_v3/updater.json | 4 ++-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/omada_v3/CHANGELOG.md b/omada_v3/CHANGELOG.md index cfc16d815..6a1e41139 100644 --- a/omada_v3/CHANGELOG.md +++ b/omada_v3/CHANGELOG.md @@ -1,4 +1,7 @@ +## 5.6-chromium-amd64-2022-10-28 (2022-10-28) +- Update to latest version from mbentley/omada-controller + ## 5.6-chromium-amd64-2022-10-24 (2022-10-24) - Update to latest version from mbentley/omada-controller diff --git a/omada_v3/Dockerfile b/omada_v3/Dockerfile index 17e4c3278..a7c45f213 100644 --- a/omada_v3/Dockerfile +++ b/omada_v3/Dockerfile @@ -16,7 +16,7 @@ ARG BUILD_FROM ARG BUILD_VERSION -ARG BUILD_UPSTREAM="5.6-chromium-amd64-2022-10-24" +ARG BUILD_UPSTREAM="5.6-chromium-amd64-2022-10-28" FROM ${BUILD_FROM} ################## diff --git a/omada_v3/config.json b/omada_v3/config.json index 099fd0592..b450b3fb5 100644 --- a/omada_v3/config.json +++ b/omada_v3/config.json @@ -45,6 +45,6 @@ }, "slug": "omada_v3", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "5.6-chromium-amd64-2022-10-24", + "version": "5.6-chromium-amd64-2022-10-28", "webui": "[PROTO:ssl]://[HOST]:[PORT:8088]" } diff --git a/omada_v3/updater.json b/omada_v3/updater.json index c55e1d2aa..91f21e57a 100644 --- a/omada_v3/updater.json +++ b/omada_v3/updater.json @@ -1,9 +1,9 @@ { "dockerhub_by_date": true, - "last_update": "2022-10-24", + "last_update": "2022-10-28", "repository": "alexbelgium/hassio-addons", "slug": "omada_v3", "source": "dockerhub", "upstream_repo": "mbentley/omada-controller", - "upstream_version": "5.6-chromium-amd64-2022-10-24" + "upstream_version": "5.6-chromium-amd64-2022-10-28" } From c0e874c1fd8b42076dc8f157d2586d163173bb4b Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Sat, 29 Oct 2022 02:00:18 +0200 Subject: [PATCH 148/243] Updater bot : readarr updated to nightly-0.1.1.1426-ls138 --- readarr/CHANGELOG.md | 3 +++ readarr/config.json | 2 +- readarr/updater.json | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/readarr/CHANGELOG.md b/readarr/CHANGELOG.md index 4264e92d4..07cdbcecb 100644 --- a/readarr/CHANGELOG.md +++ b/readarr/CHANGELOG.md @@ -1,4 +1,7 @@ +## nightly-0.1.1.1426-ls138 (29-10-2022) +- Update to latest version from linuxserver/docker-readarr + ## nightly-0.1.1.1426-ls137 (27-09-2022) - Update to latest version from linuxserver/docker-readarr diff --git a/readarr/config.json b/readarr/config.json index d003413f2..7815e3ed8 100644 --- a/readarr/config.json +++ b/readarr/config.json @@ -78,6 +78,6 @@ }, "slug": "readarr_nas", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/readarr", - "version": "nightly-0.1.1.1426-ls137", + "version": "nightly-0.1.1.1426-ls138", "webui": "[PROTO:ssl]://[HOST]:[PORT:8787]" } diff --git a/readarr/updater.json b/readarr/updater.json index 1e2e8bee8..5ba30aa53 100644 --- a/readarr/updater.json +++ b/readarr/updater.json @@ -1,10 +1,10 @@ { "github_beta": "true", "github_fulltag": "true", - "last_update": "27-09-2022", + "last_update": "29-10-2022", "repository": "alexbelgium/hassio-addons", "slug": "readarr", "source": "github", "upstream_repo": "linuxserver/docker-readarr", - "upstream_version": "nightly-0.1.1.1426-ls137" + "upstream_version": "nightly-0.1.1.1426-ls138" } From 2ed5da286def9fd25388c8a21a6a0a7cb5dea95c Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Sat, 29 Oct 2022 02:00:53 +0200 Subject: [PATCH 149/243] Updater bot : seafile updated to v9.0.11-pro --- seafile/CHANGELOG.md | 3 +++ seafile/config.json | 2 +- seafile/updater.json | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/seafile/CHANGELOG.md b/seafile/CHANGELOG.md index 2ea6c67d9..001a61e12 100644 --- a/seafile/CHANGELOG.md +++ b/seafile/CHANGELOG.md @@ -1,4 +1,7 @@ +## v9.0.11-pro (29-10-2022) +- Update to latest version from haiwen/seahub + ## v9.0.10-pro (13-10-2022) - Update to latest version from haiwen/seahub diff --git a/seafile/config.json b/seafile/config.json index 0a43951d8..0d4f29963 100644 --- a/seafile/config.json +++ b/seafile/config.json @@ -95,6 +95,6 @@ ], "slug": "seafile", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/seafile", - "version": "v9.0.10-pro", + "version": "v9.0.11-pro", "webui": "[PROTO:ssl]://[HOST]:[PORT:8000]" } diff --git a/seafile/updater.json b/seafile/updater.json index 9af9ec9f9..a2bb49577 100644 --- a/seafile/updater.json +++ b/seafile/updater.json @@ -1,10 +1,10 @@ { "github_fulltag": "true", - "last_update": "13-10-2022", + "last_update": "29-10-2022", "paused": false, "repository": "alexbelgium/hassio-addons", "slug": "seafile", "source": "github", "upstream_repo": "haiwen/seahub", - "upstream_version": "v9.0.10-pro" + "upstream_version": "v9.0.11-pro" } From 7459736a34dde05607a20d0efc694468be7376cb Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Sat, 29 Oct 2022 02:01:25 +0200 Subject: [PATCH 150/243] Updater bot : transmission updated to 3.00-r5-ls138 --- transmission/CHANGELOG.md | 3 +++ transmission/config.json | 2 +- transmission/updater.json | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/transmission/CHANGELOG.md b/transmission/CHANGELOG.md index dc801866b..cce629a7f 100644 --- a/transmission/CHANGELOG.md +++ b/transmission/CHANGELOG.md @@ -1,4 +1,7 @@ +## 3.00-r5-ls138 (29-10-2022) +- Update to latest version from linuxserver/docker-transmission + ## 3.00-r5-ls137 (30-09-2022) - Update to latest version from linuxserver/docker-transmission diff --git a/transmission/config.json b/transmission/config.json index 43e9c273e..f07d0cab2 100644 --- a/transmission/config.json +++ b/transmission/config.json @@ -93,5 +93,5 @@ }, "slug": "transmission_ls", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "3.00-r5-ls137" + "version": "3.00-r5-ls138" } diff --git a/transmission/updater.json b/transmission/updater.json index 72acc3ad3..991490841 100644 --- a/transmission/updater.json +++ b/transmission/updater.json @@ -1,9 +1,9 @@ { "github_fulltag": "true", - "last_update": "30-09-2022", + "last_update": "29-10-2022", "repository": "alexbelgium/hassio-addons", "slug": "transmission", "source": "github", "upstream_repo": "linuxserver/docker-transmission", - "upstream_version": "3.00-r5-ls137" + "upstream_version": "3.00-r5-ls138" } From 3ef50090f6f58fc8085e52fc302769f20ce95e43 Mon Sep 17 00:00:00 2001 From: Silvio Messi Date: Sat, 29 Oct 2022 11:15:40 +0200 Subject: [PATCH 151/243] Move uploads to a persisten storage --- fireflyiii/Dockerfile | 3 +++ fireflyiii/rootfs/etc/cont-init.d/99-run.sh | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/fireflyiii/Dockerfile b/fireflyiii/Dockerfile index 97bb06acd..b00049a30 100644 --- a/fireflyiii/Dockerfile +++ b/fireflyiii/Dockerfile @@ -40,6 +40,9 @@ RUN \ ################# if [ "$BUILD_UPSTREAM" = "5.7.14" ] ; then \ sed -i "s|, \$transaction\[\x27amount\x27\] ?? \x270\x27);|, (string)(\$transaction\[\x27amount\x27\] ?? \x270\x27));|g" /var/www/html/app/Helpers/Collector/GroupCollector.php; else echo "not 5.7.5"; fi +RUN \ + # Change upload folder to "ha_upload" since the default one is binded to a volume (see base image) + sed -i "s/'root' => storage_path('upload'),/'root' => storage_path('ha_upload'),/g" /var/www/html/config/filesystems.php ################## # 3 Install apps # diff --git a/fireflyiii/rootfs/etc/cont-init.d/99-run.sh b/fireflyiii/rootfs/etc/cont-init.d/99-run.sh index 18e13cfcc..598abcfc8 100644 --- a/fireflyiii/rootfs/etc/cont-init.d/99-run.sh +++ b/fireflyiii/rootfs/etc/cont-init.d/99-run.sh @@ -121,6 +121,24 @@ case $(bashio::config 'DB_CONNECTION') in esac +######################## +# Define upload folder # +######################## + +bashio::log.info "Defining upload folder" + +# Creating folder +if [ ! -d /config/addons_config/fireflyiii/upload ]; then + mkdir -p /config/addons_config/fireflyiii/upload + chown -R www-data:www-data /config/addons_config/fireflyiii/upload +fi + +# Creating symlink +if [ -d /var/www/html/storage/ha_upload ]; then + rm -r /var/www/html/storage/ha_upload +fi +ln -s /config/addons_config/fireflyiii/upload /var/www/html/storage/ha_upload + ################ # CRON OPTIONS # ################ From d212cc13b239e6b74e2df2953af97eab085540e1 Mon Sep 17 00:00:00 2001 From: bruvv <3063928+bruvv@users.noreply.github.com> Date: Sat, 29 Oct 2022 15:29:06 +0200 Subject: [PATCH 152/243] Aligned config with upstream added homeassistant example --- epicgamesfree/rootfs/templates/config.json | 119 +++++++++++---------- 1 file changed, 62 insertions(+), 57 deletions(-) diff --git a/epicgamesfree/rootfs/templates/config.json b/epicgamesfree/rootfs/templates/config.json index 5d43a70db..ca053abda 100644 --- a/epicgamesfree/rootfs/templates/config.json +++ b/epicgamesfree/rootfs/templates/config.json @@ -1,60 +1,65 @@ { - "runOnStartup":true, - "cronSchedule":"5 16 * * *", - "logLevel":"info", - "webPortalConfig":{ - "baseUrl":"https://epic.exmaple.com" - }, - "accounts":[ - { - "email":"example@gmail.com", - "password":"abc1234", - "totp":"EMNCAZE234AZEEMNCAZE234AZEEMNCAZE234AZEEMNCAZE234AZEEMNCAZE234AZEEMNCAZE234AZEEMNCAZE234AZEEMNCAZE234AZE" - } - ], - "notifiers":[ - { - "type":"email", - "smtpHost":"smtp.gmail.com", - "smtpPort":587, - "emailSenderAddress":"hello@gmail.com", - "emailSenderName":"Epic Games Captchas", - "emailRecipientAddress":"hello@gmail.com", - "secure":false, - "auth":{ - "user":"hello@gmail.com", - "pass":"abc123" - } + "runOnStartup": true, + "cronSchedule": "5 16 * * *", + "logLevel": "info", + "webPortalConfig": { + "baseUrl": "https://epic.exmaple.com", + }, + "accounts": [ + { + "email": "example@gmail.com", + "password": "abc1234", + "totp": "EMNCF83ULU3K3PXPJBSWY3DPEHPK3PXPJWY3DPEHPK3YI69R39NE" + }, + ], + "notifiers": [ + // You may configure as many of any notifier as needed + // Here are some examples of each type + { + "type": "email", + "smtpHost": "smtp.gmail.com", + "smtpPort": 587, + "emailSenderAddress": "hello@gmail.com", + "emailSenderName": "Epic Games Captchas", + "emailRecipientAddress": "hello@gmail.com", + "secure": false, + "auth": { + "user": "hello@gmail.com", + "pass": "abc123", }, - { - "type":"discord", - "webhookUrl":"https://discord.com/api/webhooks/123456789123456789/A-abcdefghijklmn-abcdefghijklmnopqrst12345678-abcdefghijklmnop123456", - "mentionedUsers":[ - "914360712086843432" - ], - "mentionedRoles":[ - "734548250895319070" - ] - }, - { - "type":"telegram", - "token":"to_fill", - "chatId":"-987654321" - }, - { - "type":"apprise", - "apiUrl":"http://192.168.1.2:8000", - "urls":"mailto://user:pass@gmail.com" - }, - { - "type":"pushover", - "token":"to_fill", - "userKey":"to_fill" - }, - { - "type":"gotify", - "apiUrl":"https://gotify.net", - "token":"SnL-wAvmfo_QT" - } - ] + }, + { + "type": "discord", + "webhookUrl": "https://discord.com/api/webhooks/123456789123456789/A-abcdefghijklmn-abcdefghijklmnopqrst12345678-abcdefghijklmnop123456", + // Optional list of users or roles to mention + "mentionedUsers": ["914360712086843432"], + "mentionedRoles": ["734548250895319070"], + }, + { + "type": "telegram", + "token": "644739147:AAGMPo-Jz3mKRnHRTnrPEDi7jUF1vqNOD5k", + "chatId": "-987654321", + }, + { + "type": "apprise", + "apiUrl": "http://192.168.1.2:8000", + "urls": "mailto://user:pass@gmail.com", + }, + { + "type": "pushover", + "token": "a172fyyl9gw99p2xi16tq8hnib48p2", + "userKey": "uvgidym7l5ggpwu2r8i1oy6diaapll", + }, + { + "type": "gotify", + "apiUrl": "https://gotify.net", + "token": "SnL-wAvmfo_QT", + }, + { + "type": "homeassistant", + "instance": "https://homeassistant.example.com", + "token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c", + "notifyservice": "mobile_app_smartphone_name", + }, + ], } From c7ec168f5f8a34ce72aed8dc897dcc31e71ed913 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 29 Oct 2022 16:35:44 +0000 Subject: [PATCH 153/243] Github bot : issues linked to readme --- fireflyiii/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/fireflyiii/README.md b/fireflyiii/README.md index 4522f6fb0..2644956d6 100644 --- a/fireflyiii/README.md +++ b/fireflyiii/README.md @@ -1,3 +1,4 @@ +## ⚠ Open Issue : [🐛 [fireflyiii] Attachments are not stored in a persistent storage (opened 2022-10-29)](https://github.com/alexbelgium/hassio-addons/issues/530) by [@SilvioMessi](https://github.com/SilvioMessi) # Home assistant add-on: fireflyiii [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) From e0aba8ae15a705427d4b25e21a558d842e606356 Mon Sep 17 00:00:00 2001 From: Silvio Messi Date: Sat, 29 Oct 2022 18:21:01 +0000 Subject: [PATCH 154/243] Bump version to 5.7.14-2 --- fireflyiii/CHANGELOG.md | 2 ++ fireflyiii/config.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/fireflyiii/CHANGELOG.md b/fireflyiii/CHANGELOG.md index e0a7ea930..7821bb949 100644 --- a/fireflyiii/CHANGELOG.md +++ b/fireflyiii/CHANGELOG.md @@ -1,3 +1,5 @@ +## 5.7.14-2 (29-10-2022) +- Fix bug #530 ## 5.7.14 (20-10-2022) - Update to latest version from firefly-iii/firefly-iii diff --git a/fireflyiii/config.json b/fireflyiii/config.json index 9776f4da4..054e48f9e 100644 --- a/fireflyiii/config.json +++ b/fireflyiii/config.json @@ -46,6 +46,6 @@ "slug": "fireflyiii", "startup": "services", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "5.7.14", + "version": "5.7.14-2", "webui": "[PROTO:ssl]://[HOST]:[PORT:8080]" } From 48c8fb823809a1b505bea4c1d5bef7dd2d09bea5 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 29 Oct 2022 18:33:29 +0000 Subject: [PATCH 155/243] Github bot : issues linked to readme --- fireflyiii/README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/fireflyiii/README.md b/fireflyiii/README.md index 2644956d6..4522f6fb0 100644 --- a/fireflyiii/README.md +++ b/fireflyiii/README.md @@ -1,4 +1,3 @@ -## ⚠ Open Issue : [🐛 [fireflyiii] Attachments are not stored in a persistent storage (opened 2022-10-29)](https://github.com/alexbelgium/hassio-addons/issues/530) by [@SilvioMessi](https://github.com/SilvioMessi) # Home assistant add-on: fireflyiii [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) From 8e6c6857d313e5be3ac7ffb33f64ff2c2958685b Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 30 Oct 2022 00:16:42 +0000 Subject: [PATCH 156/243] Github bot : script beautyshied --- .../etc/cont-init.d/91-qbittorrent_configuration.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/qbittorrent/rootfs/etc/cont-init.d/91-qbittorrent_configuration.sh b/qbittorrent/rootfs/etc/cont-init.d/91-qbittorrent_configuration.sh index 392320843..3b866b205 100644 --- a/qbittorrent/rootfs/etc/cont-init.d/91-qbittorrent_configuration.sh +++ b/qbittorrent/rootfs/etc/cont-init.d/91-qbittorrent_configuration.sh @@ -133,11 +133,11 @@ CUSTOMUI=$(bashio::config 'customUI') # Clean data if not custom if [ ! "$CUSTOMUI" = custom ]; then - sed -i '/AlternativeUIEnabled/d' qBittorrent.conf - sed -i '/RootFolder/d' qBittorrent.conf - rm -f -r /webui - mkdir -p /webui - chown abc:abc /webui + sed -i '/AlternativeUIEnabled/d' qBittorrent.conf + sed -i '/RootFolder/d' qBittorrent.conf + rm -f -r /webui + mkdir -p /webui + chown abc:abc /webui fi # Install webui From 424f0b04e4ad9ceb4eeb4c295473e84dec919d28 Mon Sep 17 00:00:00 2001 From: niels Date: Sun, 30 Oct 2022 11:21:46 +0100 Subject: [PATCH 157/243] fixed linting --- epicgamesfree/config.json | 39 +++---- epicgamesfree/rootfs/templates/config.json | 123 ++++++++++----------- 2 files changed, 77 insertions(+), 85 deletions(-) diff --git a/epicgamesfree/config.json b/epicgamesfree/config.json index 0f3b053da..133fa7f54 100644 --- a/epicgamesfree/config.json +++ b/epicgamesfree/config.json @@ -1,24 +1,19 @@ { - "arch": [ - "aarch64", - "amd64" - ], - "codenotary": "alexandrep.github@gmail.com", - "description": "Automatically login and redeem promotional free games from the Epic Games Store", - "image": "ghcr.io/alexbelgium/epicgamesfree-{arch}", - "init": false, - "map": [ - "config:rw" - ], - "name": "Epic Games Free", - "ports": { - "3000/tcp": 3000 - }, - "ports_description": { - "3000/tcp": "web interface" - }, - "slug": "epicgamesfree", - "url": "https://github.com/alexbelgium/hassio-addons", - "version": "ee3dff4b29757e28282cada9bcb3e8f84f1c3041-2022-10-23", - "webui": "[PROTO:ssl]://[HOST]:[PORT:3000]" + "arch": ["aarch64", "amd64"], + "codenotary": "alexandrep.github@gmail.com", + "description": "Automatically login and redeem promotional free games from the Epic Games Store", + "image": "ghcr.io/alexbelgium/epicgamesfree-{arch}", + "init": false, + "map": ["config:rw"], + "name": "Epic Games Free", + "ports": { + "3000/tcp": 3000 + }, + "ports_description": { + "3000/tcp": "web interface" + }, + "slug": "epicgamesfree", + "url": "https://github.com/alexbelgium/hassio-addons", + "version": "ee3dff4b29757e28282cada9bcb3e8f84f1c3041-2022-10-23", + "webui": "[PROTO:ssl]://[HOST]:[PORT:3000]" } diff --git a/epicgamesfree/rootfs/templates/config.json b/epicgamesfree/rootfs/templates/config.json index ca053abda..76fb417a8 100644 --- a/epicgamesfree/rootfs/templates/config.json +++ b/epicgamesfree/rootfs/templates/config.json @@ -1,65 +1,62 @@ { - "runOnStartup": true, - "cronSchedule": "5 16 * * *", - "logLevel": "info", - "webPortalConfig": { - "baseUrl": "https://epic.exmaple.com", - }, - "accounts": [ - { - "email": "example@gmail.com", - "password": "abc1234", - "totp": "EMNCF83ULU3K3PXPJBSWY3DPEHPK3PXPJWY3DPEHPK3YI69R39NE" - }, - ], - "notifiers": [ - // You may configure as many of any notifier as needed - // Here are some examples of each type - { - "type": "email", - "smtpHost": "smtp.gmail.com", - "smtpPort": 587, - "emailSenderAddress": "hello@gmail.com", - "emailSenderName": "Epic Games Captchas", - "emailRecipientAddress": "hello@gmail.com", - "secure": false, - "auth": { - "user": "hello@gmail.com", - "pass": "abc123", - }, - }, - { - "type": "discord", - "webhookUrl": "https://discord.com/api/webhooks/123456789123456789/A-abcdefghijklmn-abcdefghijklmnopqrst12345678-abcdefghijklmnop123456", - // Optional list of users or roles to mention - "mentionedUsers": ["914360712086843432"], - "mentionedRoles": ["734548250895319070"], - }, - { - "type": "telegram", - "token": "644739147:AAGMPo-Jz3mKRnHRTnrPEDi7jUF1vqNOD5k", - "chatId": "-987654321", - }, - { - "type": "apprise", - "apiUrl": "http://192.168.1.2:8000", - "urls": "mailto://user:pass@gmail.com", - }, - { - "type": "pushover", - "token": "a172fyyl9gw99p2xi16tq8hnib48p2", - "userKey": "uvgidym7l5ggpwu2r8i1oy6diaapll", - }, - { - "type": "gotify", - "apiUrl": "https://gotify.net", - "token": "SnL-wAvmfo_QT", - }, - { - "type": "homeassistant", - "instance": "https://homeassistant.example.com", - "token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c", - "notifyservice": "mobile_app_smartphone_name", - }, - ], + "runOnStartup": true, + "cronSchedule": "5 16 * * *", + "logLevel": "info", + "webPortalConfig": { + "baseUrl": "https://localhost:3000" + }, + "accounts": [ + { + "email": "example@gmail.com", + "password": "abc1234", + "totp": "EMNCF83ULU3K3PXPJBSWY3DPEHPK3PXPJWY3DPEHPK3YI69R39NE" + } + ], + "notifiers": [ + { + "type": "email", + "smtpHost": "smtp.gmail.com", + "smtpPort": 587, + "emailSenderAddress": "hello@gmail.com", + "emailSenderName": "Epic Games Captchas", + "emailRecipientAddress": "hello@gmail.com", + "secure": false, + "auth": { + "user": "hello@gmail.com", + "pass": "abc123" + } + }, + { + "type": "discord", + "webhookUrl": "https://discord.com/api/webhooks/123456789123456789/A-abcdefghijklmn-abcdefghijklmnopqrst12345678-abcdefghijklmnop123456", + "mentionedUsers": ["914360712086843432"], + "mentionedRoles": ["734548250895319070"] + }, + { + "type": "telegram", + "token": "644739147:AAGMPo-Jz3mKRnHRTnrPEDi7jUF1vqNOD5k", + "chatId": "-987654321" + }, + { + "type": "apprise", + "apiUrl": "http://192.168.1.2:8000", + "urls": "mailto://user:pass@gmail.com" + }, + { + "type": "pushover", + "token": "a172fyyl9gw99p2xi16tq8hnib48p2", + "userKey": "uvgidym7l5ggpwu2r8i1oy6diaapll" + }, + { + "type": "gotify", + "apiUrl": "https://gotify.net", + "token": "SnL-wAvmfo_QT" + }, + { + "type": "homeassistant", + "instance": "https://homeassistant.example.com", + "token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c", + "notifyservice": "mobile_app_smartphone_name" + } + ] } From db6f71d4017e14d75674a5d78703c1b6a6aec99d Mon Sep 17 00:00:00 2001 From: niels Date: Sun, 30 Oct 2022 11:32:20 +0100 Subject: [PATCH 158/243] added changelog --- epicgamesfree/CHANGELOG.md | 6 ++++++ epicgamesfree/config.json | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/epicgamesfree/CHANGELOG.md b/epicgamesfree/CHANGELOG.md index f5db733d3..a740e1f29 100644 --- a/epicgamesfree/CHANGELOG.md +++ b/epicgamesfree/CHANGELOG.md @@ -1,11 +1,17 @@ +## 30-10-2022 + +- New config.js update ## ee3dff4b29757e28282cada9bcb3e8f84f1c3041-2022-10-23 (2022-10-23) + - Update to latest version from charlocharlie/epicgames-freegames ## 80fdb2447c8846bee011c0d6d5c44c56210cb24a-2022-09-23 (2022-09-23) + - Update to latest version from charlocharlie/epicgames-freegames ## 9531608362dc8c1232c1e12005541796610d2af7-2021-12-17 (2021-12-17) + - Update to latest version from charlocharlie/epicgames-freegames ## 4.1.0 (21-07-2022) diff --git a/epicgamesfree/config.json b/epicgamesfree/config.json index 133fa7f54..491f27e40 100644 --- a/epicgamesfree/config.json +++ b/epicgamesfree/config.json @@ -1,7 +1,7 @@ { "arch": ["aarch64", "amd64"], "codenotary": "alexandrep.github@gmail.com", - "description": "Automatically login and redeem promotional free games from the Epic Games Store", + "description": "Automatically login and redeem promotional free games from Epic Games Store", "image": "ghcr.io/alexbelgium/epicgamesfree-{arch}", "init": false, "map": ["config:rw"], From e3562d8ecbc209e6103025a7a9cfb514562948e8 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sun, 30 Oct 2022 19:39:33 +0100 Subject: [PATCH 159/243] Create .gitleaks.toml --- .github/linters/.gitleaks.toml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .github/linters/.gitleaks.toml diff --git a/.github/linters/.gitleaks.toml b/.github/linters/.gitleaks.toml new file mode 100644 index 000000000..17d727c12 --- /dev/null +++ b/.github/linters/.gitleaks.toml @@ -0,0 +1,7 @@ + +title = "gitleaks config" + +[extend] +# useDefault will extend the base configuration with the default gitleaks config: +# https://github.com/zricethezav/gitleaks/blob/master/config/gitleaks.toml +useDefault = true From 9726c6340fe33cb0c3ca0eadacf0c97c7a9acc48 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sun, 30 Oct 2022 19:58:48 +0100 Subject: [PATCH 160/243] Whitelist --- .github/linters/.gitleaks.toml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/linters/.gitleaks.toml b/.github/linters/.gitleaks.toml index 17d727c12..78e2daaec 100644 --- a/.github/linters/.gitleaks.toml +++ b/.github/linters/.gitleaks.toml @@ -4,4 +4,8 @@ title = "gitleaks config" [extend] # useDefault will extend the base configuration with the default gitleaks config: # https://github.com/zricethezav/gitleaks/blob/master/config/gitleaks.toml -useDefault = true +useDefault = false + +[allowlist] + description = "global allowlist. whitelisting paths" + paths = ['''hassio-addons/epicgamesfree/config.json'''] From e5235654076f9b3760a824b1127bc167c2a705d9 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Mon, 31 Oct 2022 07:18:25 +0100 Subject: [PATCH 161/243] Lint config Add double space --- epicgamesfree/config.json | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/epicgamesfree/config.json b/epicgamesfree/config.json index 491f27e40..d3b4a70ee 100644 --- a/epicgamesfree/config.json +++ b/epicgamesfree/config.json @@ -1,19 +1,19 @@ { - "arch": ["aarch64", "amd64"], - "codenotary": "alexandrep.github@gmail.com", - "description": "Automatically login and redeem promotional free games from Epic Games Store", - "image": "ghcr.io/alexbelgium/epicgamesfree-{arch}", - "init": false, - "map": ["config:rw"], - "name": "Epic Games Free", - "ports": { - "3000/tcp": 3000 - }, - "ports_description": { - "3000/tcp": "web interface" - }, - "slug": "epicgamesfree", - "url": "https://github.com/alexbelgium/hassio-addons", - "version": "ee3dff4b29757e28282cada9bcb3e8f84f1c3041-2022-10-23", - "webui": "[PROTO:ssl]://[HOST]:[PORT:3000]" + "arch": ["aarch64", "amd64"], + "codenotary": "alexandrep.github@gmail.com", + "description": "Automatically login and redeem promotional free games from Epic Games Store", + "image": "ghcr.io/alexbelgium/epicgamesfree-{arch}", + "init": false, + "map": ["config:rw"], + "name": "Epic Games Free", + "ports": { + "3000/tcp": 3000 + }, + "ports_description": { + "3000/tcp": "web interface" + }, + "slug": "epicgamesfree", + "url": "https://github.com/alexbelgium/hassio-addons", + "version": "ee3dff4b29757e28282cada9bcb3e8f84f1c3041-2022-10-23", + "webui": "[PROTO:ssl]://[HOST]:[PORT:3000]" } From 4c610a25d56be2e0d0058f508c63978f0076123a Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Mon, 31 Oct 2022 07:23:41 +0100 Subject: [PATCH 162/243] Create .gitleaks.toml --- GitHub/workspace/.github/linters/.gitleaks.toml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 GitHub/workspace/.github/linters/.gitleaks.toml diff --git a/GitHub/workspace/.github/linters/.gitleaks.toml b/GitHub/workspace/.github/linters/.gitleaks.toml new file mode 100644 index 000000000..78e2daaec --- /dev/null +++ b/GitHub/workspace/.github/linters/.gitleaks.toml @@ -0,0 +1,11 @@ + +title = "gitleaks config" + +[extend] +# useDefault will extend the base configuration with the default gitleaks config: +# https://github.com/zricethezav/gitleaks/blob/master/config/gitleaks.toml +useDefault = false + +[allowlist] + description = "global allowlist. whitelisting paths" + paths = ['''hassio-addons/epicgamesfree/config.json'''] From 01b21e66b2729427bdb66163acdaebf392e91ee6 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Mon, 31 Oct 2022 07:26:02 +0100 Subject: [PATCH 163/243] Delete .gitleaks.toml --- GitHub/workspace/.github/linters/.gitleaks.toml | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 GitHub/workspace/.github/linters/.gitleaks.toml diff --git a/GitHub/workspace/.github/linters/.gitleaks.toml b/GitHub/workspace/.github/linters/.gitleaks.toml deleted file mode 100644 index 78e2daaec..000000000 --- a/GitHub/workspace/.github/linters/.gitleaks.toml +++ /dev/null @@ -1,11 +0,0 @@ - -title = "gitleaks config" - -[extend] -# useDefault will extend the base configuration with the default gitleaks config: -# https://github.com/zricethezav/gitleaks/blob/master/config/gitleaks.toml -useDefault = false - -[allowlist] - description = "global allowlist. whitelisting paths" - paths = ['''hassio-addons/epicgamesfree/config.json'''] From f5a2eb10c668fe6ed9fbd19f1b1020d3998cc339 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Mon, 31 Oct 2022 07:30:59 +0100 Subject: [PATCH 164/243] Update onpush_superlinter.yml --- .github/workflows/onpush_superlinter.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/onpush_superlinter.yml b/.github/workflows/onpush_superlinter.yml index a92fb9e9b..911f5516d 100644 --- a/.github/workflows/onpush_superlinter.yml +++ b/.github/workflows/onpush_superlinter.yml @@ -47,3 +47,4 @@ jobs: DEFAULT_BRANCH: master GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} VALIDATE_NATURAL_LANGUAGE: false + GITLEAKS_CONFIG_FILE: /hassio-addons/.github/linters/gitleaks.toml From 8e9005890f3f63a0db52ba8701f6aaefd858c88a Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Mon, 31 Oct 2022 07:37:10 +0100 Subject: [PATCH 165/243] Update .gitleaks.toml --- .github/linters/.gitleaks.toml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/linters/.gitleaks.toml b/.github/linters/.gitleaks.toml index 78e2daaec..59d0dca0f 100644 --- a/.github/linters/.gitleaks.toml +++ b/.github/linters/.gitleaks.toml @@ -1,4 +1,3 @@ - title = "gitleaks config" [extend] @@ -7,5 +6,5 @@ title = "gitleaks config" useDefault = false [allowlist] - description = "global allowlist. whitelisting paths" - paths = ['''hassio-addons/epicgamesfree/config.json'''] +description = "global allowlist. whitelisting paths" +paths = ['''config.toml'''] From f231504b9538ff8c6bddf61ce24e12ca5aadaae8 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Mon, 31 Oct 2022 07:53:22 +0100 Subject: [PATCH 166/243] Update .gitleaks.toml --- .github/linters/.gitleaks.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/linters/.gitleaks.toml b/.github/linters/.gitleaks.toml index 59d0dca0f..d7113ed15 100644 --- a/.github/linters/.gitleaks.toml +++ b/.github/linters/.gitleaks.toml @@ -7,4 +7,4 @@ useDefault = false [allowlist] description = "global allowlist. whitelisting paths" -paths = ['''config.toml'''] +paths = ['''/hassio-addons/epicgamesfree/rootfs/templates/config.json'''] From fb658cd5d5a60098922a17fffadc64b0dc893997 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Mon, 31 Oct 2022 07:56:40 +0100 Subject: [PATCH 167/243] Update .gitleaks.toml --- .github/linters/.gitleaks.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/linters/.gitleaks.toml b/.github/linters/.gitleaks.toml index d7113ed15..9ff886cc3 100644 --- a/.github/linters/.gitleaks.toml +++ b/.github/linters/.gitleaks.toml @@ -7,4 +7,4 @@ useDefault = false [allowlist] description = "global allowlist. whitelisting paths" -paths = ['''/hassio-addons/epicgamesfree/rootfs/templates/config.json'''] +paths = ['''epicgamesfree/rootfs/templates/config.json'''] From 5da331cee4c38fceacdc5c091c4e8eef0609532f Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Mon, 31 Oct 2022 07:58:50 +0100 Subject: [PATCH 168/243] Update .gitleaks.toml --- .github/linters/.gitleaks.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/linters/.gitleaks.toml b/.github/linters/.gitleaks.toml index 9ff886cc3..80e6ef229 100644 --- a/.github/linters/.gitleaks.toml +++ b/.github/linters/.gitleaks.toml @@ -7,4 +7,4 @@ useDefault = false [allowlist] description = "global allowlist. whitelisting paths" -paths = ['''epicgamesfree/rootfs/templates/config.json'''] +paths = ['''**/epicgamesfree/rootfs/templates/config.json'''] From 78078ebbcfdbbd58600276af43a6653f8757669b Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Mon, 31 Oct 2022 08:02:59 +0100 Subject: [PATCH 169/243] Delete .gitleaks.toml --- .github/linters/.gitleaks.toml | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 .github/linters/.gitleaks.toml diff --git a/.github/linters/.gitleaks.toml b/.github/linters/.gitleaks.toml deleted file mode 100644 index 80e6ef229..000000000 --- a/.github/linters/.gitleaks.toml +++ /dev/null @@ -1,10 +0,0 @@ -title = "gitleaks config" - -[extend] -# useDefault will extend the base configuration with the default gitleaks config: -# https://github.com/zricethezav/gitleaks/blob/master/config/gitleaks.toml -useDefault = false - -[allowlist] -description = "global allowlist. whitelisting paths" -paths = ['''**/epicgamesfree/rootfs/templates/config.json'''] From ae3ef88236b50f7734f8eae3c9a66475ba7d034d Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Mon, 31 Oct 2022 08:03:44 +0100 Subject: [PATCH 170/243] Update onpush_superlinter.yml --- .github/workflows/onpush_superlinter.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/onpush_superlinter.yml b/.github/workflows/onpush_superlinter.yml index 911f5516d..8eaa41c04 100644 --- a/.github/workflows/onpush_superlinter.yml +++ b/.github/workflows/onpush_superlinter.yml @@ -47,4 +47,4 @@ jobs: DEFAULT_BRANCH: master GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} VALIDATE_NATURAL_LANGUAGE: false - GITLEAKS_CONFIG_FILE: /hassio-addons/.github/linters/gitleaks.toml + VALIDATE_GITLEAKS: false From f21353d5762b7d7c6f4b4b799f0fb4cdcdb6c5fa Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Mon, 31 Oct 2022 08:08:15 +0100 Subject: [PATCH 171/243] Create .gitleaks.toml --- .github/linters/.gitleaks.toml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 .github/linters/.gitleaks.toml diff --git a/.github/linters/.gitleaks.toml b/.github/linters/.gitleaks.toml new file mode 100644 index 000000000..80e6ef229 --- /dev/null +++ b/.github/linters/.gitleaks.toml @@ -0,0 +1,10 @@ +title = "gitleaks config" + +[extend] +# useDefault will extend the base configuration with the default gitleaks config: +# https://github.com/zricethezav/gitleaks/blob/master/config/gitleaks.toml +useDefault = false + +[allowlist] +description = "global allowlist. whitelisting paths" +paths = ['''**/epicgamesfree/rootfs/templates/config.json'''] From e5655d0faf56c6ac5af450756ff8ec69d15a78f1 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Mon, 31 Oct 2022 08:08:36 +0100 Subject: [PATCH 172/243] Update .gitleaks.toml --- .github/linters/.gitleaks.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/linters/.gitleaks.toml b/.github/linters/.gitleaks.toml index 80e6ef229..b4af78108 100644 --- a/.github/linters/.gitleaks.toml +++ b/.github/linters/.gitleaks.toml @@ -7,4 +7,4 @@ useDefault = false [allowlist] description = "global allowlist. whitelisting paths" -paths = ['''**/epicgamesfree/rootfs/templates/config.json'''] +paths = ['''**/templates/config.json'''] From 9a5a7373260f78b5edce4ac9b1ebedbdfeb941b9 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Mon, 31 Oct 2022 08:10:06 +0100 Subject: [PATCH 173/243] Update onpush_superlinter.yml --- .github/workflows/onpush_superlinter.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/onpush_superlinter.yml b/.github/workflows/onpush_superlinter.yml index 8eaa41c04..a92fb9e9b 100644 --- a/.github/workflows/onpush_superlinter.yml +++ b/.github/workflows/onpush_superlinter.yml @@ -47,4 +47,3 @@ jobs: DEFAULT_BRANCH: master GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} VALIDATE_NATURAL_LANGUAGE: false - VALIDATE_GITLEAKS: false From 72bd04aa30b2e3a431412c777a333e68b1a20b8a Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Mon, 31 Oct 2022 08:12:07 +0100 Subject: [PATCH 174/243] Update restart_addon --- transmission_openvpn/rootfs/usr/bin/restart_addon | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/transmission_openvpn/rootfs/usr/bin/restart_addon b/transmission_openvpn/rootfs/usr/bin/restart_addon index c93bb1922..bdff736b2 100644 --- a/transmission_openvpn/rootfs/usr/bin/restart_addon +++ b/transmission_openvpn/rootfs/usr/bin/restart_addon @@ -1,12 +1,11 @@ -#!/usr/bin/with-contenv bashio - +#!/usr/bin/env bashio bashio::log.fatal 'Tunnel down, addon restarting in 15 seconds' sleep 15 # force container environment -#for i in $(/usr/bin/env); do -#export "$i" 2>/dev/null || true -#done +for i in $(/usr/bin/env); do +export "$i" 2>/dev/null || true +done bashio::addon.restart From 6ada6fa7140c76981f8a2436d590bc8dc0680600 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Mon, 31 Oct 2022 08:13:42 +0100 Subject: [PATCH 175/243] Update config.json --- transmission_openvpn/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/transmission_openvpn/config.json b/transmission_openvpn/config.json index 673ab0f88..a5843e7e4 100644 --- a/transmission_openvpn/config.json +++ b/transmission_openvpn/config.json @@ -105,5 +105,5 @@ }, "slug": "transmission_openvpn", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "4.0-v28" + "version": "4.0-v29" } From 88817e98b92eff1fec20af3ccf0c7f36aff175a2 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Mon, 31 Oct 2022 08:15:08 +0100 Subject: [PATCH 176/243] Update config.json --- epicgamesfree/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epicgamesfree/config.json b/epicgamesfree/config.json index d3b4a70ee..d8e01c986 100644 --- a/epicgamesfree/config.json +++ b/epicgamesfree/config.json @@ -14,6 +14,6 @@ }, "slug": "epicgamesfree", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "ee3dff4b29757e28282cada9bcb3e8f84f1c3041-2022-10-23", + "version": "ee3dff4b29757e28282cada9bcb3e8f84f1c3041-2022-10-30", "webui": "[PROTO:ssl]://[HOST]:[PORT:3000]" } From b3e71f125c87d5c778f2276e67d4376425bcd2db Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Mon, 31 Oct 2022 08:27:22 +0100 Subject: [PATCH 177/243] Update .gitleaks.toml --- .github/linters/.gitleaks.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/linters/.gitleaks.toml b/.github/linters/.gitleaks.toml index b4af78108..609662ad9 100644 --- a/.github/linters/.gitleaks.toml +++ b/.github/linters/.gitleaks.toml @@ -7,4 +7,4 @@ useDefault = false [allowlist] description = "global allowlist. whitelisting paths" -paths = ['''**/templates/config.json'''] +paths = ['''/github/workspace/epicgamesfree/templates/config.json'''] From e7ffdb5caad8da2ca3611767646b58dd9a61b647 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Mon, 31 Oct 2022 08:27:50 +0100 Subject: [PATCH 178/243] Update config.json --- epicgamesfree/rootfs/templates/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epicgamesfree/rootfs/templates/config.json b/epicgamesfree/rootfs/templates/config.json index 76fb417a8..686fb522f 100644 --- a/epicgamesfree/rootfs/templates/config.json +++ b/epicgamesfree/rootfs/templates/config.json @@ -1,5 +1,5 @@ { - "runOnStartup": true, + "runOnStartup": true, "cronSchedule": "5 16 * * *", "logLevel": "info", "webPortalConfig": { From ea550cb9df23b036da45e71042b242c63b43438a Mon Sep 17 00:00:00 2001 From: Alexandre Date: Mon, 31 Oct 2022 09:32:53 +0100 Subject: [PATCH 179/243] Remove tabs --- emby/rootfs/etc/nginx/nginx.conf | 32 ++--- epicgamesfree/rootfs/templates/config.json | 118 +++++++++--------- mealie/rootfs/caddy.txt | 56 ++++----- portainer/rootfs/etc/services.d/portainer/run | 10 +- 4 files changed, 108 insertions(+), 108 deletions(-) diff --git a/emby/rootfs/etc/nginx/nginx.conf b/emby/rootfs/etc/nginx/nginx.conf index 9352b89fa..fb597811c 100644 --- a/emby/rootfs/etc/nginx/nginx.conf +++ b/emby/rootfs/etc/nginx/nginx.conf @@ -34,22 +34,22 @@ http { # https://emby.media/community/index.php?/topic/93074-how-to-emby-with-nginx-with-windows-specific-tips-and-csp-options/ server_names_hash_bucket_size 64; gzip_disable "msie6"; - gzip_comp_level 6; - gzip_min_length 1100; - gzip_buffers 16 8k; - gzip_proxied any; - gzip_types - text/plain - text/css - text/js - text/xml - text/javascript - application/javascript - application/x-javascript - application/json - application/xml - application/rss+xml - image/svg+xml; + gzip_comp_level 6; + gzip_min_length 1100; + gzip_buffers 16 8k; + gzip_proxied any; + gzip_types + text/plain + text/css + text/js + text/xml + text/javascript + application/javascript + application/x-javascript + application/json + application/xml + application/rss+xml + image/svg+xml; proxy_connect_timeout 1h; log_format hassio '[$time_local] $status ' diff --git a/epicgamesfree/rootfs/templates/config.json b/epicgamesfree/rootfs/templates/config.json index 686fb522f..a57a3cb66 100644 --- a/epicgamesfree/rootfs/templates/config.json +++ b/epicgamesfree/rootfs/templates/config.json @@ -1,62 +1,62 @@ { "runOnStartup": true, - "cronSchedule": "5 16 * * *", - "logLevel": "info", - "webPortalConfig": { - "baseUrl": "https://localhost:3000" - }, - "accounts": [ - { - "email": "example@gmail.com", - "password": "abc1234", - "totp": "EMNCF83ULU3K3PXPJBSWY3DPEHPK3PXPJWY3DPEHPK3YI69R39NE" - } - ], - "notifiers": [ - { - "type": "email", - "smtpHost": "smtp.gmail.com", - "smtpPort": 587, - "emailSenderAddress": "hello@gmail.com", - "emailSenderName": "Epic Games Captchas", - "emailRecipientAddress": "hello@gmail.com", - "secure": false, - "auth": { - "user": "hello@gmail.com", - "pass": "abc123" - } - }, - { - "type": "discord", - "webhookUrl": "https://discord.com/api/webhooks/123456789123456789/A-abcdefghijklmn-abcdefghijklmnopqrst12345678-abcdefghijklmnop123456", - "mentionedUsers": ["914360712086843432"], - "mentionedRoles": ["734548250895319070"] - }, - { - "type": "telegram", - "token": "644739147:AAGMPo-Jz3mKRnHRTnrPEDi7jUF1vqNOD5k", - "chatId": "-987654321" - }, - { - "type": "apprise", - "apiUrl": "http://192.168.1.2:8000", - "urls": "mailto://user:pass@gmail.com" - }, - { - "type": "pushover", - "token": "a172fyyl9gw99p2xi16tq8hnib48p2", - "userKey": "uvgidym7l5ggpwu2r8i1oy6diaapll" - }, - { - "type": "gotify", - "apiUrl": "https://gotify.net", - "token": "SnL-wAvmfo_QT" - }, - { - "type": "homeassistant", - "instance": "https://homeassistant.example.com", - "token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c", - "notifyservice": "mobile_app_smartphone_name" - } - ] + "cronSchedule": "5 16 * * *", + "logLevel": "info", + "webPortalConfig": { + "baseUrl": "https://localhost:3000" + }, + "accounts": [ + { + "email": "example@gmail.com", + "password": "abc1234", + "totp": "EMNCF83ULU3K3PXPJBSWY3DPEHPK3PXPJWY3DPEHPK3YI69R39NE" + } + ], + "notifiers": [ + { + "type": "email", + "smtpHost": "smtp.gmail.com", + "smtpPort": 587, + "emailSenderAddress": "hello@gmail.com", + "emailSenderName": "Epic Games Captchas", + "emailRecipientAddress": "hello@gmail.com", + "secure": false, + "auth": { + "user": "hello@gmail.com", + "pass": "abc123" + } + }, + { + "type": "discord", + "webhookUrl": "https://discord.com/api/webhooks/123456789123456789/A-abcdefghijklmn-abcdefghijklmnopqrst12345678-abcdefghijklmnop123456", + "mentionedUsers": ["914360712086843432"], + "mentionedRoles": ["734548250895319070"] + }, + { + "type": "telegram", + "token": "644739147:AAGMPo-Jz3mKRnHRTnrPEDi7jUF1vqNOD5k", + "chatId": "-987654321" + }, + { + "type": "apprise", + "apiUrl": "http://192.168.1.2:8000", + "urls": "mailto://user:pass@gmail.com" + }, + { + "type": "pushover", + "token": "a172fyyl9gw99p2xi16tq8hnib48p2", + "userKey": "uvgidym7l5ggpwu2r8i1oy6diaapll" + }, + { + "type": "gotify", + "apiUrl": "https://gotify.net", + "token": "SnL-wAvmfo_QT" + }, + { + "type": "homeassistant", + "instance": "https://homeassistant.example.com", + "token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c", + "notifyservice": "mobile_app_smartphone_name" + } + ] } diff --git a/mealie/rootfs/caddy.txt b/mealie/rootfs/caddy.txt index 1c9f0a75c..cbe2bb26f 100644 --- a/mealie/rootfs/caddy.txt +++ b/mealie/rootfs/caddy.txt @@ -1,17 +1,17 @@ :%%port%% { - @proxied path /api/* /docs /openapi.json + @proxied path /api/* /docs /openapi.json - @static { - file - path *.ico *.css *.js *.gif *.jpg *.jpeg *.png *.svg *.woff *.woff2 *.webp - } + @static { + file + path *.ico *.css *.js *.gif *.jpg *.jpeg *.png *.svg *.woff *.woff2 *.webp + } - encode gzip zstd + encode gzip zstd - # Handles Recipe Images / Assets - handle_path /api/media/recipes/* { - header Access-Control-Allow-Origin * + # Handles Recipe Images / Assets + handle_path /api/media/recipes/* { + header Access-Control-Allow-Origin * header X-Content-Type-Options nosniff header X-Robots-Tag none header -X-Frame-Options @@ -22,15 +22,15 @@ header X-Forwarded-For $proxy_add_x_forwarded_for header X-Forwarded-Proto $scheme header X-NginX-Proxy true - header X-External-Path $http_x_ingress_path + header X-External-Path $http_x_ingress_path header X-Real-IP $remote_addr - header @static Cache-Control max-age=31536000 - root * /app/data/recipes/ - file_server - } + header @static Cache-Control max-age=31536000 + root * /app/data/recipes/ + file_server + } - handle @proxied { - header Access-Control-Allow-Origin * + handle @proxied { + header Access-Control-Allow-Origin * header X-Content-Type-Options nosniff header X-Robots-Tag none header -X-Frame-Options @@ -42,13 +42,13 @@ header X-Forwarded-Proto $scheme header X-NginX-Proxy true header X-Real-IP $remote_addr - header X-External-Path $http_x_ingress_path; - rewrite * {Referer}{uri} - reverse_proxy http://127.0.0.1:9000 - } + header X-External-Path $http_x_ingress_path; + rewrite * {Referer}{uri} + reverse_proxy http://127.0.0.1:9000 + } - handle { - header Access-Control-Allow-Origin * + handle { + header Access-Control-Allow-Origin * header X-Content-Type-Options nosniff header X-Robots-Tag none header -X-Frame-Options @@ -60,11 +60,11 @@ header X-Forwarded-Proto $scheme header X-NginX-Proxy true header X-Real-IP $remote_addr - header X-External-Path $http_x_ingress_path; - header @static Cache-Control max-age=31536000 - root * /app/dist - try_files {path}.html {path} / - file_server - } + header X-External-Path $http_x_ingress_path; + header @static Cache-Control max-age=31536000 + root * /app/dist + try_files {path}.html {path} / + file_server + } } diff --git a/portainer/rootfs/etc/services.d/portainer/run b/portainer/rootfs/etc/services.d/portainer/run index f25569d67..420f6fdc6 100644 --- a/portainer/rootfs/etc/services.d/portainer/run +++ b/portainer/rootfs/etc/services.d/portainer/run @@ -42,11 +42,11 @@ CURRENTPASSWORD=$( cat /data/portainer_password ) # Reset password if not first run if bashio::fs.file_exists "/data/hidden"; then - if [ "$CURRENTPASSWORD" != "$PASSWORD" ]; then - mv -f /data/portainer.db /data/portainer.old || true - rm /data/hidden || true - bashio::log.warning "... password changed, database reseted. Previous version stored in /data/portainer.old" - fi + if [ "$CURRENTPASSWORD" != "$PASSWORD" ]; then + mv -f /data/portainer.db /data/portainer.old || true + rm /data/hidden || true + bashio::log.warning "... password changed, database reseted. Previous version stored in /data/portainer.old" + fi fi # Define option From b7dd32a7a4e08c9aa1dd68b67351bce33742a209 Mon Sep 17 00:00:00 2001 From: Alexandre Date: Mon, 31 Oct 2022 09:33:17 +0100 Subject: [PATCH 180/243] 11# Please enter the commit message for your changes. Lines starting --- epicgamesfree/config.json | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/epicgamesfree/config.json b/epicgamesfree/config.json index d8e01c986..5dc467670 100644 --- a/epicgamesfree/config.json +++ b/epicgamesfree/config.json @@ -1,10 +1,15 @@ { - "arch": ["aarch64", "amd64"], + "arch": [ + "aarch64", + "amd64" + ], "codenotary": "alexandrep.github@gmail.com", "description": "Automatically login and redeem promotional free games from Epic Games Store", "image": "ghcr.io/alexbelgium/epicgamesfree-{arch}", "init": false, - "map": ["config:rw"], + "map": [ + "config:rw" + ], "name": "Epic Games Free", "ports": { "3000/tcp": 3000 @@ -14,6 +19,6 @@ }, "slug": "epicgamesfree", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "ee3dff4b29757e28282cada9bcb3e8f84f1c3041-2022-10-30", + "version": "ee3dff4b29757e28282cada9bcb3e8f84f1c3041-2022-10-30-2", "webui": "[PROTO:ssl]://[HOST]:[PORT:3000]" -} +} \ No newline at end of file From a240ebb3e2a82293da5d4cc8b647a44d925951b2 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Mon, 31 Oct 2022 09:43:47 +0100 Subject: [PATCH 181/243] Correction --- emby/rootfs/etc/cont-init.d/91-silent.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/emby/rootfs/etc/cont-init.d/91-silent.sh b/emby/rootfs/etc/cont-init.d/91-silent.sh index 109d4d0b4..d647be6ae 100644 --- a/emby/rootfs/etc/cont-init.d/91-silent.sh +++ b/emby/rootfs/etc/cont-init.d/91-silent.sh @@ -1,4 +1,4 @@ -É#!/usr/bin/with-contenv bashio +#!/usr/bin/with-contenv bashio # shellcheck shell=bash ############### @@ -6,7 +6,7 @@ ############### if bashio::config.true 'silent'; then - APPEND=' > /dev/null' + APPEND=' >/dev/null' sed -i '$s|$|'"$APPEND"'|' /etc/s6-overlay/s6-rc.d/*/run bashio::log.info 'Silent mode activated, all logs from emby server are hidden. Disable this option if you need to troubleshoot the addon.' fi From 1cf60b186df3b78e94a075b159ed4d9112093313 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Mon, 31 Oct 2022 09:44:41 +0100 Subject: [PATCH 182/243] Update Dockerfile --- flexget/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flexget/Dockerfile b/flexget/Dockerfile index b5245e427..d992eb7f5 100644 --- a/flexget/Dockerfile +++ b/flexget/Dockerfile @@ -29,7 +29,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ SHELL ["/bin/bash", "-o", "pipefail", "-c"] -# hadolint ignore=SC2016 +# hadolint ignore=SC2016,SC2086 RUN \ # Set password files=$(grep -sril "set FG_WEBUI_PASSWD" /etc/s6-overlay/s6-rc.d) \ @@ -39,7 +39,7 @@ RUN \ # Global LSIO modifications ARG CONFIGLOCATION="/config/addons_config/flexget" -# hadolint ignore=SC2015, SC2013 +# hadolint ignore=SC2015,SC2013,SC2236 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 \ From bfd6424cdee7136d7c482df467012bbce39774b5 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Mon, 31 Oct 2022 09:45:18 +0100 Subject: [PATCH 183/243] Update Dockerfile --- nextcloud/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nextcloud/Dockerfile b/nextcloud/Dockerfile index 6ded6363a..35170e006 100644 --- a/nextcloud/Dockerfile +++ b/nextcloud/Dockerfile @@ -33,7 +33,7 @@ ENV NEXTCLOUD_PATH="/data/config/www/nextcloud" # Global LSIO modifications ARG CONFIGLOCATION="/data/config" -# shellcheck disable=SC2046 +# shellcheck disable=SC2046,SC2013 RUN \ # Remove upstream files rm -rf /etc/cont-init.d/10-adduser /etc/cont-init.d/30-keygen /etc/cont-init.d/40-config /etc/cont-init.d/50-install /etc/cont-init.d/60-memcache /etc/cont-init.d/70-aliases \ From 979ab2cdd4937ec3556795b54d06087a8bf4b231 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Mon, 31 Oct 2022 09:46:06 +0100 Subject: [PATCH 184/243] Update Dockerfile --- plex/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plex/Dockerfile b/plex/Dockerfile index 6a2321cea..2dda1e0db 100644 --- a/plex/Dockerfile +++ b/plex/Dockerfile @@ -28,7 +28,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ S6_SERVICES_GRACETIME=0 # Image specific modifications -# hadolint ignore=SC2016 +# hadolint ignore=SC2016,SC2086 RUN \ # CORRECT PLEX CLAIM file=$(grep -sril 'Server claimed successfully' /etc) \ @@ -38,7 +38,7 @@ RUN \ # Global LSIO modifications ARG CONFIGLOCATION="/config" -# hadolint ignore=SC2015, SC2013 +# hadolint ignore=SC2015,SC2013,SC2236 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 \ From 57e72353490b3e785939c6b50b86f772bfde847b Mon Sep 17 00:00:00 2001 From: Alexandre Date: Mon, 31 Oct 2022 09:49:50 +0100 Subject: [PATCH 185/243] Simplify recursive search --- bazarr/Dockerfile | 2 +- booksonic_air/Dockerfile | 2 +- calibre/Dockerfile | 2 +- calibre_web/Dockerfile | 2 +- code-server/Dockerfile | 2 +- flexget/Dockerfile | 2 +- grav/Dockerfile | 2 +- jackett/Dockerfile | 2 +- jellyfin/Dockerfile | 2 +- lidarr/Dockerfile | 2 +- mylar3/Dockerfile | 2 +- nextcloud/Dockerfile | 4 ++-- nzbget/Dockerfile | 2 +- ombi/Dockerfile | 2 +- organizr/Dockerfile | 2 +- overseerr/Dockerfile | 2 +- paperless_ngx/Dockerfile | 2 +- papermerge/Dockerfile | 2 +- piwigo/Dockerfile | 2 +- plex/Dockerfile | 2 +- plex_meta_manager/Dockerfile | 2 +- prowlarr/Dockerfile | 2 +- qbittorrent/Dockerfile | 2 +- radarr/Dockerfile | 2 +- readarr/Dockerfile | 2 +- requestrr/Dockerfile | 2 +- resiliosync/Dockerfile | 2 +- sonarr/Dockerfile | 2 +- transmission/Dockerfile | 2 +- ubooquity/Dockerfile | 2 +- unpackerr/Dockerfile | 2 +- webtop_kde/Dockerfile | 2 +- 32 files changed, 33 insertions(+), 33 deletions(-) diff --git a/bazarr/Dockerfile b/bazarr/Dockerfile index 0e1496819..da0f329af 100644 --- a/bazarr/Dockerfile +++ b/bazarr/Dockerfile @@ -41,7 +41,7 @@ RUN \ && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ \ # Correct config location - && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done diff --git a/booksonic_air/Dockerfile b/booksonic_air/Dockerfile index e7f2bee48..2a875804e 100644 --- a/booksonic_air/Dockerfile +++ b/booksonic_air/Dockerfile @@ -43,7 +43,7 @@ RUN \ && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ \ # Correct config location - && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done diff --git a/calibre/Dockerfile b/calibre/Dockerfile index 8daaa6357..b5181de5b 100644 --- a/calibre/Dockerfile +++ b/calibre/Dockerfile @@ -42,7 +42,7 @@ RUN \ && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ \ # Correct config location - && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done diff --git a/calibre_web/Dockerfile b/calibre_web/Dockerfile index 11c7220fc..ae90cc159 100644 --- a/calibre_web/Dockerfile +++ b/calibre_web/Dockerfile @@ -42,7 +42,7 @@ RUN \ && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ \ # Correct config location - && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done diff --git a/code-server/Dockerfile b/code-server/Dockerfile index 45216dc4c..1f2b81dc1 100644 --- a/code-server/Dockerfile +++ b/code-server/Dockerfile @@ -41,7 +41,7 @@ RUN \ && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ \ # Correct config location - && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done diff --git a/flexget/Dockerfile b/flexget/Dockerfile index b5245e427..6910a8178 100644 --- a/flexget/Dockerfile +++ b/flexget/Dockerfile @@ -51,7 +51,7 @@ RUN \ && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ \ # Correct config location - && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done diff --git a/grav/Dockerfile b/grav/Dockerfile index 6ef8aa5a8..b049ab473 100644 --- a/grav/Dockerfile +++ b/grav/Dockerfile @@ -41,7 +41,7 @@ RUN \ && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ \ # Correct config location - && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done diff --git a/jackett/Dockerfile b/jackett/Dockerfile index 76255a827..3dfac9c6f 100644 --- a/jackett/Dockerfile +++ b/jackett/Dockerfile @@ -41,7 +41,7 @@ RUN \ && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ \ # Correct config location - && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done diff --git a/jellyfin/Dockerfile b/jellyfin/Dockerfile index c33882bdd..6843f001f 100644 --- a/jellyfin/Dockerfile +++ b/jellyfin/Dockerfile @@ -42,7 +42,7 @@ RUN \ && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ \ # Correct config location - && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done diff --git a/lidarr/Dockerfile b/lidarr/Dockerfile index ba8429219..690fdd437 100644 --- a/lidarr/Dockerfile +++ b/lidarr/Dockerfile @@ -41,7 +41,7 @@ RUN \ && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ \ # Correct config location - && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done diff --git a/mylar3/Dockerfile b/mylar3/Dockerfile index 1b8cb4f77..c972ea586 100644 --- a/mylar3/Dockerfile +++ b/mylar3/Dockerfile @@ -41,7 +41,7 @@ RUN \ && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ \ # Correct config location - && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done diff --git a/nextcloud/Dockerfile b/nextcloud/Dockerfile index 6ded6363a..623ae7dfc 100644 --- a/nextcloud/Dockerfile +++ b/nextcloud/Dockerfile @@ -40,8 +40,8 @@ RUN \ # Make permissions && chmod +x /defaults/nextcloud-perms.sh \ # default folders - && for file in $(grep -Esril "/data[ '\"/]|/data\$" /etc /defaults); do sed -Ei "s=(/data)+(/| |$|\"|\')=/share/nextcloud\2=g" "$file"; done \ - && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/data[ '\"/]|/data\$" /etc /defaults); do sed -Ei "s=(/data)+(/| |$|\"|\')=/share/nextcloud\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ # modify data limits files && sed -i \ -e 's/upload_max_filesize=1024M/upload_max_filesize=10240M/g' \ diff --git a/nzbget/Dockerfile b/nzbget/Dockerfile index cb9430797..f798fa007 100644 --- a/nzbget/Dockerfile +++ b/nzbget/Dockerfile @@ -45,7 +45,7 @@ RUN \ && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ \ # Correct config location - && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done diff --git a/ombi/Dockerfile b/ombi/Dockerfile index 62886a489..f6ee977a6 100644 --- a/ombi/Dockerfile +++ b/ombi/Dockerfile @@ -41,7 +41,7 @@ RUN \ && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ \ # Correct config location - && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done diff --git a/organizr/Dockerfile b/organizr/Dockerfile index ed5dc171a..30143a2b3 100644 --- a/organizr/Dockerfile +++ b/organizr/Dockerfile @@ -40,7 +40,7 @@ RUN \ && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ \ # Correct config location - && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done diff --git a/overseerr/Dockerfile b/overseerr/Dockerfile index 7d4b28b9c..a51e13422 100644 --- a/overseerr/Dockerfile +++ b/overseerr/Dockerfile @@ -42,7 +42,7 @@ RUN \ && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ \ # Correct config location - && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done diff --git a/paperless_ngx/Dockerfile b/paperless_ngx/Dockerfile index dcc8edd6f..1265e84da 100644 --- a/paperless_ngx/Dockerfile +++ b/paperless_ngx/Dockerfile @@ -41,7 +41,7 @@ RUN \ && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ \ # Correct config location - && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done diff --git a/papermerge/Dockerfile b/papermerge/Dockerfile index d8678d6d9..8ad20de50 100644 --- a/papermerge/Dockerfile +++ b/papermerge/Dockerfile @@ -48,7 +48,7 @@ RUN \ && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ \ # Correct config location - && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done diff --git a/piwigo/Dockerfile b/piwigo/Dockerfile index fe8484e2c..8aae6f49c 100644 --- a/piwigo/Dockerfile +++ b/piwigo/Dockerfile @@ -41,7 +41,7 @@ RUN \ && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ \ # Correct config location - && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done diff --git a/plex/Dockerfile b/plex/Dockerfile index 6a2321cea..af673caae 100644 --- a/plex/Dockerfile +++ b/plex/Dockerfile @@ -50,7 +50,7 @@ RUN \ && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ \ # Correct config location - && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done diff --git a/plex_meta_manager/Dockerfile b/plex_meta_manager/Dockerfile index 7f589f594..9e624c895 100644 --- a/plex_meta_manager/Dockerfile +++ b/plex_meta_manager/Dockerfile @@ -49,7 +49,7 @@ RUN \ && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ \ # Correct config location - && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done diff --git a/prowlarr/Dockerfile b/prowlarr/Dockerfile index 1d1661dd5..8192ea7d5 100644 --- a/prowlarr/Dockerfile +++ b/prowlarr/Dockerfile @@ -41,7 +41,7 @@ RUN \ && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ \ # Correct config location - && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done diff --git a/qbittorrent/Dockerfile b/qbittorrent/Dockerfile index f93d980dc..7a45d5765 100644 --- a/qbittorrent/Dockerfile +++ b/qbittorrent/Dockerfile @@ -64,7 +64,7 @@ RUN \ && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ \ # Correct config location - && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done \ diff --git a/radarr/Dockerfile b/radarr/Dockerfile index dd85df354..af13f7398 100644 --- a/radarr/Dockerfile +++ b/radarr/Dockerfile @@ -41,7 +41,7 @@ RUN \ && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ \ # Correct config location - && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done diff --git a/readarr/Dockerfile b/readarr/Dockerfile index 6918fa4ee..bee4c687c 100644 --- a/readarr/Dockerfile +++ b/readarr/Dockerfile @@ -42,7 +42,7 @@ RUN \ && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ \ # Correct config location - && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done diff --git a/requestrr/Dockerfile b/requestrr/Dockerfile index 41f2b27c6..8c65d16b2 100644 --- a/requestrr/Dockerfile +++ b/requestrr/Dockerfile @@ -41,7 +41,7 @@ RUN \ && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ \ # Correct config location - && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done diff --git a/resiliosync/Dockerfile b/resiliosync/Dockerfile index 127b25edf..69f883d3c 100644 --- a/resiliosync/Dockerfile +++ b/resiliosync/Dockerfile @@ -55,7 +55,7 @@ RUN \ && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ \ # Correct config location - && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done diff --git a/sonarr/Dockerfile b/sonarr/Dockerfile index 42589fd08..78a53ae00 100644 --- a/sonarr/Dockerfile +++ b/sonarr/Dockerfile @@ -42,7 +42,7 @@ RUN \ && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ \ # Correct config location - && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done diff --git a/transmission/Dockerfile b/transmission/Dockerfile index 69b178d7c..70ed11943 100644 --- a/transmission/Dockerfile +++ b/transmission/Dockerfile @@ -41,7 +41,7 @@ RUN \ && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ \ # Correct config location - && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done diff --git a/ubooquity/Dockerfile b/ubooquity/Dockerfile index 8972d993d..441882c19 100644 --- a/ubooquity/Dockerfile +++ b/ubooquity/Dockerfile @@ -51,7 +51,7 @@ RUN \ && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ \ # Correct config location - && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done diff --git a/unpackerr/Dockerfile b/unpackerr/Dockerfile index 1a1d58a79..de059c348 100644 --- a/unpackerr/Dockerfile +++ b/unpackerr/Dockerfile @@ -41,7 +41,7 @@ RUN \ && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ \ # Correct config location - && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done diff --git a/webtop_kde/Dockerfile b/webtop_kde/Dockerfile index ea7d89b29..8ae764228 100644 --- a/webtop_kde/Dockerfile +++ b/webtop_kde/Dockerfile @@ -54,7 +54,7 @@ RUN \ && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ \ # Correct config location - && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ \ # Avoid chmod /config && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done From e3d6078190029d8f390b5f8e14f59ef6b55ca57c Mon Sep 17 00:00:00 2001 From: Alexandre Date: Mon, 31 Oct 2022 09:52:49 +0100 Subject: [PATCH 186/243] Allow multile files --- bazarr/Dockerfile | 10 +++++----- booksonic_air/Dockerfile | 10 +++++----- calibre/Dockerfile | 10 +++++----- calibre_web/Dockerfile | 10 +++++----- code-server/Dockerfile | 10 +++++----- emby/Dockerfile | 10 +++++----- flexget/Dockerfile | 10 +++++----- grav/Dockerfile | 10 +++++----- jackett/Dockerfile | 10 +++++----- jellyfin/Dockerfile | 10 +++++----- lidarr/Dockerfile | 10 +++++----- mylar3/Dockerfile | 10 +++++----- nextcloud/Dockerfile | 4 ++-- nzbget/Dockerfile | 10 +++++----- ombi/Dockerfile | 10 +++++----- organizr/Dockerfile | 10 +++++----- overseerr/Dockerfile | 10 +++++----- paperless_ngx/Dockerfile | 10 +++++----- papermerge/Dockerfile | 10 +++++----- piwigo/Dockerfile | 10 +++++----- plex/Dockerfile | 10 +++++----- plex_meta_manager/Dockerfile | 10 +++++----- prowlarr/Dockerfile | 10 +++++----- qbittorrent/Dockerfile | 12 ++++++------ radarr/Dockerfile | 10 +++++----- readarr/Dockerfile | 10 +++++----- requestrr/Dockerfile | 10 +++++----- resiliosync/Dockerfile | 16 ++++++++-------- sonarr/Dockerfile | 10 +++++----- transmission/Dockerfile | 10 +++++----- ubooquity/Dockerfile | 10 +++++----- unpackerr/Dockerfile | 10 +++++----- webtop_kde/Dockerfile | 12 ++++++------ 33 files changed, 167 insertions(+), 167 deletions(-) diff --git a/bazarr/Dockerfile b/bazarr/Dockerfile index da0f329af..0fbf98b9b 100644 --- a/bazarr/Dockerfile +++ b/bazarr/Dockerfile @@ -32,19 +32,19 @@ ARG CONFIGLOCATION="/config/addons_config/bazarr" # hadolint ignore=SC2015, SC2013 RUN \ # Avoid custom-init.d duplications - for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ + for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \ \ # Create new config folder if needed - && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" $file; done \ \ # Allow UID and GID setting - && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $file; done \ \ # Correct config location - && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $file; done \ \ # Avoid chmod /config - && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done + && for file in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done ################## # 3 Install apps # diff --git a/booksonic_air/Dockerfile b/booksonic_air/Dockerfile index 2a875804e..f1f9e03ab 100644 --- a/booksonic_air/Dockerfile +++ b/booksonic_air/Dockerfile @@ -34,19 +34,19 @@ ARG CONFIGLOCATION="/data" # hadolint ignore=SC2015, SC2013 RUN \ # Avoid custom-init.d duplications - for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ + for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \ \ # Create new config folder if needed - && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" $file; done \ \ # Allow UID and GID setting - && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $file; done \ \ # Correct config location - && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $file; done \ \ # Avoid chmod /config - && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done + && for file in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done ################## # 3 Install apps # diff --git a/calibre/Dockerfile b/calibre/Dockerfile index b5181de5b..73e2bc565 100644 --- a/calibre/Dockerfile +++ b/calibre/Dockerfile @@ -33,19 +33,19 @@ ARG CONFIGLOCATION="/config/addons_config/calibre" # hadolint ignore=SC2015, SC2013 RUN \ # Avoid custom-init.d duplications - for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ + for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \ \ # Create new config folder if needed - && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" $file; done \ \ # Allow UID and GID setting - && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $file; done \ \ # Correct config location - && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $file; done \ \ # Avoid chmod /config - && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done + && for file in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done # Specific images modifications RUN \ diff --git a/calibre_web/Dockerfile b/calibre_web/Dockerfile index ae90cc159..bb4aaca5e 100644 --- a/calibre_web/Dockerfile +++ b/calibre_web/Dockerfile @@ -33,19 +33,19 @@ ARG CONFIGLOCATION="/config/addons_config/calibre-web" # hadolint ignore=SC2015, SC2013 RUN \ # Avoid custom-init.d duplications - for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ + for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \ \ # Create new config folder if needed - && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" $file; done \ \ # Allow UID and GID setting - && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $file; done \ \ # Correct config location - && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $file; done \ \ # Avoid chmod /config - && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done + && for file in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done # Specific images modifications RUN \ diff --git a/code-server/Dockerfile b/code-server/Dockerfile index 1f2b81dc1..15525eb09 100644 --- a/code-server/Dockerfile +++ b/code-server/Dockerfile @@ -32,19 +32,19 @@ ARG CONFIGLOCATION="/data" # hadolint ignore=SC2015, SC2013 RUN \ # Avoid custom-init.d duplications - for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ + for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \ \ # Create new config folder if needed - && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" $file; done \ \ # Allow UID and GID setting - && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $file; done \ \ # Correct config location - && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $file; done \ \ # Avoid chmod /config - && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done + && for file in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done ################## # 3 Install apps # diff --git a/emby/Dockerfile b/emby/Dockerfile index 4e128b8d2..9b8ed2255 100644 --- a/emby/Dockerfile +++ b/emby/Dockerfile @@ -32,19 +32,19 @@ ARG CONFIGLOCATION="/emby" # hadolint ignore=SC2015, SC2013 RUN \ # Avoid custom-init.d duplications - for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ + for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \ \ # Create new config folder if needed - && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" $file; done \ \ # Allow UID and GID setting - && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $file; done \ \ # Search occurences of /config and change it to the expected new config - && for file in $(grep -Esril "/config" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $file; done \ \ # Avoid chmod /config - && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done + && for file in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done ################## # 3 Install apps # diff --git a/flexget/Dockerfile b/flexget/Dockerfile index 2493749e3..02bac8bac 100644 --- a/flexget/Dockerfile +++ b/flexget/Dockerfile @@ -42,19 +42,19 @@ ARG CONFIGLOCATION="/config/addons_config/flexget" # hadolint ignore=SC2015,SC2013,SC2236 RUN \ # Avoid custom-init.d duplications - for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ + for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \ \ # Create new config folder if needed - && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" $file; done \ \ # Allow UID and GID setting - && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $file; done \ \ # Correct config location - && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $file; done \ \ # Avoid chmod /config - && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done + && for file in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done ################## # 3 Install apps # diff --git a/grav/Dockerfile b/grav/Dockerfile index b049ab473..d6b7f4ad0 100644 --- a/grav/Dockerfile +++ b/grav/Dockerfile @@ -32,19 +32,19 @@ ARG CONFIGLOCATION="/share/grav" # hadolint ignore=SC2015, SC2013 RUN \ # Avoid custom-init.d duplications - for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ + for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \ \ # Create new config folder if needed - && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" $file; done \ \ # Allow UID and GID setting - && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $file; done \ \ # Correct config location - && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $file; done \ \ # Avoid chmod /config - && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done + && for file in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done ################## # 3 Install apps # diff --git a/jackett/Dockerfile b/jackett/Dockerfile index 3dfac9c6f..8362c0d35 100644 --- a/jackett/Dockerfile +++ b/jackett/Dockerfile @@ -32,19 +32,19 @@ ARG CONFIGLOCATION="/config/addons_config/Jackett" # hadolint ignore=SC2015, SC2013 RUN \ # Avoid custom-init.d duplications - for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ + for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \ \ # Create new config folder if needed - && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" $file; done \ \ # Allow UID and GID setting - && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $file; done \ \ # Correct config location - && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $file; done \ \ # Avoid chmod /config - && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done + && for file in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done # Changes config directory ENV XDG_CONFIG_HOME="/config/addons_config" diff --git a/jellyfin/Dockerfile b/jellyfin/Dockerfile index 6843f001f..7b07e28b3 100644 --- a/jellyfin/Dockerfile +++ b/jellyfin/Dockerfile @@ -33,19 +33,19 @@ ARG CONFIGLOCATION="/config" # hadolint ignore=SC2015, SC2013 RUN \ # Avoid custom-init.d duplications - for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ + for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \ \ # Create new config folder if needed - && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" $file; done \ \ # Allow UID and GID setting - && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $file; done \ \ # Correct config location - && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $file; done \ \ # Avoid chmod /config - && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done + && for file in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done ################## # 3 Install apps # diff --git a/lidarr/Dockerfile b/lidarr/Dockerfile index 690fdd437..11a0e1a6c 100644 --- a/lidarr/Dockerfile +++ b/lidarr/Dockerfile @@ -32,19 +32,19 @@ ARG CONFIGLOCATION="/config/addons_config/lidarr" # hadolint ignore=SC2015, SC2013 RUN \ # Avoid custom-init.d duplications - for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ + for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \ \ # Create new config folder if needed - && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" $file; done \ \ # Allow UID and GID setting - && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $file; done \ \ # Correct config location - && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $file; done \ \ # Avoid chmod /config - && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done + && for file in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done ################## # 3 Install apps # diff --git a/mylar3/Dockerfile b/mylar3/Dockerfile index c972ea586..5cb2b60fd 100644 --- a/mylar3/Dockerfile +++ b/mylar3/Dockerfile @@ -32,19 +32,19 @@ ARG CONFIGLOCATION="/data" # hadolint ignore=SC2015, SC2013 RUN \ # Avoid custom-init.d duplications - for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ + for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \ \ # Create new config folder if needed - && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" $file; done \ \ # Allow UID and GID setting - && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $file; done \ \ # Correct config location - && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $file; done \ \ # Avoid chmod /config - && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done + && for file in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done ################## # 3 Install apps # diff --git a/nextcloud/Dockerfile b/nextcloud/Dockerfile index 6d47f7687..9cbae3c5c 100644 --- a/nextcloud/Dockerfile +++ b/nextcloud/Dockerfile @@ -40,8 +40,8 @@ RUN \ # Make permissions && chmod +x /defaults/nextcloud-perms.sh \ # default folders - && for file in $(grep -Esril "/data[ '\"/]|/data\$" /etc /defaults); do sed -Ei "s=(/data)+(/| |$|\"|\')=/share/nextcloud\2=g" "$file"; done \ - && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/data[ '\"/]|/data\$" /etc /defaults); do sed -Ei "s=(/data)+(/| |$|\"|\')=/share/nextcloud\2=g" $file; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $file; done \ # modify data limits files && sed -i \ -e 's/upload_max_filesize=1024M/upload_max_filesize=10240M/g' \ diff --git a/nzbget/Dockerfile b/nzbget/Dockerfile index f798fa007..b5ebfbc8d 100644 --- a/nzbget/Dockerfile +++ b/nzbget/Dockerfile @@ -36,19 +36,19 @@ ARG CONFIGLOCATION="/config/addons_config/nzbget" # hadolint ignore=SC2015, SC2013 RUN \ # Avoid custom-init.d duplications - for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ + for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \ \ # Create new config folder if needed - && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" $file; done \ \ # Allow UID and GID setting - && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $file; done \ \ # Correct config location - && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $file; done \ \ # Avoid chmod /config - && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done + && for file in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done ################## # 3 Install apps # diff --git a/ombi/Dockerfile b/ombi/Dockerfile index f6ee977a6..426e26f15 100644 --- a/ombi/Dockerfile +++ b/ombi/Dockerfile @@ -32,19 +32,19 @@ ARG CONFIGLOCATION="/config/addons_config/ombi" # hadolint ignore=SC2015, SC2013 RUN \ # Avoid custom-init.d duplications - for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ + for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \ \ # Create new config folder if needed - && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" $file; done \ \ # Allow UID and GID setting - && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $file; done \ \ # Correct config location - && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $file; done \ \ # Avoid chmod /config - && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done + && for file in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done ################## # 3 Install apps # diff --git a/organizr/Dockerfile b/organizr/Dockerfile index 30143a2b3..b76045304 100644 --- a/organizr/Dockerfile +++ b/organizr/Dockerfile @@ -31,19 +31,19 @@ ARG CONFIGLOCATION="/data/organizr" # hadolint ignore=SC2015, SC2013 RUN \ # Avoid custom-init.d duplications - for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ + for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \ \ # Create new config folder if needed - && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" $file; done \ \ # Allow UID and GID setting - && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $file; done \ \ # Correct config location - && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $file; done \ \ # Avoid chmod /config - && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done + && for file in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done ################## # 3 Install apps # diff --git a/overseerr/Dockerfile b/overseerr/Dockerfile index a51e13422..d44e4265a 100644 --- a/overseerr/Dockerfile +++ b/overseerr/Dockerfile @@ -33,19 +33,19 @@ ARG CONFIGLOCATION="/config/addons_config/overseerr" # hadolint ignore=SC2015, SC2013 RUN \ # Avoid custom-init.d duplications - for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ + for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \ \ # Create new config folder if needed - && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" $file; done \ \ # Allow UID and GID setting - && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $file; done \ \ # Correct config location - && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $file; done \ \ # Avoid chmod /config - && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done + && for file in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done ################## # 3 Install apps # diff --git a/paperless_ngx/Dockerfile b/paperless_ngx/Dockerfile index 1265e84da..a914be011 100644 --- a/paperless_ngx/Dockerfile +++ b/paperless_ngx/Dockerfile @@ -32,19 +32,19 @@ ARG CONFIGLOCATION="/config/addons_config/paperless_ng" # hadolint ignore=SC2015, SC2013 RUN \ # Avoid custom-init.d duplications - for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ + for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \ \ # Create new config folder if needed - && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" $file; done \ \ # Allow UID and GID setting - && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $file; done \ \ # Correct config location - && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $file; done \ \ # Avoid chmod /config - && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done + && for file in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done ################## # 3 Install apps # diff --git a/papermerge/Dockerfile b/papermerge/Dockerfile index 8ad20de50..1976df2d3 100644 --- a/papermerge/Dockerfile +++ b/papermerge/Dockerfile @@ -39,19 +39,19 @@ ARG CONFIGLOCATION="/config" # hadolint ignore=SC2015, SC2013 RUN \ # Avoid custom-init.d duplications - for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ + for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \ \ # Create new config folder if needed - && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" $file; done \ \ # Allow UID and GID setting - && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $file; done \ \ # Correct config location - && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $file; done \ \ # Avoid chmod /config - && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done + && for file in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done ################## # 3 Install apps # diff --git a/piwigo/Dockerfile b/piwigo/Dockerfile index 8aae6f49c..fe79c1e84 100644 --- a/piwigo/Dockerfile +++ b/piwigo/Dockerfile @@ -32,19 +32,19 @@ ARG CONFIGLOCATION="/config" # hadolint ignore=SC2015, SC2013 RUN \ # Avoid custom-init.d duplications - for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ + for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \ \ # Create new config folder if needed - && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" $file; done \ \ # Allow UID and GID setting - && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $file; done \ \ # Correct config location - && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $file; done \ \ # Avoid chmod /config - && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done + && for file in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done ################## # 3 Install apps # diff --git a/plex/Dockerfile b/plex/Dockerfile index 08d077f3b..9ca357c8c 100644 --- a/plex/Dockerfile +++ b/plex/Dockerfile @@ -41,19 +41,19 @@ ARG CONFIGLOCATION="/config" # hadolint ignore=SC2015,SC2013,SC2236 RUN \ # Avoid custom-init.d duplications - for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ + for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \ \ # Create new config folder if needed - && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" $file; done \ \ # Allow UID and GID setting - && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $file; done \ \ # Correct config location - && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $file; done \ \ # Avoid chmod /config - && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done + && for file in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done ################## diff --git a/plex_meta_manager/Dockerfile b/plex_meta_manager/Dockerfile index 9e624c895..3e051b630 100644 --- a/plex_meta_manager/Dockerfile +++ b/plex_meta_manager/Dockerfile @@ -40,19 +40,19 @@ ARG CONFIGLOCATION="/config/addons_config/plex-meta-manager" # hadolint ignore=SC2015, SC2013 RUN \ # Avoid custom-init.d duplications - for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ + for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \ \ # Create new config folder if needed - && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" $file; done \ \ # Allow UID and GID setting - && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $file; done \ \ # Correct config location - && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $file; done \ \ # Avoid chmod /config - && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done + && for file in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done ################## # 3 Install apps # diff --git a/prowlarr/Dockerfile b/prowlarr/Dockerfile index 8192ea7d5..f051b1f9e 100644 --- a/prowlarr/Dockerfile +++ b/prowlarr/Dockerfile @@ -32,19 +32,19 @@ ARG CONFIGLOCATION="/config/addons_config/prowlarr" # hadolint ignore=SC2015, SC2013 RUN \ # Avoid custom-init.d duplications - for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ + for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \ \ # Create new config folder if needed - && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" $file; done \ \ # Allow UID and GID setting - && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $file; done \ \ # Correct config location - && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $file; done \ \ # Avoid chmod /config - && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done + && for file in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done ################## # 3 Install apps # diff --git a/qbittorrent/Dockerfile b/qbittorrent/Dockerfile index 7a45d5765..7b54daec7 100644 --- a/qbittorrent/Dockerfile +++ b/qbittorrent/Dockerfile @@ -55,22 +55,22 @@ ARG CONFIGLOCATION="/config/addons_config/qBittorrent" # hadolint ignore=SC2015, SC2013 RUN \ # Avoid custom-init.d duplications - for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ + for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \ \ # Create new config folder if needed - && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" $file; done \ \ # Allow UID and GID setting - && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $file; done \ \ # Correct config location - && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $file; done \ \ # Avoid chmod /config - && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done \ + && for file in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done \ \ # Avoid chmod /config - && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done + && for file in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done ################## # 3 Install apps # diff --git a/radarr/Dockerfile b/radarr/Dockerfile index af13f7398..e3b581abf 100644 --- a/radarr/Dockerfile +++ b/radarr/Dockerfile @@ -32,19 +32,19 @@ ARG CONFIGLOCATION="/config/addons_config/radarr" # hadolint ignore=SC2015, SC2013 RUN \ # Avoid custom-init.d duplications - for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ + for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \ \ # Create new config folder if needed - && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" $file; done \ \ # Allow UID and GID setting - && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $file; done \ \ # Correct config location - && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $file; done \ \ # Avoid chmod /config - && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done + && for file in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done ################## # 3 Install apps # diff --git a/readarr/Dockerfile b/readarr/Dockerfile index bee4c687c..80194f348 100644 --- a/readarr/Dockerfile +++ b/readarr/Dockerfile @@ -33,19 +33,19 @@ ARG CONFIGLOCATION="/config/addons_config/readarr" # hadolint ignore=SC2015, SC2013 RUN \ # Avoid custom-init.d duplications - for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ + for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \ \ # Create new config folder if needed - && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" $file; done \ \ # Allow UID and GID setting - && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $file; done \ \ # Correct config location - && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $file; done \ \ # Avoid chmod /config - && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done + && for file in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done ################## # 3 Install apps # diff --git a/requestrr/Dockerfile b/requestrr/Dockerfile index 8c65d16b2..b2bd11593 100644 --- a/requestrr/Dockerfile +++ b/requestrr/Dockerfile @@ -32,19 +32,19 @@ ARG CONFIGLOCATION="/data" # hadolint ignore=SC2015, SC2013 RUN \ # Avoid custom-init.d duplications - for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ + for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \ \ # Create new config folder if needed - && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" $file; done \ \ # Allow UID and GID setting - && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $file; done \ \ # Correct config location - && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $file; done \ \ # Avoid chmod /config - && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done + && for file in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done ################## # 3 Install apps # diff --git a/resiliosync/Dockerfile b/resiliosync/Dockerfile index 69f883d3c..b404bbc56 100644 --- a/resiliosync/Dockerfile +++ b/resiliosync/Dockerfile @@ -31,10 +31,10 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # hadolint ignore=SC2015,DL4006,SC2013 RUN \ # Correct sync folder - for file in $(grep -Esril "/sync[ '\"/]|/sync\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/sync=/share/resiliosync=g" "$file"; done \ - && for file in $(grep -ril "/share/resiliosync.conf" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/share/resiliosync.conf=/sync.conf=g" "$file"; done \ + for file in $(grep -Esril "/sync[ '\"/]|/sync\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/sync=/share/resiliosync=g" $file; done \ + && for file in $(grep -ril "/share/resiliosync.conf" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/share/resiliosync.conf=/sync.conf=g" $file; done \ # Correct sync folder - && for file in $(grep -Esril "/downloads[ '\"/]|/downloads\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/downloads=/share/resiliosync_downloads=g" "$file"; done \ + && for file in $(grep -Esril "/downloads[ '\"/]|/downloads\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/downloads=/share/resiliosync_downloads=g" $file; done \ # Adapt sync.conf && sed -i 's|"directory_root_policy" : "belowroot"|"directory_root_policy" : "all"|g' /defaults/sync.conf \ && sed -i 's|"allow_empty_password" : false|"allow_empty_password" : true|g' /defaults/sync.conf \ @@ -46,19 +46,19 @@ ARG CONFIGLOCATION="/share/resiliosync_config" # hadolint ignore=SC2015, SC2013 RUN \ # Avoid custom-init.d duplications - for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ + for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \ \ # Create new config folder if needed - && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" $file; done \ \ # Allow UID and GID setting - && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $file; done \ \ # Correct config location - && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $file; done \ \ # Avoid chmod /config - && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done + && for file in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done ################## # 3 Install apps # diff --git a/sonarr/Dockerfile b/sonarr/Dockerfile index 78a53ae00..a72a73076 100644 --- a/sonarr/Dockerfile +++ b/sonarr/Dockerfile @@ -33,19 +33,19 @@ ARG CONFIGLOCATION="/config/addons_config/sonarr" # hadolint ignore=SC2015, SC2013 RUN \ # Avoid custom-init.d duplications - for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ + for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \ \ # Create new config folder if needed - && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" $file; done \ \ # Allow UID and GID setting - && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $file; done \ \ # Correct config location - && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $file; done \ \ # Avoid chmod /config - && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done + && for file in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done ################## # 3 Install apps # diff --git a/transmission/Dockerfile b/transmission/Dockerfile index 70ed11943..d0343c9cc 100644 --- a/transmission/Dockerfile +++ b/transmission/Dockerfile @@ -32,19 +32,19 @@ ARG CONFIGLOCATION="/config/transmission" # hadolint ignore=SC2015, SC2013 RUN \ # Avoid custom-init.d duplications - for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ + for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \ \ # Create new config folder if needed - && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" $file; done \ \ # Allow UID and GID setting - && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $file; done \ \ # Correct config location - && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $file; done \ \ # Avoid chmod /config - && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done + && for file in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done ################## # 3 Install apps # diff --git a/ubooquity/Dockerfile b/ubooquity/Dockerfile index 441882c19..b28183e78 100644 --- a/ubooquity/Dockerfile +++ b/ubooquity/Dockerfile @@ -42,19 +42,19 @@ ARG CONFIGLOCATION="/config/addons_config/ubooquity" # hadolint ignore=SC2015, SC2013 RUN \ # Avoid custom-init.d duplications - for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ + for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \ \ # Create new config folder if needed - && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" $file; done \ \ # Allow UID and GID setting - && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $file; done \ \ # Correct config location - && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $file; done \ \ # Avoid chmod /config - && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done + && for file in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done ################## # 3 Install apps # diff --git a/unpackerr/Dockerfile b/unpackerr/Dockerfile index de059c348..77e63c314 100644 --- a/unpackerr/Dockerfile +++ b/unpackerr/Dockerfile @@ -32,19 +32,19 @@ ARG CONFIGLOCATION="/config" # hadolint ignore=SC2015, SC2013 RUN \ # Avoid custom-init.d duplications - for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ + for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \ \ # Create new config folder if needed - && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" $file; done \ \ # Allow UID and GID setting - && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $file; done \ \ # Correct config location - && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $file; done \ \ # Avoid chmod /config - && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done + && for file in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done ################## # 3 Install apps # diff --git a/webtop_kde/Dockerfile b/webtop_kde/Dockerfile index 8ae764228..1908e15c6 100644 --- a/webtop_kde/Dockerfile +++ b/webtop_kde/Dockerfile @@ -34,7 +34,7 @@ RUN \ usermod --home /share/webtop_kde abc \ \ # Correct error in upstream image - && for file in $(grep -srl "startwm " /etc); do sed -i 's/startwm /startwm.sh /g' "$file"; done \ + && for file in $(grep -srl "startwm " /etc); do sed -i 's/startwm /startwm.sh /g' $file; done \ \ # Update distribution # hadolint ignore=DL3017 @@ -45,19 +45,19 @@ ARG CONFIGLOCATION="/share/webtop_kde" # hadolint ignore=SC2015, SC2013 RUN \ # Avoid custom-init.d duplications - for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ + for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \ \ # Create new config folder if needed - && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" $file; done \ \ # Allow UID and GID setting - && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' "$file" && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' "$file"; done \ + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $file; done \ \ # Correct config location - && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" "$file"; done \ + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $file; done \ \ # Avoid chmod /config - && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done + && for file in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done ################## # 3 Install apps # From 64ae8d27ab57a23d68a9f2c3c4cd7f8fd16fecfe Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Mon, 31 Oct 2022 09:54:34 +0100 Subject: [PATCH 187/243] Update Dockerfile --- nextcloud/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/nextcloud/Dockerfile b/nextcloud/Dockerfile index 9cbae3c5c..5ea9917b5 100644 --- a/nextcloud/Dockerfile +++ b/nextcloud/Dockerfile @@ -33,6 +33,7 @@ ENV NEXTCLOUD_PATH="/data/config/www/nextcloud" # Global LSIO modifications ARG CONFIGLOCATION="/data/config" +# hadolint ignore=SC2013 # shellcheck disable=SC2046,SC2013 RUN \ # Remove upstream files From 16c7ac444f78ddd1f63bb2c02c342f95e8e70648 Mon Sep 17 00:00:00 2001 From: Alexandre Date: Mon, 31 Oct 2022 09:57:51 +0100 Subject: [PATCH 188/243] Align hadolint --- bazarr/Dockerfile | 2 +- booksonic_air/Dockerfile | 2 +- calibre/Dockerfile | 2 +- calibre_web/Dockerfile | 2 +- code-server/Dockerfile | 2 +- emby/Dockerfile | 2 +- flexget/Dockerfile | 2 +- grav/Dockerfile | 2 +- jackett/Dockerfile | 2 +- jellyfin/Dockerfile | 2 +- lidarr/Dockerfile | 2 +- mylar3/Dockerfile | 2 +- nzbget/Dockerfile | 2 +- ombi/Dockerfile | 2 +- organizr/Dockerfile | 2 +- overseerr/Dockerfile | 2 +- paperless_ngx/Dockerfile | 2 +- papermerge/Dockerfile | 2 +- piwigo/Dockerfile | 2 +- plex/Dockerfile | 2 +- plex_meta_manager/Dockerfile | 2 +- prowlarr/Dockerfile | 2 +- qbittorrent/Dockerfile | 2 +- radarr/Dockerfile | 2 +- readarr/Dockerfile | 2 +- requestrr/Dockerfile | 2 +- resiliosync/Dockerfile | 2 +- sonarr/Dockerfile | 2 +- transmission/Dockerfile | 2 +- ubooquity/Dockerfile | 2 +- unpackerr/Dockerfile | 2 +- webtop_kde/Dockerfile | 2 +- 32 files changed, 32 insertions(+), 32 deletions(-) diff --git a/bazarr/Dockerfile b/bazarr/Dockerfile index 0fbf98b9b..241c05b96 100644 --- a/bazarr/Dockerfile +++ b/bazarr/Dockerfile @@ -29,7 +29,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # Global LSIO modifications ARG CONFIGLOCATION="/config/addons_config/bazarr" -# hadolint ignore=SC2015, SC2013 +# hadolint ignore=SC2015, SC2013, SC2086, SC2086 RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \ diff --git a/booksonic_air/Dockerfile b/booksonic_air/Dockerfile index f1f9e03ab..7f4c3b882 100644 --- a/booksonic_air/Dockerfile +++ b/booksonic_air/Dockerfile @@ -31,7 +31,7 @@ ENV BOOKSONIC_AIR_SETTINGS="/data" # Global LSIO modifications ARG CONFIGLOCATION="/data" -# hadolint ignore=SC2015, SC2013 +# hadolint ignore=SC2015, SC2013, SC2086 RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \ diff --git a/calibre/Dockerfile b/calibre/Dockerfile index 73e2bc565..2cac6d459 100644 --- a/calibre/Dockerfile +++ b/calibre/Dockerfile @@ -30,7 +30,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # Global LSIO modifications ARG CONFIGLOCATION="/config/addons_config/calibre" -# hadolint ignore=SC2015, SC2013 +# hadolint ignore=SC2015, SC2013, SC2086 RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \ diff --git a/calibre_web/Dockerfile b/calibre_web/Dockerfile index bb4aaca5e..6e568d6a7 100644 --- a/calibre_web/Dockerfile +++ b/calibre_web/Dockerfile @@ -30,7 +30,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # Global LSIO modifications ARG CONFIGLOCATION="/config/addons_config/calibre-web" -# hadolint ignore=SC2015, SC2013 +# hadolint ignore=SC2015, SC2013, SC2086 RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \ diff --git a/code-server/Dockerfile b/code-server/Dockerfile index 15525eb09..bf6aa856d 100644 --- a/code-server/Dockerfile +++ b/code-server/Dockerfile @@ -29,7 +29,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # Global LSIO modifications ARG CONFIGLOCATION="/data" -# hadolint ignore=SC2015, SC2013 +# hadolint ignore=SC2015, SC2013, SC2086 RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \ diff --git a/emby/Dockerfile b/emby/Dockerfile index 9b8ed2255..71f000804 100644 --- a/emby/Dockerfile +++ b/emby/Dockerfile @@ -29,7 +29,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # Global LSIO modifications ARG CONFIGLOCATION="/emby" -# hadolint ignore=SC2015, SC2013 +# hadolint ignore=SC2015, SC2013, SC2086 RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \ diff --git a/flexget/Dockerfile b/flexget/Dockerfile index 02bac8bac..8fc3184d0 100644 --- a/flexget/Dockerfile +++ b/flexget/Dockerfile @@ -39,7 +39,7 @@ RUN \ # Global LSIO modifications ARG CONFIGLOCATION="/config/addons_config/flexget" -# hadolint ignore=SC2015,SC2013,SC2236 +# hadolint ignore=SC2015, SC2013, SC2086 RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \ diff --git a/grav/Dockerfile b/grav/Dockerfile index d6b7f4ad0..902d735f0 100644 --- a/grav/Dockerfile +++ b/grav/Dockerfile @@ -29,7 +29,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # Global LSIO modifications ARG CONFIGLOCATION="/share/grav" -# hadolint ignore=SC2015, SC2013 +# hadolint ignore=SC2015, SC2013, SC2086 RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \ diff --git a/jackett/Dockerfile b/jackett/Dockerfile index 8362c0d35..5ccd19532 100644 --- a/jackett/Dockerfile +++ b/jackett/Dockerfile @@ -29,7 +29,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # Global LSIO modifications ARG CONFIGLOCATION="/config/addons_config/Jackett" -# hadolint ignore=SC2015, SC2013 +# hadolint ignore=SC2015, SC2013, SC2086 RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \ diff --git a/jellyfin/Dockerfile b/jellyfin/Dockerfile index 7b07e28b3..669d2115c 100644 --- a/jellyfin/Dockerfile +++ b/jellyfin/Dockerfile @@ -30,7 +30,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=0 \ # Global LSIO modifications ARG CONFIGLOCATION="/config" -# hadolint ignore=SC2015, SC2013 +# hadolint ignore=SC2015, SC2013, SC2086 RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \ diff --git a/lidarr/Dockerfile b/lidarr/Dockerfile index 11a0e1a6c..198691eaa 100644 --- a/lidarr/Dockerfile +++ b/lidarr/Dockerfile @@ -29,7 +29,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # Global LSIO modifications ARG CONFIGLOCATION="/config/addons_config/lidarr" -# hadolint ignore=SC2015, SC2013 +# hadolint ignore=SC2015, SC2013, SC2086 RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \ diff --git a/mylar3/Dockerfile b/mylar3/Dockerfile index 5cb2b60fd..5534c103e 100644 --- a/mylar3/Dockerfile +++ b/mylar3/Dockerfile @@ -29,7 +29,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # Global LSIO modifications ARG CONFIGLOCATION="/data" -# hadolint ignore=SC2015, SC2013 +# hadolint ignore=SC2015, SC2013, SC2086 RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \ diff --git a/nzbget/Dockerfile b/nzbget/Dockerfile index b5ebfbc8d..c98366576 100644 --- a/nzbget/Dockerfile +++ b/nzbget/Dockerfile @@ -33,7 +33,7 @@ RUN \ # Global LSIO modifications ARG CONFIGLOCATION="/config/addons_config/nzbget" -# hadolint ignore=SC2015, SC2013 +# hadolint ignore=SC2015, SC2013, SC2086 RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \ diff --git a/ombi/Dockerfile b/ombi/Dockerfile index 426e26f15..248d24df4 100644 --- a/ombi/Dockerfile +++ b/ombi/Dockerfile @@ -29,7 +29,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # Global LSIO modifications ARG CONFIGLOCATION="/config/addons_config/ombi" -# hadolint ignore=SC2015, SC2013 +# hadolint ignore=SC2015, SC2013, SC2086 RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \ diff --git a/organizr/Dockerfile b/organizr/Dockerfile index b76045304..ab4ef2832 100644 --- a/organizr/Dockerfile +++ b/organizr/Dockerfile @@ -28,7 +28,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # Global LSIO modifications ARG CONFIGLOCATION="/data/organizr" -# hadolint ignore=SC2015, SC2013 +# hadolint ignore=SC2015, SC2013, SC2086 RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \ diff --git a/overseerr/Dockerfile b/overseerr/Dockerfile index d44e4265a..0ad128fa2 100644 --- a/overseerr/Dockerfile +++ b/overseerr/Dockerfile @@ -30,7 +30,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # Global LSIO modifications ARG CONFIGLOCATION="/config/addons_config/overseerr" -# hadolint ignore=SC2015, SC2013 +# hadolint ignore=SC2015, SC2013, SC2086 RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \ diff --git a/paperless_ngx/Dockerfile b/paperless_ngx/Dockerfile index a914be011..36b09797e 100644 --- a/paperless_ngx/Dockerfile +++ b/paperless_ngx/Dockerfile @@ -29,7 +29,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # Global LSIO modifications ARG CONFIGLOCATION="/config/addons_config/paperless_ng" -# hadolint ignore=SC2015, SC2013 +# hadolint ignore=SC2015, SC2013, SC2086 RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \ diff --git a/papermerge/Dockerfile b/papermerge/Dockerfile index 1976df2d3..8a111ec3b 100644 --- a/papermerge/Dockerfile +++ b/papermerge/Dockerfile @@ -36,7 +36,7 @@ RUN \ # Global LSIO modifications ARG CONFIGLOCATION="/config" -# hadolint ignore=SC2015, SC2013 +# hadolint ignore=SC2015, SC2013, SC2086 RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \ diff --git a/piwigo/Dockerfile b/piwigo/Dockerfile index fe79c1e84..12d9ac144 100644 --- a/piwigo/Dockerfile +++ b/piwigo/Dockerfile @@ -29,7 +29,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # Global LSIO modifications ARG CONFIGLOCATION="/config" -# hadolint ignore=SC2015, SC2013 +# hadolint ignore=SC2015, SC2013, SC2086 RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \ diff --git a/plex/Dockerfile b/plex/Dockerfile index 9ca357c8c..644789824 100644 --- a/plex/Dockerfile +++ b/plex/Dockerfile @@ -38,7 +38,7 @@ RUN \ # Global LSIO modifications ARG CONFIGLOCATION="/config" -# hadolint ignore=SC2015,SC2013,SC2236 +# hadolint ignore=SC2015, SC2013, SC2086 RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \ diff --git a/plex_meta_manager/Dockerfile b/plex_meta_manager/Dockerfile index 3e051b630..6916a72e7 100644 --- a/plex_meta_manager/Dockerfile +++ b/plex_meta_manager/Dockerfile @@ -37,7 +37,7 @@ RUN \ # Global LSIO modifications ARG CONFIGLOCATION="/config/addons_config/plex-meta-manager" -# hadolint ignore=SC2015, SC2013 +# hadolint ignore=SC2015, SC2013, SC2086 RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \ diff --git a/prowlarr/Dockerfile b/prowlarr/Dockerfile index f051b1f9e..9ecef138c 100644 --- a/prowlarr/Dockerfile +++ b/prowlarr/Dockerfile @@ -29,7 +29,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # Global LSIO modifications ARG CONFIGLOCATION="/config/addons_config/prowlarr" -# hadolint ignore=SC2015, SC2013 +# hadolint ignore=SC2015, SC2013, SC2086 RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \ diff --git a/qbittorrent/Dockerfile b/qbittorrent/Dockerfile index 7b54daec7..7873d186f 100644 --- a/qbittorrent/Dockerfile +++ b/qbittorrent/Dockerfile @@ -52,7 +52,7 @@ RUN \ # Global LSIO modifications ARG CONFIGLOCATION="/config/addons_config/qBittorrent" -# hadolint ignore=SC2015, SC2013 +# hadolint ignore=SC2015, SC2013, SC2086 RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \ diff --git a/radarr/Dockerfile b/radarr/Dockerfile index e3b581abf..cbcb01abe 100644 --- a/radarr/Dockerfile +++ b/radarr/Dockerfile @@ -29,7 +29,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # Global LSIO modifications ARG CONFIGLOCATION="/config/addons_config/radarr" -# hadolint ignore=SC2015, SC2013 +# hadolint ignore=SC2015, SC2013, SC2086 RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \ diff --git a/readarr/Dockerfile b/readarr/Dockerfile index 80194f348..f97c66356 100644 --- a/readarr/Dockerfile +++ b/readarr/Dockerfile @@ -30,7 +30,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # Global LSIO modifications ARG CONFIGLOCATION="/config/addons_config/readarr" -# hadolint ignore=SC2015, SC2013 +# hadolint ignore=SC2015, SC2013, SC2086 RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \ diff --git a/requestrr/Dockerfile b/requestrr/Dockerfile index b2bd11593..636e53934 100644 --- a/requestrr/Dockerfile +++ b/requestrr/Dockerfile @@ -29,7 +29,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # Global LSIO modifications ARG CONFIGLOCATION="/data" -# hadolint ignore=SC2015, SC2013 +# hadolint ignore=SC2015, SC2013, SC2086 RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \ diff --git a/resiliosync/Dockerfile b/resiliosync/Dockerfile index b404bbc56..4a9a66436 100644 --- a/resiliosync/Dockerfile +++ b/resiliosync/Dockerfile @@ -43,7 +43,7 @@ RUN \ # Global LSIO modifications ARG CONFIGLOCATION="/share/resiliosync_config" -# hadolint ignore=SC2015, SC2013 +# hadolint ignore=SC2015, SC2013, SC2086 RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \ diff --git a/sonarr/Dockerfile b/sonarr/Dockerfile index a72a73076..68579bc40 100644 --- a/sonarr/Dockerfile +++ b/sonarr/Dockerfile @@ -30,7 +30,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # Global LSIO modifications ARG CONFIGLOCATION="/config/addons_config/sonarr" -# hadolint ignore=SC2015, SC2013 +# hadolint ignore=SC2015, SC2013, SC2086 RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \ diff --git a/transmission/Dockerfile b/transmission/Dockerfile index d0343c9cc..d1c7d8b56 100644 --- a/transmission/Dockerfile +++ b/transmission/Dockerfile @@ -29,7 +29,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # Global LSIO modifications ARG CONFIGLOCATION="/config/transmission" -# hadolint ignore=SC2015, SC2013 +# hadolint ignore=SC2015, SC2013, SC2086 RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \ diff --git a/ubooquity/Dockerfile b/ubooquity/Dockerfile index b28183e78..a7b9127b0 100644 --- a/ubooquity/Dockerfile +++ b/ubooquity/Dockerfile @@ -39,7 +39,7 @@ RUN \ # Global LSIO modifications ARG CONFIGLOCATION="/config/addons_config/ubooquity" -# hadolint ignore=SC2015, SC2013 +# hadolint ignore=SC2015, SC2013, SC2086 RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \ diff --git a/unpackerr/Dockerfile b/unpackerr/Dockerfile index 77e63c314..04c7b5e1d 100644 --- a/unpackerr/Dockerfile +++ b/unpackerr/Dockerfile @@ -29,7 +29,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # Global LSIO modifications ARG CONFIGLOCATION="/config" -# hadolint ignore=SC2015, SC2013 +# hadolint ignore=SC2015, SC2013, SC2086 RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \ diff --git a/webtop_kde/Dockerfile b/webtop_kde/Dockerfile index 1908e15c6..287d81c92 100644 --- a/webtop_kde/Dockerfile +++ b/webtop_kde/Dockerfile @@ -42,7 +42,7 @@ RUN \ # Global LSIO modifications ARG CONFIGLOCATION="/share/webtop_kde" -# hadolint ignore=SC2015, SC2013 +# hadolint ignore=SC2015, SC2013, SC2086 RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \ From a57aaa5e4a77747daad6ccae99a42992c465bfea Mon Sep 17 00:00:00 2001 From: Alexandre Date: Mon, 31 Oct 2022 14:02:49 +0100 Subject: [PATCH 189/243] Lint --- nextcloud/Dockerfile | 2 +- resiliosync/Dockerfile | 2 +- webtop_kde/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nextcloud/Dockerfile b/nextcloud/Dockerfile index 5ea9917b5..0a6c6e7d1 100644 --- a/nextcloud/Dockerfile +++ b/nextcloud/Dockerfile @@ -34,7 +34,7 @@ ENV NEXTCLOUD_PATH="/data/config/www/nextcloud" # Global LSIO modifications ARG CONFIGLOCATION="/data/config" # hadolint ignore=SC2013 -# shellcheck disable=SC2046,SC2013 +# shellcheck disable=SC2046,SC2013,SC2086 RUN \ # Remove upstream files rm -rf /etc/cont-init.d/10-adduser /etc/cont-init.d/30-keygen /etc/cont-init.d/40-config /etc/cont-init.d/50-install /etc/cont-init.d/60-memcache /etc/cont-init.d/70-aliases \ diff --git a/resiliosync/Dockerfile b/resiliosync/Dockerfile index 4a9a66436..476edd714 100644 --- a/resiliosync/Dockerfile +++ b/resiliosync/Dockerfile @@ -28,7 +28,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \ S6_SERVICES_GRACETIME=0 -# hadolint ignore=SC2015,DL4006,SC2013 +# hadolint ignore=SC2015,DL4006,SC2013,SC2086 RUN \ # Correct sync folder for file in $(grep -Esril "/sync[ '\"/]|/sync\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/sync=/share/resiliosync=g" $file; done \ diff --git a/webtop_kde/Dockerfile b/webtop_kde/Dockerfile index 287d81c92..52ed61b3e 100644 --- a/webtop_kde/Dockerfile +++ b/webtop_kde/Dockerfile @@ -28,7 +28,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ S6_SERVICES_GRACETIME=0 # Allow UID and GID setting -# hadolint ignore=SC2015,DL4006,SC2013 +# hadolint ignore=SC2015,DL4006,SC2013,SC2086 RUN \ # Change home folder location usermod --home /share/webtop_kde abc \ From 10487be872f03d9dbb6f8f788299500eaeb1f262 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 31 Oct 2022 13:05:12 +0000 Subject: [PATCH 190/243] Github bot : issues linked to readme --- nextcloud/README.md | 1 - plex/README.md | 1 - 2 files changed, 2 deletions(-) diff --git a/nextcloud/README.md b/nextcloud/README.md index 6885aaf93..ba2cf0639 100644 --- a/nextcloud/README.md +++ b/nextcloud/README.md @@ -1,4 +1,3 @@ -## ⚠ Open Issue : [🐛 [Nextcloud] Addon fails to start fater update to 25.0.0 (opened 2022-10-20)](https://github.com/alexbelgium/hassio-addons/issues/519) by [@kulmegil](https://github.com/kulmegil) # Home assistant add-on: Nextcloud [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) diff --git a/plex/README.md b/plex/README.md index 24ed1e3a4..dd2914348 100644 --- a/plex/README.md +++ b/plex/README.md @@ -1,4 +1,3 @@ -## ⚠ Open Issue : [🐛 [Plex NAS] Issue description (opened 2022-10-22)](https://github.com/alexbelgium/hassio-addons/issues/525) by [@NPC-112](https://github.com/NPC-112) # Home assistant add-on: plex [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) From 014467ca1d5a35be79347657210c8ed076964635 Mon Sep 17 00:00:00 2001 From: Alexandre Date: Mon, 31 Oct 2022 14:25:17 +0100 Subject: [PATCH 191/243] Test --- webtop_kde/config.json | 4 ++-- webtop_kde/rootfs/etc/cont-init.d/00-data_location.sh | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/webtop_kde/config.json b/webtop_kde/config.json index 934cbb0d0..a6a3e10a5 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-ls75-6", + "version": "4.16-r0-ls75-7", "video": true -} +} \ No newline at end of file diff --git a/webtop_kde/rootfs/etc/cont-init.d/00-data_location.sh b/webtop_kde/rootfs/etc/cont-init.d/00-data_location.sh index 7222e456e..c31abbd4c 100644 --- a/webtop_kde/rootfs/etc/cont-init.d/00-data_location.sh +++ b/webtop_kde/rootfs/etc/cont-init.d/00-data_location.sh @@ -34,10 +34,8 @@ bashio::log.info "Setting data location to $LOCATION" sed -i "1a export HOME=$LOCATION" /etc/s6-overlay/s6-rc.d/svc-web/run || true sed -i "1a export FM_HOME=$LOCATION" /etc/s6-overlay/s6-rc.d/svc-web/run || true -sed -i "s|/share/webtop_kde|$LOCATION|g" /defaults/* || true -sed -i "s|/share/webtop_kde|$LOCATION|g" /etc/s6-overlay/s6-rc.d/*/* || true -sed -i "s|/share/webtop_kde|$LOCATION|g" /etc/s6-overlay/s6-rc.d/*/run || true -sed -i "s|/share/webtop_kde|$LOCATION|g" /etc/cont-init.d/* +sed -i "s|/share/webtop_kde|$LOCATION|g" $(find /defaults -type f) || true +sed -i "s|/share/webtop_kde|$LOCATION|g" $(find /etc -type f) || true usermod --home "$LOCATION" abc # Create folder From 5329bedaf59a0c449918522627b34ea0f3028cb4 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Mon, 31 Oct 2022 14:27:10 +0100 Subject: [PATCH 192/243] Lint --- nextcloud/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nextcloud/Dockerfile b/nextcloud/Dockerfile index 0a6c6e7d1..1cef9893b 100644 --- a/nextcloud/Dockerfile +++ b/nextcloud/Dockerfile @@ -33,7 +33,7 @@ ENV NEXTCLOUD_PATH="/data/config/www/nextcloud" # Global LSIO modifications ARG CONFIGLOCATION="/data/config" -# hadolint ignore=SC2013 +# hadolint ignore=SC2013,SC2086 # shellcheck disable=SC2046,SC2013,SC2086 RUN \ # Remove upstream files From e79157530cb0fe1e1ef73dee600f4f4abf6f3d27 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Mon, 31 Oct 2022 14:30:30 +0100 Subject: [PATCH 193/243] Update Dockerfile --- nextcloud/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nextcloud/Dockerfile b/nextcloud/Dockerfile index 1cef9893b..b7c9f5802 100644 --- a/nextcloud/Dockerfile +++ b/nextcloud/Dockerfile @@ -33,8 +33,7 @@ ENV NEXTCLOUD_PATH="/data/config/www/nextcloud" # Global LSIO modifications ARG CONFIGLOCATION="/data/config" -# hadolint ignore=SC2013,SC2086 -# shellcheck disable=SC2046,SC2013,SC2086 +# hadolint ignore=SC2046,SC2013,SC2086 RUN \ # Remove upstream files rm -rf /etc/cont-init.d/10-adduser /etc/cont-init.d/30-keygen /etc/cont-init.d/40-config /etc/cont-init.d/50-install /etc/cont-init.d/60-memcache /etc/cont-init.d/70-aliases \ From aad7d1b9e9c046b9fb353544faf7a1fb065eb4b4 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Mon, 31 Oct 2022 15:56:29 +0100 Subject: [PATCH 194/243] Correct --- webtop_kde/rootfs/etc/cont-init.d/00-data_location.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/webtop_kde/rootfs/etc/cont-init.d/00-data_location.sh b/webtop_kde/rootfs/etc/cont-init.d/00-data_location.sh index c31abbd4c..ffc8ceb2a 100644 --- a/webtop_kde/rootfs/etc/cont-init.d/00-data_location.sh +++ b/webtop_kde/rootfs/etc/cont-init.d/00-data_location.sh @@ -35,7 +35,10 @@ bashio::log.info "Setting data location to $LOCATION" sed -i "1a export HOME=$LOCATION" /etc/s6-overlay/s6-rc.d/svc-web/run || true sed -i "1a export FM_HOME=$LOCATION" /etc/s6-overlay/s6-rc.d/svc-web/run || true sed -i "s|/share/webtop_kde|$LOCATION|g" $(find /defaults -type f) || true -sed -i "s|/share/webtop_kde|$LOCATION|g" $(find /etc -type f) || true +sed -i "s|/share/webtop_kde|$LOCATION|g" $(find /etc/cont-init.d -type f) || true +sed -i "s|/share/webtop_kde|$LOCATION|g" $(find /etc/services.d -type f) || true +sed -i "s|/share/webtop_kde|$LOCATION|g" $(find /etc/s6-overlay/s6-rc.d -type f) || true + usermod --home "$LOCATION" abc # Create folder From 2dc0201ee34b68a7fcf07e79d7b6e8d16e73c35f Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Mon, 31 Oct 2022 15:56:47 +0100 Subject: [PATCH 195/243] Update config.json --- webtop_kde/config.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webtop_kde/config.json b/webtop_kde/config.json index a6a3e10a5..c66bf548f 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-ls75-7", + "version": "4.16-r0-ls75-8", "video": true -} \ No newline at end of file +} From 14a293dac8b3d6a3aeb86938df4050c2c2fb5923 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 31 Oct 2022 17:10:45 +0000 Subject: [PATCH 196/243] GitHub bot : README updated --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index b1f520353..a452cffaf 100644 --- a/README.md +++ b/README.md @@ -75,7 +75,7 @@ If you want to do add the repository manually, please follow the procedure highl ![Update](https://img.shields.io/badge/dynamic/json?label=Updated&query=%24.last_update&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fcalibre%2Fupdater.json) ![aarch64][aarch64-badge] ![amd64][amd64-badge] -![armv7no][armv7no-badge] +![armv7][armv7-badge] ![ingress][ingress-badge] ![smb][smb-badge] ![localdisks][localdisks-badge] @@ -148,7 +148,7 @@ If you want to do add the repository manually, please follow the procedure highl ![armv7][armv7-badge] ![mqtt][mqtt-badge] -✓ [Epic Games Free](epicgamesfree/) : Automatically login and redeem promotional free games from the Epic Games Store +✓ [Epic Games Free](epicgamesfree/) : Automatically login and redeem promotional free games from Epic Games Store   ![Version](https://img.shields.io/badge/dynamic/json?label=Version&query=%24.version&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fepicgamesfree%2Fconfig.json) ![Update](https://img.shields.io/badge/dynamic/json?label=Updated&query=%24.last_update&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fepicgamesfree%2Fupdater.json) @@ -625,7 +625,7 @@ If you want to do add the repository manually, please follow the procedure highl ![Update](https://img.shields.io/badge/dynamic/json?label=Updated&query=%24.last_update&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Funpackerr%2Fupdater.json) ![aarch64][aarch64-badge] ![amd64][amd64-badge] -![armv7][armv7-badge] +![armv7no][armv7no-badge] ✓ [Vaultwarden (Bitwarden)](bitwarden/) : Open source password management solution From a395d4994e13331e82a268cb57c2fddace642052 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Mon, 31 Oct 2022 22:37:11 +0100 Subject: [PATCH 197/243] Update 90-ingress.sh --- webtop_kde/rootfs/etc/cont-init.d/90-ingress.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webtop_kde/rootfs/etc/cont-init.d/90-ingress.sh b/webtop_kde/rootfs/etc/cont-init.d/90-ingress.sh index 36fb0dd88..7abd4dc69 100644 --- a/webtop_kde/rootfs/etc/cont-init.d/90-ingress.sh +++ b/webtop_kde/rootfs/etc/cont-init.d/90-ingress.sh @@ -33,4 +33,4 @@ sed -i "s/%%port%%/${ingress_port}/g" /etc/nginx/servers/ingress.conf sed -i "s/%%interface%%/${ingress_interface}/g" /etc/nginx/servers/ingress.conf # Implement SUBFOLDER value -sed -i "1a SUBFOLDER=$(bashio::addon.ingress_url)" /s6-overlay/s6-rc.d/svc-autostart/run +sed -i "1a SUBFOLDER=$(bashio::addon.ingress_url)" /etc/s6-overlay/s6-rc.d/svc-autostart/run From 6f4f0914f89a3a60c295d158d7b4b3285e165117 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Mon, 31 Oct 2022 22:48:52 +0100 Subject: [PATCH 198/243] Ingress corrected --- webtop_kde/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webtop_kde/config.json b/webtop_kde/config.json index c66bf548f..668f2a346 100644 --- a/webtop_kde/config.json +++ b/webtop_kde/config.json @@ -112,6 +112,6 @@ "slug": "webtop-kde", "udev": true, "url": "https://github.com/alexbelgium/hassio-addons", - "version": "4.16-r0-ls75-8", + "version": "4.16-r0-ls75-9", "video": true } From 6774e9b10622e78c6e7ab0c1148b875add95e7ad Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Tue, 1 Nov 2022 01:55:51 +0100 Subject: [PATCH 199/243] Updater bot : booksonic_air updated to v2201.1.0-ls72 --- booksonic_air/CHANGELOG.md | 3 +++ booksonic_air/config.json | 2 +- booksonic_air/updater.json | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/booksonic_air/CHANGELOG.md b/booksonic_air/CHANGELOG.md index c7f2df640..3c04711d7 100644 --- a/booksonic_air/CHANGELOG.md +++ b/booksonic_air/CHANGELOG.md @@ -1,4 +1,7 @@ +## v2201.1.0-ls72 (01-11-2022) +- Update to latest version from linuxserver/docker-booksonic-air + ## v2201.1.0-ls71 (18-10-2022) - Update to latest version from linuxserver/docker-booksonic-air diff --git a/booksonic_air/config.json b/booksonic_air/config.json index fdd075126..4b249762c 100644 --- a/booksonic_air/config.json +++ b/booksonic_air/config.json @@ -78,6 +78,6 @@ }, "slug": "booksonic-air_nas", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/booksonic_air", - "version": "v2201.1.0-ls71", + "version": "v2201.1.0-ls72", "webui": "[PROTO:ssl]://[HOST]:[PORT:4040]" } diff --git a/booksonic_air/updater.json b/booksonic_air/updater.json index 4a2e83cd8..3f4912618 100644 --- a/booksonic_air/updater.json +++ b/booksonic_air/updater.json @@ -1,9 +1,9 @@ { "github_fulltag": "true", - "last_update": "18-10-2022", + "last_update": "01-11-2022", "repository": "alexbelgium/hassio-addons", "slug": "booksonic_air", "source": "github", "upstream_repo": "linuxserver/docker-booksonic-air", - "upstream_version": "v2201.1.0-ls71" + "upstream_version": "v2201.1.0-ls72" } From 66629caefcc1321b27790fdb211904c14c6871c9 Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Tue, 1 Nov 2022 01:55:59 +0100 Subject: [PATCH 200/243] Updater bot : calibre updated to v6.7.1-ls190 --- calibre/CHANGELOG.md | 3 +++ calibre/config.json | 2 +- calibre/updater.json | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/calibre/CHANGELOG.md b/calibre/CHANGELOG.md index 8de66f9e3..74794f9ee 100644 --- a/calibre/CHANGELOG.md +++ b/calibre/CHANGELOG.md @@ -1,4 +1,7 @@ +## v6.7.1-ls190 (01-11-2022) +- Update to latest version from linuxserver/docker-calibre + ## v6.7.1-ls189 (25-10-2022) - Update to latest version from linuxserver/docker-calibre diff --git a/calibre/config.json b/calibre/config.json index 7bfb770e8..5bfdeb778 100644 --- a/calibre/config.json +++ b/calibre/config.json @@ -89,6 +89,6 @@ }, "slug": "calibre", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/calibre", - "version": "v6.7.1-ls189", + "version": "v6.7.1-ls190", "video": true } diff --git a/calibre/updater.json b/calibre/updater.json index 6789ead9d..b05856951 100644 --- a/calibre/updater.json +++ b/calibre/updater.json @@ -1,10 +1,10 @@ { "github_fulltag": "true", - "last_update": "25-10-2022", + "last_update": "01-11-2022", "paused": false, "repository": "alexbelgium/hassio-addons", "slug": "calibre", "source": "github", "upstream_repo": "linuxserver/docker-calibre", - "upstream_version": "v6.7.1-ls189" + "upstream_version": "v6.7.1-ls190" } From 09995a46e5a656ee1d86a64ba8eae159328db108 Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Tue, 1 Nov 2022 01:57:42 +0100 Subject: [PATCH 201/243] Updater bot : jackett updated to 0.20.2180 --- jackett/CHANGELOG.md | 3 +++ jackett/config.json | 2 +- jackett/updater.json | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/jackett/CHANGELOG.md b/jackett/CHANGELOG.md index 4836d554e..4b5b14848 100644 --- a/jackett/CHANGELOG.md +++ b/jackett/CHANGELOG.md @@ -1,4 +1,7 @@ +## 0.20.2180 (01-11-2022) +- Update to latest version from linuxserver/docker-jackett + ## 0.20.2171 (29-10-2022) - Update to latest version from linuxserver/docker-jackett diff --git a/jackett/config.json b/jackett/config.json index 727b0b7c1..7291d385c 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.2171", + "version": "0.20.2180", "webui": "[PROTO:ssl]://[HOST]:[PORT:9117]" } diff --git a/jackett/updater.json b/jackett/updater.json index d37dd1957..21e2c899a 100644 --- a/jackett/updater.json +++ b/jackett/updater.json @@ -1,8 +1,8 @@ { - "last_update": "29-10-2022", + "last_update": "01-11-2022", "repository": "alexbelgium/hassio-addons", "slug": "jackett", "source": "github", "upstream_repo": "linuxserver/docker-jackett", - "upstream_version": "0.20.2171" + "upstream_version": "0.20.2180" } From b84a526903086c3802ee5a8b3e672d7e75953ded Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Tue, 1 Nov 2022 01:57:50 +0100 Subject: [PATCH 202/243] Updater bot : jellyfin updated to 10.8.6-1-ls185 --- jellyfin/CHANGELOG.md | 3 +++ jellyfin/config.json | 2 +- jellyfin/updater.json | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/jellyfin/CHANGELOG.md b/jellyfin/CHANGELOG.md index a800cc694..55dab975d 100644 --- a/jellyfin/CHANGELOG.md +++ b/jellyfin/CHANGELOG.md @@ -1,4 +1,7 @@ +## 10.8.6-1-ls185 (01-11-2022) +- Update to latest version from linuxserver/docker-jellyfin + ## 10.8.5-1-ls184 (29-10-2022) - Update to latest version from linuxserver/docker-jellyfin diff --git a/jellyfin/config.json b/jellyfin/config.json index f94c780d2..02359ed97 100644 --- a/jellyfin/config.json +++ b/jellyfin/config.json @@ -103,6 +103,6 @@ }, "slug": "jellyfin", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "10.8.5-1-ls184", + "version": "10.8.6-1-ls185", "video": true } diff --git a/jellyfin/updater.json b/jellyfin/updater.json index e2c7c8ea7..f14d17ed0 100644 --- a/jellyfin/updater.json +++ b/jellyfin/updater.json @@ -1,9 +1,9 @@ { "github_fulltag": "true", - "last_update": "29-10-2022", + "last_update": "01-11-2022", "repository": "alexbelgium/hassio-addons", "slug": "jellyfin", "source": "github", "upstream_repo": "linuxserver/docker-jellyfin", - "upstream_version": "10.8.5-1-ls184" + "upstream_version": "10.8.6-1-ls185" } From 003a1aff3f93a1b206e4bb579df26e96e3f270f4 Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Tue, 1 Nov 2022 01:58:11 +0100 Subject: [PATCH 203/243] Updater bot : lidarr updated to 1.0.2.2592-ls100 --- lidarr/CHANGELOG.md | 3 +++ lidarr/config.json | 2 +- lidarr/updater.json | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lidarr/CHANGELOG.md b/lidarr/CHANGELOG.md index 8a66aa94c..99f2e2b61 100644 --- a/lidarr/CHANGELOG.md +++ b/lidarr/CHANGELOG.md @@ -1,4 +1,7 @@ +## 1.0.2.2592-ls100 (01-11-2022) +- Update to latest version from linuxserver/docker-lidarr + ## 1.0.2.2592-ls99 (18-10-2022) - Update to latest version from linuxserver/docker-lidarr diff --git a/lidarr/config.json b/lidarr/config.json index fcda00c31..b495b915b 100644 --- a/lidarr/config.json +++ b/lidarr/config.json @@ -80,6 +80,6 @@ }, "slug": "lidarr_nas", "url": "https://github.com/alexbelgium/hassio-addons/blob/master/lidarr/Readme.md", - "version": "1.0.2.2592-ls99", + "version": "1.0.2.2592-ls100", "webui": "[PROTO:ssl]://[HOST]:[PORT:8686]" } diff --git a/lidarr/updater.json b/lidarr/updater.json index ed4a52434..421f4ce1b 100644 --- a/lidarr/updater.json +++ b/lidarr/updater.json @@ -1,9 +1,9 @@ { "github_fulltag": "true", - "last_update": "18-10-2022", + "last_update": "01-11-2022", "repository": "alexbelgium/hassio-addons", "slug": "lidarr", "source": "github", "upstream_repo": "linuxserver/docker-lidarr", - "upstream_version": "1.0.2.2592-ls99" + "upstream_version": "1.0.2.2592-ls100" } From d90733709a2a6725aef33bfad5360588bea4b6b8 Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Tue, 1 Nov 2022 01:59:41 +0100 Subject: [PATCH 204/243] Updater bot : plex_meta_manager updated to v1.17.3-ls32 --- plex_meta_manager/CHANGELOG.md | 3 +++ plex_meta_manager/config.json | 2 +- plex_meta_manager/updater.json | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/plex_meta_manager/CHANGELOG.md b/plex_meta_manager/CHANGELOG.md index a879f28a1..97a45e4c2 100644 --- a/plex_meta_manager/CHANGELOG.md +++ b/plex_meta_manager/CHANGELOG.md @@ -1,4 +1,7 @@ +## v1.17.3-ls32 (01-11-2022) +- Update to latest version from linuxserver/docker-plex-meta-manager + ## v1.17.3-ls31 (18-10-2022) - Update to latest version from linuxserver/docker-plex-meta-manager diff --git a/plex_meta_manager/config.json b/plex_meta_manager/config.json index bc2ea3456..94c543c17 100644 --- a/plex_meta_manager/config.json +++ b/plex_meta_manager/config.json @@ -34,5 +34,5 @@ }, "slug": "plex-meta-manager", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/plex_meta_manager", - "version": "v1.17.3-ls31" + "version": "v1.17.3-ls32" } diff --git a/plex_meta_manager/updater.json b/plex_meta_manager/updater.json index 4d1537028..274442e6d 100644 --- a/plex_meta_manager/updater.json +++ b/plex_meta_manager/updater.json @@ -1,9 +1,9 @@ { "github_fulltag": "true", - "last_update": "18-10-2022", + "last_update": "01-11-2022", "repository": "alexbelgium/hassio-addons", "slug": "plex_meta_manager", "source": "github", "upstream_repo": "linuxserver/docker-plex-meta-manager", - "upstream_version": "v1.17.3-ls31" + "upstream_version": "v1.17.3-ls32" } From 9d4c4ce92ab389fd3ee0f112398a490b837b3af4 Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Tue, 1 Nov 2022 01:59:50 +0100 Subject: [PATCH 205/243] Updater bot : portainer updated to 2.16.0 --- portainer/CHANGELOG.md | 3 +++ portainer/Dockerfile | 2 +- portainer/config.json | 2 +- portainer/updater.json | 4 ++-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/portainer/CHANGELOG.md b/portainer/CHANGELOG.md index 07fe1094a..b4c4ab247 100644 --- a/portainer/CHANGELOG.md +++ b/portainer/CHANGELOG.md @@ -1,4 +1,7 @@ +## 2.16.0 (01-11-2022) +- Update to latest version from portainer/portainer + ## 2.15.1 (17-09-2022) - Update to latest version from portainer/portainer diff --git a/portainer/Dockerfile b/portainer/Dockerfile index 2d37b25d6..febd1a59e 100644 --- a/portainer/Dockerfile +++ b/portainer/Dockerfile @@ -30,7 +30,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ SHELL ["/bin/bash", "-o", "pipefail", "-c"] # Setup base -ARG BUILD_UPSTREAM="2.15.1" +ARG BUILD_UPSTREAM="2.16.0" # spellcheck disable=SC2015 # hadolint ignore=SC2015 diff --git a/portainer/config.json b/portainer/config.json index ed1969962..156be4d9c 100644 --- a/portainer/config.json +++ b/portainer/config.json @@ -44,5 +44,5 @@ }, "slug": "portainer", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "2.15.1" + "version": "2.16.0" } diff --git a/portainer/updater.json b/portainer/updater.json index 4e9eed07e..cd15f697c 100644 --- a/portainer/updater.json +++ b/portainer/updater.json @@ -1,9 +1,9 @@ { "github_havingasset": "true", - "last_update": "17-09-2022", + "last_update": "01-11-2022", "repository": "alexbelgium/hassio-addons", "slug": "portainer", "source": "github", "upstream_repo": "portainer/portainer", - "upstream_version": "2.15.1" + "upstream_version": "2.16.0" } From ab910b62006bdd0bed66c63ce37b37f62a69e2dd Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Tue, 1 Nov 2022 01:59:58 +0100 Subject: [PATCH 206/243] Updater bot : prowlarr updated to nightly-0.4.7.2048-ls431 --- prowlarr/CHANGELOG.md | 3 +++ prowlarr/config.json | 2 +- prowlarr/updater.json | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/prowlarr/CHANGELOG.md b/prowlarr/CHANGELOG.md index 63e2d2fc5..9fa238d79 100644 --- a/prowlarr/CHANGELOG.md +++ b/prowlarr/CHANGELOG.md @@ -1,4 +1,7 @@ +## nightly-0.4.7.2048-ls431 (01-11-2022) +- Update to latest version from linuxserver/docker-prowlarr + ## nightly-0.4.7.2016-ls427 (13-10-2022) - Update to latest version from linuxserver/docker-prowlarr diff --git a/prowlarr/config.json b/prowlarr/config.json index 7a3b1d241..3aff0c006 100644 --- a/prowlarr/config.json +++ b/prowlarr/config.json @@ -92,6 +92,6 @@ }, "slug": "prowlarr", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "nightly-0.4.7.2016-ls427", + "version": "nightly-0.4.7.2048-ls431", "webui": "[PROTO:ssl]://[HOST]:[PORT:9696]" } diff --git a/prowlarr/updater.json b/prowlarr/updater.json index 4b2a9e7d2..70abb339a 100644 --- a/prowlarr/updater.json +++ b/prowlarr/updater.json @@ -1,10 +1,10 @@ { "github_beta": "true", "github_fulltag": "true", - "last_update": "13-10-2022", + "last_update": "01-11-2022", "repository": "alexbelgium/hassio-addons", "slug": "prowlarr", "source": "github", "upstream_repo": "linuxserver/docker-prowlarr", - "upstream_version": "nightly-0.4.7.2016-ls427" + "upstream_version": "nightly-0.4.7.2048-ls431" } From af89fdd3f7edcc2b2f2d96de766fa3728eb55db5 Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Tue, 1 Nov 2022 02:00:07 +0100 Subject: [PATCH 207/243] Updater bot : qbittorrent updated to 4.4.5-r2-ls226 --- qbittorrent/CHANGELOG.md | 3 +++ qbittorrent/Dockerfile | 2 +- qbittorrent/config.json | 2 +- qbittorrent/updater.json | 4 ++-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/qbittorrent/CHANGELOG.md b/qbittorrent/CHANGELOG.md index be1826125..c4bdad7a9 100644 --- a/qbittorrent/CHANGELOG.md +++ b/qbittorrent/CHANGELOG.md @@ -1,4 +1,7 @@ +## 4.4.5-r2-ls226 (01-11-2022) +- Update to latest version from linuxserver/docker-qbittorrent + ## 4.4.5-r2-ls224 (25-10-2022) - Update to latest version from linuxserver/docker-qbittorrent diff --git a/qbittorrent/Dockerfile b/qbittorrent/Dockerfile index 7873d186f..00e3ec36c 100644 --- a/qbittorrent/Dockerfile +++ b/qbittorrent/Dockerfile @@ -16,7 +16,7 @@ ARG BUILD_FROM ARG BUILD_VERSION -ARG BUILD_UPSTREAM="4.4.5-r2-ls224" +ARG BUILD_UPSTREAM="4.4.5-r2-ls226" FROM ${BUILD_FROM}-$BUILD_UPSTREAM ################## diff --git a/qbittorrent/config.json b/qbittorrent/config.json index b48a63b36..bb7d6c8f8 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-r2-ls224-2" + "version": "4.4.5-r2-ls226" } diff --git a/qbittorrent/updater.json b/qbittorrent/updater.json index 65eed68a7..1ba63f33e 100644 --- a/qbittorrent/updater.json +++ b/qbittorrent/updater.json @@ -1,9 +1,9 @@ { "github_fulltag": "true", - "last_update": "25-10-2022", + "last_update": "01-11-2022", "repository": "alexbelgium/hassio-addons", "slug": "qbittorrent", "source": "github", "upstream_repo": "linuxserver/docker-qbittorrent", - "upstream_version": "4.4.5-r2-ls224" + "upstream_version": "4.4.5-r2-ls226" } From 7e1e0be27ab5760296c8e9c5b21e093f9cc20239 Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Tue, 1 Nov 2022 02:00:22 +0100 Subject: [PATCH 208/243] Updater bot : readarr updated to nightly-0.1.1.1426-ls139 --- readarr/CHANGELOG.md | 3 +++ readarr/config.json | 2 +- readarr/updater.json | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/readarr/CHANGELOG.md b/readarr/CHANGELOG.md index 07cdbcecb..a522a1830 100644 --- a/readarr/CHANGELOG.md +++ b/readarr/CHANGELOG.md @@ -1,4 +1,7 @@ +## nightly-0.1.1.1426-ls139 (01-11-2022) +- Update to latest version from linuxserver/docker-readarr + ## nightly-0.1.1.1426-ls138 (29-10-2022) - Update to latest version from linuxserver/docker-readarr diff --git a/readarr/config.json b/readarr/config.json index 7815e3ed8..c86ab0b4f 100644 --- a/readarr/config.json +++ b/readarr/config.json @@ -78,6 +78,6 @@ }, "slug": "readarr_nas", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/readarr", - "version": "nightly-0.1.1.1426-ls138", + "version": "nightly-0.1.1.1426-ls139", "webui": "[PROTO:ssl]://[HOST]:[PORT:8787]" } diff --git a/readarr/updater.json b/readarr/updater.json index 5ba30aa53..4fa891eae 100644 --- a/readarr/updater.json +++ b/readarr/updater.json @@ -1,10 +1,10 @@ { "github_beta": "true", "github_fulltag": "true", - "last_update": "29-10-2022", + "last_update": "01-11-2022", "repository": "alexbelgium/hassio-addons", "slug": "readarr", "source": "github", "upstream_repo": "linuxserver/docker-readarr", - "upstream_version": "nightly-0.1.1.1426-ls138" + "upstream_version": "nightly-0.1.1.1426-ls139" } From e2c322ec7190266142d39089bf466062cec1881e Mon Sep 17 00:00:00 2001 From: Alexandre Date: Tue, 1 Nov 2022 11:05:20 +0100 Subject: [PATCH 209/243] Clarify recommendation --- bitwarden/README.md | 4 +--- code-server/README.md | 5 +++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/bitwarden/README.md b/bitwarden/README.md index 98b96cc53..4c2d49e0d 100644 --- a/bitwarden/README.md +++ b/bitwarden/README.md @@ -1,7 +1,6 @@ # Home assistant add-on: Vaultwarden (Bitwarden RS) -IT IS RECOMMENDED TO USE THE OFFICIAL ADDON (https://github.com/hassio-addons/addon-bitwarden) INSTEAD OF THIS FORK. -THE ONLY BENEFIT OF THIS FORK IS AUTOMATED RELEASES, NOW IMPLEMENTED IN THE OFFICAL ONE. +# ⚠️ It is recommended to use the official addon (https://github.com/hassio-addons/addon-bitwarden) instead of this fork. The only benefit of this fork is automated releases, now implemented in the offical one. ⚠️ [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) @@ -17,7 +16,6 @@ THE ONLY BENEFIT OF THIS FORK IS AUTOMATED RELEASES, NOW IMPLEMENTED IN THE OFFI _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ - [![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) ## About diff --git a/code-server/README.md b/code-server/README.md index 8830f4254..ac0942973 100644 --- a/code-server/README.md +++ b/code-server/README.md @@ -1,4 +1,6 @@ -# Home assistant add-on: code-server (not recommended : use https://github.com/hassio-addons/addon-vscode) +# Home assistant add-on: code-server + +# ⚠️ It is recommended to use the official addon (https://github.com/hassio-addons/addon-vscode) instead of this fork. The only benefit of this fork is automated releases, now implemented in the offical one. ⚠️ [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) @@ -14,7 +16,6 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ - [![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) ## About From f665a66dd6aa26bc6b2bb37f1ce81db74d0cb961 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 1 Nov 2022 11:25:30 +0000 Subject: [PATCH 210/243] Github bot : issues linked to readme --- qbittorrent/README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/qbittorrent/README.md b/qbittorrent/README.md index e5e9496d7..97765cd3a 100644 --- a/qbittorrent/README.md +++ b/qbittorrent/README.md @@ -1,4 +1,3 @@ -## ⚠ Open Request : [QBitTorrent web ui issue (opened 2022-10-25)](https://github.com/alexbelgium/hassio-addons/issues/527) by [@SiriosDev](https://github.com/SiriosDev) # Home assistant add-on: qbittorrent [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) From 87cbd153d67006b521b64b4c58bc2b2915b25f43 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 1 Nov 2022 14:52:40 +0000 Subject: [PATCH 211/243] Github bot : issues linked to readme --- fireflyiii/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/fireflyiii/README.md b/fireflyiii/README.md index 4522f6fb0..29c2579b7 100644 --- a/fireflyiii/README.md +++ b/fireflyiii/README.md @@ -1,3 +1,4 @@ +## ⚠ Open Issue : [🐛 [FireflyIII] Unable to create a directory at /var/www/html/storage/ha_upload (opened 2022-10-31)](https://github.com/alexbelgium/hassio-addons/issues/534) by [@diamant-x](https://github.com/diamant-x) # Home assistant add-on: fireflyiii [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) From 836e089065565a3c0003a13a885e556a45fef6bf Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 1 Nov 2022 16:30:52 +0100 Subject: [PATCH 212/243] Update config.json --- teamspeak/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/teamspeak/config.json b/teamspeak/config.json index 26968dfb3..5469fbf0e 100644 --- a/teamspeak/config.json +++ b/teamspeak/config.json @@ -34,5 +34,5 @@ }, "slug": "teamspeak", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "3.13.6-4" + "version": "3.13.6-5" } From c6f80bdd16bd9d27f47f0903a59d358d354233f0 Mon Sep 17 00:00:00 2001 From: Alexandre Date: Tue, 1 Nov 2022 18:58:37 +0100 Subject: [PATCH 213/243] Switch to 1.8.2 --- paperless_ngx/CHANGELOG.md | 32 +++++++++++++ paperless_ngx/Dockerfile | 45 +++++++++---------- paperless_ngx/build.json | 8 ++-- paperless_ngx/config.json | 5 ++- paperless_ngx/rootfs/entrypoint.sh | 27 +++++++++++ .../rootfs/etc/cont-init.d/20-folders.sh | 12 +---- .../rootfs/etc/cont-init.d/91-pikepdf.sh | 14 ------ .../rootfs/etc/cont-init.d/93-multiocr.sh | 16 ------- .../rootfs/etc/cont-init.d/99-run.sh | 7 +++ paperless_ngx/updater.json | 6 +-- 10 files changed, 99 insertions(+), 73 deletions(-) create mode 100644 paperless_ngx/rootfs/entrypoint.sh delete mode 100644 paperless_ngx/rootfs/etc/cont-init.d/91-pikepdf.sh delete mode 100644 paperless_ngx/rootfs/etc/cont-init.d/93-multiocr.sh diff --git a/paperless_ngx/CHANGELOG.md b/paperless_ngx/CHANGELOG.md index 06d8513bc..d059c291d 100644 --- a/paperless_ngx/CHANGELOG.md +++ b/paperless_ngx/CHANGELOG.md @@ -1,89 +1,121 @@ +## v1.8.2 (01-11-2022) + +- BACKUP BEFORE UPDATE : switch to paperless-ngx image. Please backup before switch. ## v1.8.0-ls30 (24-09-2022) + - Update to latest version from linuxserver/docker-paperless-ngx ## v1.8.0-ls29 (17-09-2022) + - Update to latest version from linuxserver/docker-paperless-ngx ## v1.8.0-ls28 (09-09-2022) + - Update to latest version from linuxserver/docker-paperless-ngx ## v1.8.0-ls27 (02-09-2022) + - Update to latest version from linuxserver/docker-paperless-ngx ## v1.8.0-ls26 (20-08-2022) + - Update to latest version from linuxserver/docker-paperless-ngx ## v1.8.0-ls25 (11-08-2022) + - Update to latest version from linuxserver/docker-paperless-ngx ## v1.7.1-ls24 (23-07-2022) + - Update to latest version from linuxserver/docker-paperless-ngx ## v1.7.1-ls23 (16-07-2022) + - Update to latest version from linuxserver/docker-paperless-ngx ## v1.7.1-ls22 (09-07-2022) + - Update to latest version from linuxserver/docker-paperless-ngx ## v1.7.1-ls21 (07-07-2022) + - Update to latest version from linuxserver/docker-paperless-ngx ## v1.7.1-ls20 (02-07-2022) + - Update to latest version from linuxserver/docker-paperless-ngx ## v1.7.1-ls19 (25-06-2022) + - Update to latest version from linuxserver/docker-paperless-ngx ## v1.7.1-ls18 (18-06-2022) + - Update to latest version from linuxserver/docker-paperless-ngx ## v1.7.1-ls17 (11-06-2022) + - Update to latest version from linuxserver/docker-paperless-ngx ## v1.7.1-ls16 (04-06-2022) + - Update to latest version from linuxserver/docker-paperless-ngx ## v1.7.1-ls15 (31-05-2022) + - Update to latest version from linuxserver/docker-paperless-ngx ## v1.7.1-ls14 (19-05-2022) + - Update to latest version from linuxserver/docker-paperless-ngx ## v1.7.1-ls13 (17-05-2022) + - Update to latest version from linuxserver/docker-paperless-ngx ## v1.7.1-ls12 (14-05-2022) + - Update to latest version from linuxserver/docker-paperless-ngx ## v1.7.1-ls10 (12-05-2022) + - Update to latest version from linuxserver/docker-paperless-ngx ## ngx-1.7.0-ls9 (10-05-2022) + - Update to latest version from linuxserver/docker-paperless-ngx ## ngx-1.7.0-ls8 (06-05-2022) + - Update to latest version from linuxserver/docker-paperless-ngx ## ngx-1.7.0-ls7 (01-05-2022) + - Update to latest version from linuxserver/docker-paperless-ngx ## ngx-1.7.0-ls6 (29-04-2022) + - Update to latest version from linuxserver/docker-paperless-ngx ## ngx-1.7.0-ls5 (27-04-2022) + - Update to latest version from linuxserver/docker-paperless-ngx ## ngx-1.6.0-ls4 (14-04-2022) + - Update to latest version from linuxserver/docker-paperless-ngx ## ngx-1.6.0-ls3 (09-04-2022) + - Update to latest version from linuxserver/docker-paperless-ngx ## ngx-1.6.0-ls2 (02-04-2022) + - Update to latest version from linuxserver/docker-paperless-ngx ## ngx-1.6.0-ls1 (28-03-2022) + - Update to latest version from linuxserver/docker-paperless-ngx - Major change : switch to paperless NGX - Add codenotary sign diff --git a/paperless_ngx/Dockerfile b/paperless_ngx/Dockerfile index 36b09797e..f83550779 100644 --- a/paperless_ngx/Dockerfile +++ b/paperless_ngx/Dockerfile @@ -27,25 +27,6 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \ S6_SERVICES_GRACETIME=0 -# Global LSIO modifications -ARG CONFIGLOCATION="/config/addons_config/paperless_ng" -# hadolint ignore=SC2015, SC2013, SC2086 -RUN \ - # Avoid custom-init.d duplications - for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \ - \ - # Create new config folder if needed - && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" $file; done \ - \ - # Allow UID and GID setting - && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $file; done \ - \ - # Correct config location - && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $file; done \ - \ - # Avoid chmod /config - && for file in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done - ################## # 3 Install apps # ################## @@ -58,6 +39,24 @@ RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ if [ -f /entrypoint.sh ]; then chmod 755 /entrypoint.sh; fi +ENV \ + PAPERLESS_DATA_DIR=/config/addons_config/paperless_ng \ + PAPERLESS_MEDIA_ROOT=/config/addons_config/paperless_ng/media \ + PAPERLESS_CONSUMPTION_DIR=/config/addons_config/paperless_ng/consume + +# Modify image +RUN \ + sed -i 's|usr/bin/env bash|usr/bin/env bashio|g' /sbin/docker-entrypoint.sh && \ + # Run entrypoint + sed -i '2i /./entrypoint.sh' /sbin/docker-entrypoint.sh && \ + # Set variables + sed -i '2i bashio::log.info "Defining variables"' /sbin/docker-entrypoint.sh && \ + sed -i '2i if bashio::config.has_value "PUID"; then export USERMAP_UID=$(bashio::config "PUID"); fi' /sbin/docker-entrypoint.sh && \ + sed -i '2i if bashio::config.has_value "PGID"; then export USERMAP_GID=$(bashio::config "PGID"); fi' /sbin/docker-entrypoint.sh && \ + sed -i '2i if bashio::config.has_value "TZ"; then export PAPERLESS_TIME_ZONE=$(bashio::config "TZ"); fi' /sbin/docker-entrypoint.sh && \ + sed -i '2i if bashio::config.has_value "OCRLANG"; then export PAPERLESS_OCR_LANGUAGES=$(bashio::config "OCRLANG"); fi' /sbin/docker-entrypoint.sh && \ + sed -i '2i if bashio::config.has_value "PAPERLESS_OCR_MODE"; then export PAPERLESS_OCR_MODE=$(bashio::config "PAPERLESS_OCR_MODE"); fi' /sbin/docker-entrypoint.sh + # Modules ARG MODULES="00-banner.sh 92-local_mounts.sh 92-smb_mounts.sh 90-config_yaml.sh" @@ -70,9 +69,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE # Manual apps -ENV PACKAGES="yamllint \ - pip \ - libxml2-dev libxslt-dev python-dev libjpeg-dev zlib1g-dev python3-dev build-essential" +ENV PACKAGES="redis-server yamllint pip libxml2-dev libxslt-dev python-dev libjpeg-dev zlib1g-dev python3-dev build-essential" # Automatic apps & bashio # hadolint ignore=SC2015 @@ -88,10 +85,10 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get # 4 Entrypoint # ################ -#RUN chmod 777 /entrypoint.sh +RUN chmod 777 /entrypoint.sh #WORKDIR / #ENTRYPOINT [ "/usr/bin/env" ] -#CMD [ "/entrypoint.sh" ] +#ENTRYPOINT [ "/entrypoint.sh" ] #SHELL ["/bin/bash", "-o", "pipefail", "-c"] ############ diff --git a/paperless_ngx/build.json b/paperless_ngx/build.json index aeed85df6..b8f9af604 100644 --- a/paperless_ngx/build.json +++ b/paperless_ngx/build.json @@ -1,10 +1,10 @@ { "build_from": { - "aarch64": "lscr.io/linuxserver/paperless-ngx:arm64v8-latest", - "amd64": "lscr.io/linuxserver/paperless-ngx:amd64-latest", - "armv7": "lscr.io/linuxserver/paperless-ngx:arm32v7-latest" + "aarch64": "ghcr.io/paperless-ngx/paperless-ngx:latest", + "amd64": "ghcr.io/paperless-ngx/paperless-ngx:latest", + "armv7": "ghcr.io/paperless-ngx/paperless-ngx:latest" }, "codenotary": { "signer": "alexandrep.github@gmail.com" } -} +} \ No newline at end of file diff --git a/paperless_ngx/config.json b/paperless_ngx/config.json index 5366823b8..ef56f1e06 100644 --- a/paperless_ngx/config.json +++ b/paperless_ngx/config.json @@ -74,6 +74,7 @@ "PGID": "int", "PUID": "int", "TZ": "str?", + "PAPERLESS_OCR_MODE": "list(skip|redo|force|skip_noarchive)?", "cifspassword": "str?", "cifsusername": "str?", "localdisks": "str?", @@ -81,6 +82,6 @@ }, "slug": "paperless_ng", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "v1.8.0-ls30", + "version": "1.8.2", "webui": "[PROTO:ssl]://[HOST]:[PORT:8000]" -} +} \ No newline at end of file diff --git a/paperless_ngx/rootfs/entrypoint.sh b/paperless_ngx/rootfs/entrypoint.sh new file mode 100644 index 000000000..85d8a9212 --- /dev/null +++ b/paperless_ngx/rootfs/entrypoint.sh @@ -0,0 +1,27 @@ +#!/bin/bash +echo "Starting..." + +############################ +# Backup Dockerfile Script # +############################ + +if [ -f /etc/cont-init.d/00-aaa_dockerfile_backup.sh ]; then + chown "$(id -u)":"$(id -g)" /etc/cont-init.d/00-aaa_dockerfile_backup.sh + chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh + /./etc/cont-init.d/00-aaa_dockerfile_backup.sh + rm /etc/cont-init.d/00-aaa_dockerfile_backup.sh +fi + +#################### +# Starting scripts # +#################### + +for SCRIPTS in /etc/cont-init.d/*; do + [ -e "$SCRIPTS" ] || continue + echo "$SCRIPTS: executing" + chown "$(id -u)":"$(id -g)" "$SCRIPTS" + chmod a+x "$SCRIPTS" + # Change shebang if no s6 supervision + sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS" + /."$SCRIPTS" || echo "$SCRIPTS: exiting $?" +done diff --git a/paperless_ngx/rootfs/etc/cont-init.d/20-folders.sh b/paperless_ngx/rootfs/etc/cont-init.d/20-folders.sh index bd2369978..4c55c4d46 100644 --- a/paperless_ngx/rootfs/etc/cont-init.d/20-folders.sh +++ b/paperless_ngx/rootfs/etc/cont-init.d/20-folders.sh @@ -4,16 +4,8 @@ slug=paperless_ng if [ ! -d /config/addons_config/$slug ]; then - - if [ -d /config/$slug ]; then - echo "Moving to new location /config/addons_config/$slug" - mkdir -p /config/addons_config/$slug - chmod 777 /config/addons_config/$slug - mv /config/$slug/* /config/addons_config/$slug/ - rm -r /config/$slug - fi - echo "Creating /config/addons_config/$slug" mkdir -p /config/addons_config/$slug - chmod 777 /config/addons_config/$slug fi + +chmod 777 /config/addons_config/$slug diff --git a/paperless_ngx/rootfs/etc/cont-init.d/91-pikepdf.sh b/paperless_ngx/rootfs/etc/cont-init.d/91-pikepdf.sh deleted file mode 100644 index bf7a9682b..000000000 --- a/paperless_ngx/rootfs/etc/cont-init.d/91-pikepdf.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/with-contenv bashio -# shellcheck shell=bash - -echo "Installing pikepdf..." -( - export DEBIAN_FRONTEND="noninteractive" - export TERM="xterm-256color" - apt-get update - apt-get install -yq libxml2-dev libxslt-dev python-dev - apt-get install -yq libjpeg-dev zlib1g-dev - apt-get install -yq python3-dev build-essential - pip install pikepdf --force-reinstall -) >/dev/null -echo "... success!" diff --git a/paperless_ngx/rootfs/etc/cont-init.d/93-multiocr.sh b/paperless_ngx/rootfs/etc/cont-init.d/93-multiocr.sh deleted file mode 100644 index 36578a964..000000000 --- a/paperless_ngx/rootfs/etc/cont-init.d/93-multiocr.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/with-contenv bashio -# shellcheck shell=bash - -OCRLANG=$(bashio::config 'OCRLANG') -if [ -n "$OCRLANG" ]; then - apt-get update &>/dev/null - echo "OCRLANG variable is set, processing the language packages" - for i in ${OCRLANG//,/ }; do - if apt-cache show tesseract-ocr-"${i}" >/dev/null 2>&1; then - apt-get install -yq tesseract-ocr-"${i}" - bashio::log.info "OCR Language installed : $i" || bashio::log.fatal "Couldn't install OCR lang $i. Please check its format is conform" - else - echo "package tesseract-ocr-${i} not found in the repository, skipping" - fi - done -fi diff --git a/paperless_ngx/rootfs/etc/cont-init.d/99-run.sh b/paperless_ngx/rootfs/etc/cont-init.d/99-run.sh index bccae88fc..1846c4d18 100644 --- a/paperless_ngx/rootfs/etc/cont-init.d/99-run.sh +++ b/paperless_ngx/rootfs/etc/cont-init.d/99-run.sh @@ -1,4 +1,11 @@ #!/usr/bin/with-contenv bashio # shellcheck shell=bash +# Staring redis +exec redis-server & bashio::log.info "Starting redis" + +# Avoid overcommit memory +bashio::log.info "Avoid overcommit memory" +sysctl vm.overcommit_memory=1 + bashio::log.info "Initial username and password are admin. Please change in the administration panel of the webUI after login." diff --git a/paperless_ngx/updater.json b/paperless_ngx/updater.json index c59829557..9324c8092 100644 --- a/paperless_ngx/updater.json +++ b/paperless_ngx/updater.json @@ -4,6 +4,6 @@ "repository": "alexbelgium/hassio-addons", "slug": "paperless_ngx", "source": "github", - "upstream_repo": "linuxserver/docker-paperless-ngx", - "upstream_version": "v1.8.0-ls30" -} + "upstream_repo": "paperless-ngx/paperless-ngx", + "upstream_version": "1.8.2" +} \ No newline at end of file From 01cf626a12017790a0dc390a7e868ba182b33bdb Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 1 Nov 2022 19:04:58 +0100 Subject: [PATCH 214/243] Based on https://github.com/SilvioMessi/hassio-addons/commit/7e2b1fad1adcd23d1ec53b76a61a7857d3375094 https://github.com/alexbelgium/hassio-addons/issues/534 --- fireflyiii/rootfs/etc/cont-init.d/99-run.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/fireflyiii/rootfs/etc/cont-init.d/99-run.sh b/fireflyiii/rootfs/etc/cont-init.d/99-run.sh index 598abcfc8..3ae17d6b9 100644 --- a/fireflyiii/rootfs/etc/cont-init.d/99-run.sh +++ b/fireflyiii/rootfs/etc/cont-init.d/99-run.sh @@ -139,6 +139,11 @@ if [ -d /var/www/html/storage/ha_upload ]; then fi ln -s /config/addons_config/fireflyiii/upload /var/www/html/storage/ha_upload +# Updating permissions +chown -R www-data:www-data /config/addons_config/fireflyiii +chown -R www-data:www-data /var/www/html/storage +chmod -R 775 /config/addons_config/fireflyiii + ################ # CRON OPTIONS # ################ From c3762060ce1a27caf29ba8854df4aeefcf58fdf3 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 1 Nov 2022 19:05:15 +0100 Subject: [PATCH 215/243] New version to test https://github.com/alexbelgium/hassio-addons/issues/534 --- fireflyiii/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fireflyiii/config.json b/fireflyiii/config.json index 054e48f9e..5f89a074c 100644 --- a/fireflyiii/config.json +++ b/fireflyiii/config.json @@ -46,6 +46,6 @@ "slug": "fireflyiii", "startup": "services", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "5.7.14-2", + "version": "5.7.14-3", "webui": "[PROTO:ssl]://[HOST]:[PORT:8080]" } From 8e04aa0c7fb6187d4d637de66eb63048a0c90827 Mon Sep 17 00:00:00 2001 From: Alexandre Date: Tue, 1 Nov 2022 19:13:19 +0100 Subject: [PATCH 216/243] test --- teamspeak/config.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/teamspeak/config.json b/teamspeak/config.json index 5469fbf0e..9def4ebac 100644 --- a/teamspeak/config.json +++ b/teamspeak/config.json @@ -7,13 +7,13 @@ "codenotary": "alexandrep.github@gmail.com", "description": "voice communication for online gaming, education and training", "environment": { - "DIST_UPDATE": "1", + "DIST_UPDATE": "0", "GUID": "503", "INIFILE": "1", "PGID": "503", "PUID": "503", "TS3SERVER_LICENSE": "accept", - "TS_UPDATE": "1" + "TS_UPDATE": "0" }, "init": false, "map": [ @@ -35,4 +35,4 @@ "slug": "teamspeak", "url": "https://github.com/alexbelgium/hassio-addons", "version": "3.13.6-5" -} +} \ No newline at end of file From e0baffd6fbe0d2d1da7d58b697878e8688e38f64 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 1 Nov 2022 19:19:04 +0100 Subject: [PATCH 217/243] Avoid crash https://github.com/alexbelgium/hassio-addons/issues/535 --- teamspeak/config.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/teamspeak/config.json b/teamspeak/config.json index 9def4ebac..7a2d4306c 100644 --- a/teamspeak/config.json +++ b/teamspeak/config.json @@ -34,5 +34,5 @@ }, "slug": "teamspeak", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "3.13.6-5" -} \ No newline at end of file + "version": "3.13.6-6" +} From 9188695c82669734c995e359912dee40459016d9 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 1 Nov 2022 18:31:29 +0000 Subject: [PATCH 218/243] Github bot : issues linked to readme --- fireflyiii/README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/fireflyiii/README.md b/fireflyiii/README.md index 29c2579b7..4522f6fb0 100644 --- a/fireflyiii/README.md +++ b/fireflyiii/README.md @@ -1,4 +1,3 @@ -## ⚠ Open Issue : [🐛 [FireflyIII] Unable to create a directory at /var/www/html/storage/ha_upload (opened 2022-10-31)](https://github.com/alexbelgium/hassio-addons/issues/534) by [@diamant-x](https://github.com/diamant-x) # Home assistant add-on: fireflyiii [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) From 18eecdd63165dda3a9dbe7aced2a7663fa6e1c03 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 1 Nov 2022 19:37:24 +0100 Subject: [PATCH 219/243] Update config.json --- teamspeak/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/teamspeak/config.json b/teamspeak/config.json index 7a2d4306c..7968b5b84 100644 --- a/teamspeak/config.json +++ b/teamspeak/config.json @@ -13,7 +13,7 @@ "PGID": "503", "PUID": "503", "TS3SERVER_LICENSE": "accept", - "TS_UPDATE": "0" + "TS_UPDATE": "1" }, "init": false, "map": [ From eb2a88f6d56ac3cd47bd86625055dedd1336b42b Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 1 Nov 2022 20:59:52 +0100 Subject: [PATCH 220/243] Update Dockerfile --- paperless_ngx/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/paperless_ngx/Dockerfile b/paperless_ngx/Dockerfile index f83550779..3c529e4d7 100644 --- a/paperless_ngx/Dockerfile +++ b/paperless_ngx/Dockerfile @@ -45,6 +45,7 @@ ENV \ PAPERLESS_CONSUMPTION_DIR=/config/addons_config/paperless_ng/consume # Modify image +# hadolint ignore=SC2016 RUN \ sed -i 's|usr/bin/env bash|usr/bin/env bashio|g' /sbin/docker-entrypoint.sh && \ # Run entrypoint From c89a58b16bbe6b1f50bb6ec910cd83fca63ab349 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 1 Nov 2022 21:39:34 +0100 Subject: [PATCH 221/243] Update 90-config_yaml.sh --- .templates/90-config_yaml.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.templates/90-config_yaml.sh b/.templates/90-config_yaml.sh index f91b46d28..18915bb42 100644 --- a/.templates/90-config_yaml.sh +++ b/.templates/90-config_yaml.sh @@ -40,7 +40,7 @@ else fi # Need to restart bashio::log.fatal "Config file not found, creating a new one. Please customize the file in $CONFIGSOURCE before restarting." - # bashio::exit.nok + bashio::addon.stop fi # Permissions From 7091b9cf2ab2431263661a7be156dbfd11487fc1 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 1 Nov 2022 21:48:53 +0100 Subject: [PATCH 222/243] Update config.json --- fireflyiii/config.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fireflyiii/config.json b/fireflyiii/config.json index 5f89a074c..7a06c4b3a 100644 --- a/fireflyiii/config.json +++ b/fireflyiii/config.json @@ -8,7 +8,8 @@ "description": "A free and open source personal finance manager", "devices": [], "environment": { - "TRUSTED_PROXIES": "**" + "TRUSTED_PROXIES": "**", + "DB_DATABASE": "/config/addons_config/fireflyiii/database/database.sqlite" }, "map": [ "config:rw", From 100756a510ded5f1582d35a3b2dc687c9dce4f71 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 1 Nov 2022 22:15:49 +0100 Subject: [PATCH 223/243] Revert --- fireflyiii/config.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fireflyiii/config.json b/fireflyiii/config.json index 7a06c4b3a..5f89a074c 100644 --- a/fireflyiii/config.json +++ b/fireflyiii/config.json @@ -8,8 +8,7 @@ "description": "A free and open source personal finance manager", "devices": [], "environment": { - "TRUSTED_PROXIES": "**", - "DB_DATABASE": "/config/addons_config/fireflyiii/database/database.sqlite" + "TRUSTED_PROXIES": "**" }, "map": [ "config:rw", From 62ad02d22e31b0d6f9d7bdd94bd437156f8641c4 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 1 Nov 2022 22:35:28 +0100 Subject: [PATCH 224/243] Update 99-run.sh --- fireflyiii/rootfs/etc/cont-init.d/99-run.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fireflyiii/rootfs/etc/cont-init.d/99-run.sh b/fireflyiii/rootfs/etc/cont-init.d/99-run.sh index 3ae17d6b9..db3eac161 100644 --- a/fireflyiii/rootfs/etc/cont-init.d/99-run.sh +++ b/fireflyiii/rootfs/etc/cont-init.d/99-run.sh @@ -48,6 +48,7 @@ case $(bashio::config 'DB_CONNECTION') in # Set variable export DB_CONNECTION=sqlite + export DB_DATABASE=/config/addons_config/fireflyiii/database/database.sqlite # Creating folders mkdir -p /config/addons_config/fireflyiii/database @@ -66,7 +67,7 @@ case $(bashio::config 'DB_CONNECTION') in # Creating symlink rm -r /var/www/html/storage/database - ln -s /config/addons_config/fireflyiii/database /var/www/html/storage/database + ln /config/addons_config/fireflyiii/database /var/www/html/storage # Updating permissions chmod 775 /config/addons_config/fireflyiii/database/database.sqlite From d6b88676c254f985f8ff4099a227fc35db4458fb Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Wed, 2 Nov 2022 08:02:13 +0100 Subject: [PATCH 225/243] Update 99-run.sh --- fireflyiii/rootfs/etc/cont-init.d/99-run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fireflyiii/rootfs/etc/cont-init.d/99-run.sh b/fireflyiii/rootfs/etc/cont-init.d/99-run.sh index db3eac161..65050d4fd 100644 --- a/fireflyiii/rootfs/etc/cont-init.d/99-run.sh +++ b/fireflyiii/rootfs/etc/cont-init.d/99-run.sh @@ -67,7 +67,7 @@ case $(bashio::config 'DB_CONNECTION') in # Creating symlink rm -r /var/www/html/storage/database - ln /config/addons_config/fireflyiii/database /var/www/html/storage + ln -s /config/addons_config/fireflyiii/database /var/www/html/storage # Updating permissions chmod 775 /config/addons_config/fireflyiii/database/database.sqlite From c297a61e1c14d54ce0734b5bb6be277440777c16 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Wed, 2 Nov 2022 08:57:03 +0100 Subject: [PATCH 226/243] Add standard OCR --- paperless_ngx/config.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/paperless_ngx/config.json b/paperless_ngx/config.json index ef56f1e06..b08f2663b 100644 --- a/paperless_ngx/config.json +++ b/paperless_ngx/config.json @@ -56,7 +56,9 @@ "options": { "CONFIG_LOCATION": "/config/addons_config/paperless_ng/config.yaml", "PGID": 0, - "PUID": 0 + "PUID": 0, + "PAPERLESS_OCR_MODE": "skip", + "OCRLANG": "ENG" }, "ports": { "8000/tcp": 8011 @@ -84,4 +86,4 @@ "url": "https://github.com/alexbelgium/hassio-addons", "version": "1.8.2", "webui": "[PROTO:ssl]://[HOST]:[PORT:8000]" -} \ No newline at end of file +} From a07a03cc293923db71c322c4ec3909eadce8b3f8 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Wed, 2 Nov 2022 11:08:19 +0100 Subject: [PATCH 227/243] Switch to paperless user --- paperless_ngx/rootfs/etc/cont-init.d/20-folders.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/paperless_ngx/rootfs/etc/cont-init.d/20-folders.sh b/paperless_ngx/rootfs/etc/cont-init.d/20-folders.sh index 4c55c4d46..8cedd1b6b 100644 --- a/paperless_ngx/rootfs/etc/cont-init.d/20-folders.sh +++ b/paperless_ngx/rootfs/etc/cont-init.d/20-folders.sh @@ -8,4 +8,5 @@ if [ ! -d /config/addons_config/$slug ]; then mkdir -p /config/addons_config/$slug fi -chmod 777 /config/addons_config/$slug +chmod -R 755 /config/addons_config/$slug +chown -R paperless:paperless /config/addons_config/$slug From 38b91375ebeb9dc3790d45e15589dbdc469428fd Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Wed, 2 Nov 2022 11:54:18 +0100 Subject: [PATCH 228/243] Create default user https://github.com/alexbelgium/hassio-addons/issues/528 --- .../rootfs/etc/cont-init.d/99-run.sh | 30 +++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/paperless_ngx/rootfs/etc/cont-init.d/99-run.sh b/paperless_ngx/rootfs/etc/cont-init.d/99-run.sh index 1846c4d18..02fb35864 100644 --- a/paperless_ngx/rootfs/etc/cont-init.d/99-run.sh +++ b/paperless_ngx/rootfs/etc/cont-init.d/99-run.sh @@ -1,11 +1,37 @@ #!/usr/bin/with-contenv bashio # shellcheck shell=bash -# Staring redis +################# +# Staring redis # +################# exec redis-server & bashio::log.info "Starting redis" -# Avoid overcommit memory +########################### +# Avoid overcommit memory # +########################### bashio::log.info "Avoid overcommit memory" sysctl vm.overcommit_memory=1 +############################### +# Create user if not existing # +############################### +# Origin : https://github.com/linuxserver/docker-paperless-ngx/blob/main/root/etc/cont-init.d/99-migrations +bashio::log.info "Creating default user" +cat << EOF | python3 /app/paperless/src/manage.py shell +from django.contrib.auth import get_user_model + +# see ref. below +UserModel = get_user_model() + +if len(UserModel.objects.all()) == 1: + print("Creating new user") + user = UserModel.objects.create_user('admin', password='admin') + user.is_superuser = True + user.is_staff = True + user.save() +EOF + +######### +# Start # +######### bashio::log.info "Initial username and password are admin. Please change in the administration panel of the webUI after login." From 3242a65067143f793dc810f7a5d912ea6c073d5c Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Wed, 2 Nov 2022 11:56:20 +0100 Subject: [PATCH 229/243] Updater bot : calibre_web updated to 0.6.19-ls182 --- calibre_web/CHANGELOG.md | 3 +++ calibre_web/config.json | 2 +- calibre_web/updater.json | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/calibre_web/CHANGELOG.md b/calibre_web/CHANGELOG.md index 1ee649fbb..d31950366 100644 --- a/calibre_web/CHANGELOG.md +++ b/calibre_web/CHANGELOG.md @@ -1,4 +1,7 @@ +## 0.6.19-ls182 (02-11-2022) +- Update to latest version from linuxserver/docker-calibre-web + ## 0.6.19-ls181 (27-10-2022) - Update to latest version from linuxserver/docker-calibre-web diff --git a/calibre_web/config.json b/calibre_web/config.json index 9e89a6763..bc60ea386 100644 --- a/calibre_web/config.json +++ b/calibre_web/config.json @@ -90,6 +90,6 @@ }, "slug": "calibre-web", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/calibre-web", - "version": "0.6.19-ls181", + "version": "0.6.19-ls182", "video": true } diff --git a/calibre_web/updater.json b/calibre_web/updater.json index 9bd943561..ccee8d2d1 100644 --- a/calibre_web/updater.json +++ b/calibre_web/updater.json @@ -1,10 +1,10 @@ { "github_fulltag": "true", - "last_update": "27-10-2022", + "last_update": "02-11-2022", "paused": false, "repository": "alexbelgium/hassio-addons", "slug": "calibre-web", "source": "github", "upstream_repo": "linuxserver/docker-calibre-web", - "upstream_version": "0.6.19-ls181" + "upstream_version": "0.6.19-ls182" } From 0d477814ffe14be55c09fcc4148c2b6ec7c93036 Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Wed, 2 Nov 2022 11:57:46 +0100 Subject: [PATCH 230/243] Updater bot : fireflyiii updated to 5.7.15 --- fireflyiii/CHANGELOG.md | 3 +++ fireflyiii/Dockerfile | 4 ++-- fireflyiii/config.json | 2 +- fireflyiii/updater.json | 4 ++-- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/fireflyiii/CHANGELOG.md b/fireflyiii/CHANGELOG.md index 7821bb949..76a43951d 100644 --- a/fireflyiii/CHANGELOG.md +++ b/fireflyiii/CHANGELOG.md @@ -1,3 +1,6 @@ + +## 5.7.15 (02-11-2022) +- Update to latest version from firefly-iii/firefly-iii ## 5.7.14-2 (29-10-2022) - Fix bug #530 diff --git a/fireflyiii/Dockerfile b/fireflyiii/Dockerfile index b00049a30..9ebe0ea89 100644 --- a/fireflyiii/Dockerfile +++ b/fireflyiii/Dockerfile @@ -33,12 +33,12 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # # Change data location # grep -rl "/var/www/html" /etc/ | xargs sed -i 's|/var/www/html|/data/firefly|g' -ARG BUILD_UPSTREAM="5.7.14" +ARG BUILD_UPSTREAM="5.7.15" RUN \ ################# # Fix for 5.7.5 # ################# - if [ "$BUILD_UPSTREAM" = "5.7.14" ] ; then \ + if [ "$BUILD_UPSTREAM" = "5.7.15" ] ; then \ sed -i "s|, \$transaction\[\x27amount\x27\] ?? \x270\x27);|, (string)(\$transaction\[\x27amount\x27\] ?? \x270\x27));|g" /var/www/html/app/Helpers/Collector/GroupCollector.php; else echo "not 5.7.5"; fi RUN \ # Change upload folder to "ha_upload" since the default one is binded to a volume (see base image) diff --git a/fireflyiii/config.json b/fireflyiii/config.json index 5f89a074c..ba53514e8 100644 --- a/fireflyiii/config.json +++ b/fireflyiii/config.json @@ -46,6 +46,6 @@ "slug": "fireflyiii", "startup": "services", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "5.7.14-3", + "version": "5.7.15", "webui": "[PROTO:ssl]://[HOST]:[PORT:8080]" } diff --git a/fireflyiii/updater.json b/fireflyiii/updater.json index 49782dda5..161e58c2e 100644 --- a/fireflyiii/updater.json +++ b/fireflyiii/updater.json @@ -1,8 +1,8 @@ { - "last_update": "20-10-2022", + "last_update": "02-11-2022", "repository": "alexbelgium/hassio-addons", "slug": "fireflyiii", "source": "github", "upstream_repo": "firefly-iii/firefly-iii", - "upstream_version": "5.7.14" + "upstream_version": "5.7.15" } From 262b37d757a4152cf2af039f83fde35dfb57c47a Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Wed, 2 Nov 2022 11:58:42 +0100 Subject: [PATCH 231/243] Updater bot : jackett updated to 0.20.2186 --- jackett/CHANGELOG.md | 3 +++ jackett/config.json | 2 +- jackett/updater.json | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/jackett/CHANGELOG.md b/jackett/CHANGELOG.md index 4b5b14848..478fe3cc0 100644 --- a/jackett/CHANGELOG.md +++ b/jackett/CHANGELOG.md @@ -1,4 +1,7 @@ +## 0.20.2186 (02-11-2022) +- Update to latest version from linuxserver/docker-jackett + ## 0.20.2180 (01-11-2022) - Update to latest version from linuxserver/docker-jackett diff --git a/jackett/config.json b/jackett/config.json index 7291d385c..076f1455f 100644 --- a/jackett/config.json +++ b/jackett/config.json @@ -43,6 +43,6 @@ }, "slug": "jackett_nas", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/jackett", - "version": "0.20.2180", + "version": "0.20.2186", "webui": "[PROTO:ssl]://[HOST]:[PORT:9117]" } diff --git a/jackett/updater.json b/jackett/updater.json index 21e2c899a..22c7bde50 100644 --- a/jackett/updater.json +++ b/jackett/updater.json @@ -1,8 +1,8 @@ { - "last_update": "01-11-2022", + "last_update": "02-11-2022", "repository": "alexbelgium/hassio-addons", "slug": "jackett", "source": "github", "upstream_repo": "linuxserver/docker-jackett", - "upstream_version": "0.20.2180" + "upstream_version": "0.20.2186" } From 261d0f906c75b52c27e9d7ef2ece39380dafce78 Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Wed, 2 Nov 2022 11:58:50 +0100 Subject: [PATCH 232/243] Updater bot : jellyfin updated to 10.8.7-1-ls186 --- jellyfin/CHANGELOG.md | 3 +++ jellyfin/config.json | 2 +- jellyfin/updater.json | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/jellyfin/CHANGELOG.md b/jellyfin/CHANGELOG.md index 55dab975d..d4450109c 100644 --- a/jellyfin/CHANGELOG.md +++ b/jellyfin/CHANGELOG.md @@ -1,4 +1,7 @@ +## 10.8.7-1-ls186 (02-11-2022) +- Update to latest version from linuxserver/docker-jellyfin + ## 10.8.6-1-ls185 (01-11-2022) - Update to latest version from linuxserver/docker-jellyfin diff --git a/jellyfin/config.json b/jellyfin/config.json index 02359ed97..6b2b60a14 100644 --- a/jellyfin/config.json +++ b/jellyfin/config.json @@ -103,6 +103,6 @@ }, "slug": "jellyfin", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "10.8.6-1-ls185", + "version": "10.8.7-1-ls186", "video": true } diff --git a/jellyfin/updater.json b/jellyfin/updater.json index f14d17ed0..13341ccd2 100644 --- a/jellyfin/updater.json +++ b/jellyfin/updater.json @@ -1,9 +1,9 @@ { "github_fulltag": "true", - "last_update": "01-11-2022", + "last_update": "02-11-2022", "repository": "alexbelgium/hassio-addons", "slug": "jellyfin", "source": "github", "upstream_repo": "linuxserver/docker-jellyfin", - "upstream_version": "10.8.6-1-ls185" + "upstream_version": "10.8.7-1-ls186" } From f04f28476c615a05156f0b76faf5f422b0198124 Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Wed, 2 Nov 2022 11:59:12 +0100 Subject: [PATCH 233/243] Updater bot : lidarr updated to 1.0.2.2592-ls101 --- lidarr/CHANGELOG.md | 3 +++ lidarr/config.json | 2 +- lidarr/updater.json | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lidarr/CHANGELOG.md b/lidarr/CHANGELOG.md index 99f2e2b61..92df89cfd 100644 --- a/lidarr/CHANGELOG.md +++ b/lidarr/CHANGELOG.md @@ -1,4 +1,7 @@ +## 1.0.2.2592-ls101 (02-11-2022) +- Update to latest version from linuxserver/docker-lidarr + ## 1.0.2.2592-ls100 (01-11-2022) - Update to latest version from linuxserver/docker-lidarr diff --git a/lidarr/config.json b/lidarr/config.json index b495b915b..4a3ca4eea 100644 --- a/lidarr/config.json +++ b/lidarr/config.json @@ -80,6 +80,6 @@ }, "slug": "lidarr_nas", "url": "https://github.com/alexbelgium/hassio-addons/blob/master/lidarr/Readme.md", - "version": "1.0.2.2592-ls100", + "version": "1.0.2.2592-ls101", "webui": "[PROTO:ssl]://[HOST]:[PORT:8686]" } diff --git a/lidarr/updater.json b/lidarr/updater.json index 421f4ce1b..42cf5eef0 100644 --- a/lidarr/updater.json +++ b/lidarr/updater.json @@ -1,9 +1,9 @@ { "github_fulltag": "true", - "last_update": "01-11-2022", + "last_update": "02-11-2022", "repository": "alexbelgium/hassio-addons", "slug": "lidarr", "source": "github", "upstream_repo": "linuxserver/docker-lidarr", - "upstream_version": "1.0.2.2592-ls100" + "upstream_version": "1.0.2.2592-ls101" } From 6f40ae07340b0bdc78165eaa82f39523aed446d1 Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Wed, 2 Nov 2022 12:00:53 +0100 Subject: [PATCH 234/243] Updater bot : paperless_ngx updated to v1.9.2 --- paperless_ngx/CHANGELOG.md | 3 +++ paperless_ngx/config.json | 2 +- paperless_ngx/updater.json | 6 +++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/paperless_ngx/CHANGELOG.md b/paperless_ngx/CHANGELOG.md index d059c291d..f8da0999b 100644 --- a/paperless_ngx/CHANGELOG.md +++ b/paperless_ngx/CHANGELOG.md @@ -1,3 +1,6 @@ + +## v1.9.2 (02-11-2022) +- Update to latest version from paperless-ngx/paperless-ngx ## v1.8.2 (01-11-2022) - BACKUP BEFORE UPDATE : switch to paperless-ngx image. Please backup before switch. diff --git a/paperless_ngx/config.json b/paperless_ngx/config.json index b08f2663b..009393a68 100644 --- a/paperless_ngx/config.json +++ b/paperless_ngx/config.json @@ -84,6 +84,6 @@ }, "slug": "paperless_ng", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "1.8.2", + "version": "v1.9.2", "webui": "[PROTO:ssl]://[HOST]:[PORT:8000]" } diff --git a/paperless_ngx/updater.json b/paperless_ngx/updater.json index 9324c8092..baef668de 100644 --- a/paperless_ngx/updater.json +++ b/paperless_ngx/updater.json @@ -1,9 +1,9 @@ { "github_fulltag": "true", - "last_update": "24-09-2022", + "last_update": "02-11-2022", "repository": "alexbelgium/hassio-addons", "slug": "paperless_ngx", "source": "github", "upstream_repo": "paperless-ngx/paperless-ngx", - "upstream_version": "1.8.2" -} \ No newline at end of file + "upstream_version": "v1.9.2" +} From ba95a9168921e4fdcba5aca00bd984a74f4ffa66 Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Wed, 2 Nov 2022 12:02:09 +0100 Subject: [PATCH 235/243] Updater bot : plex updated to 1.29.1.6316-f4cdfea9c-ls141 --- plex/CHANGELOG.md | 3 +++ plex/config.json | 2 +- plex/updater.json | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/plex/CHANGELOG.md b/plex/CHANGELOG.md index 2244cb9b1..ffc378d13 100644 --- a/plex/CHANGELOG.md +++ b/plex/CHANGELOG.md @@ -1,4 +1,7 @@ +## 1.29.1.6316-f4cdfea9c-ls141 (02-11-2022) +- Update to latest version from linuxserver/docker-plex + ## 1.29.1.6316-f4cdfea9c-ls140 (25-10-2022) - Update to latest version from linuxserver/docker-plex diff --git a/plex/config.json b/plex/config.json index 576e11544..846c913ca 100644 --- a/plex/config.json +++ b/plex/config.json @@ -115,7 +115,7 @@ }, "slug": "plex_nas", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/plex", - "version": "1.29.1.6316-f4cdfea9c-ls140", + "version": "1.29.1.6316-f4cdfea9c-ls141", "video": true, "webui": "[PROTO:ssl]://[HOST]:[PORT:32400]/web" } diff --git a/plex/updater.json b/plex/updater.json index facb1335d..4f0d1650d 100644 --- a/plex/updater.json +++ b/plex/updater.json @@ -1,9 +1,9 @@ { "github_fulltag": "true", - "last_update": "25-10-2022", + "last_update": "02-11-2022", "repository": "alexbelgium/hassio-addons", "slug": "plex", "source": "github", "upstream_repo": "linuxserver/docker-plex", - "upstream_version": "1.29.1.6316-f4cdfea9c-ls140" + "upstream_version": "1.29.1.6316-f4cdfea9c-ls141" } From 69f54f68f4cefde76cef11eb0270bc8c0c4b5433 Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Wed, 2 Nov 2022 12:02:18 +0100 Subject: [PATCH 236/243] Updater bot : plex_meta_manager updated to v1.17.3-ls33 --- plex_meta_manager/CHANGELOG.md | 3 +++ plex_meta_manager/config.json | 2 +- plex_meta_manager/updater.json | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/plex_meta_manager/CHANGELOG.md b/plex_meta_manager/CHANGELOG.md index 97a45e4c2..3c0462871 100644 --- a/plex_meta_manager/CHANGELOG.md +++ b/plex_meta_manager/CHANGELOG.md @@ -1,4 +1,7 @@ +## v1.17.3-ls33 (02-11-2022) +- Update to latest version from linuxserver/docker-plex-meta-manager + ## v1.17.3-ls32 (01-11-2022) - Update to latest version from linuxserver/docker-plex-meta-manager diff --git a/plex_meta_manager/config.json b/plex_meta_manager/config.json index 94c543c17..1a9bbc72e 100644 --- a/plex_meta_manager/config.json +++ b/plex_meta_manager/config.json @@ -34,5 +34,5 @@ }, "slug": "plex-meta-manager", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/plex_meta_manager", - "version": "v1.17.3-ls32" + "version": "v1.17.3-ls33" } diff --git a/plex_meta_manager/updater.json b/plex_meta_manager/updater.json index 274442e6d..ac3666b92 100644 --- a/plex_meta_manager/updater.json +++ b/plex_meta_manager/updater.json @@ -1,9 +1,9 @@ { "github_fulltag": "true", - "last_update": "01-11-2022", + "last_update": "02-11-2022", "repository": "alexbelgium/hassio-addons", "slug": "plex_meta_manager", "source": "github", "upstream_repo": "linuxserver/docker-plex-meta-manager", - "upstream_version": "v1.17.3-ls32" + "upstream_version": "v1.17.3-ls33" } From d7335dce9b96ea640f132986272b799995349a1e Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Wed, 2 Nov 2022 15:54:41 +0100 Subject: [PATCH 237/243] Update updater.json --- paperless_ngx/updater.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/paperless_ngx/updater.json b/paperless_ngx/updater.json index baef668de..9b516f9dc 100644 --- a/paperless_ngx/updater.json +++ b/paperless_ngx/updater.json @@ -1,5 +1,5 @@ { - "github_fulltag": "true", + "github_fulltag": "false", "last_update": "02-11-2022", "repository": "alexbelgium/hassio-addons", "slug": "paperless_ngx", From 6d582b06eb6a04b7ac2625d02fe93bd7a9926c87 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Wed, 2 Nov 2022 15:55:58 +0100 Subject: [PATCH 238/243] Update Dockerfile --- paperless_ngx/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/paperless_ngx/Dockerfile b/paperless_ngx/Dockerfile index 3c529e4d7..1be17224c 100644 --- a/paperless_ngx/Dockerfile +++ b/paperless_ngx/Dockerfile @@ -16,7 +16,8 @@ ARG BUILD_FROM ARG BUILD_VERSION -FROM ${BUILD_FROM} +ARG BUILD_UPSTREAM="v1.9.2" +FROM ${BUILD_FROM}${BUILD_UPSTREAM} ################## # 2 Modify Image # From 2c1236e895de1624af8f1177478c8220ba4c04b3 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Wed, 2 Nov 2022 15:56:26 +0100 Subject: [PATCH 239/243] Update build.json --- paperless_ngx/build.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/paperless_ngx/build.json b/paperless_ngx/build.json index b8f9af604..6e2168be3 100644 --- a/paperless_ngx/build.json +++ b/paperless_ngx/build.json @@ -1,10 +1,10 @@ { "build_from": { - "aarch64": "ghcr.io/paperless-ngx/paperless-ngx:latest", - "amd64": "ghcr.io/paperless-ngx/paperless-ngx:latest", - "armv7": "ghcr.io/paperless-ngx/paperless-ngx:latest" + "aarch64": "ghcr.io/paperless-ngx/paperless-ngx:", + "amd64": "ghcr.io/paperless-ngx/paperless-ngx:", + "armv7": "ghcr.io/paperless-ngx/paperless-ngx:" }, "codenotary": { "signer": "alexandrep.github@gmail.com" } -} \ No newline at end of file +} From d9ecc2e8b89a19a5ea6d8b50b399b0429a707a78 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Wed, 2 Nov 2022 15:57:00 +0100 Subject: [PATCH 240/243] Update CHANGELOG.md --- paperless_ngx/CHANGELOG.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/paperless_ngx/CHANGELOG.md b/paperless_ngx/CHANGELOG.md index f8da0999b..eda77cf7c 100644 --- a/paperless_ngx/CHANGELOG.md +++ b/paperless_ngx/CHANGELOG.md @@ -1,6 +1,4 @@ -## v1.9.2 (02-11-2022) -- Update to latest version from paperless-ngx/paperless-ngx ## v1.8.2 (01-11-2022) - BACKUP BEFORE UPDATE : switch to paperless-ngx image. Please backup before switch. From c452e564406b80c1be1625dc0ca90aa8d17e974e Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Wed, 2 Nov 2022 15:57:11 +0100 Subject: [PATCH 241/243] Update CHANGELOG.md --- paperless_ngx/CHANGELOG.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/paperless_ngx/CHANGELOG.md b/paperless_ngx/CHANGELOG.md index eda77cf7c..106e9b638 100644 --- a/paperless_ngx/CHANGELOG.md +++ b/paperless_ngx/CHANGELOG.md @@ -1,6 +1,3 @@ - -## v1.8.2 (01-11-2022) - - BACKUP BEFORE UPDATE : switch to paperless-ngx image. Please backup before switch. ## v1.8.0-ls30 (24-09-2022) From 7633d284079f9938ce42d09c9aca1524723bf580 Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Wed, 2 Nov 2022 16:00:50 +0100 Subject: [PATCH 242/243] Updater bot : paperless_ngx updated to 1.9.2 --- paperless_ngx/CHANGELOG.md | 3 +++ paperless_ngx/Dockerfile | 2 +- paperless_ngx/config.json | 2 +- paperless_ngx/updater.json | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/paperless_ngx/CHANGELOG.md b/paperless_ngx/CHANGELOG.md index 106e9b638..3cf2372b7 100644 --- a/paperless_ngx/CHANGELOG.md +++ b/paperless_ngx/CHANGELOG.md @@ -1,3 +1,6 @@ + +## 1.9.2 (02-11-2022) +- Update to latest version from paperless-ngx/paperless-ngx - BACKUP BEFORE UPDATE : switch to paperless-ngx image. Please backup before switch. ## v1.8.0-ls30 (24-09-2022) diff --git a/paperless_ngx/Dockerfile b/paperless_ngx/Dockerfile index 1be17224c..051346099 100644 --- a/paperless_ngx/Dockerfile +++ b/paperless_ngx/Dockerfile @@ -16,7 +16,7 @@ ARG BUILD_FROM ARG BUILD_VERSION -ARG BUILD_UPSTREAM="v1.9.2" +ARG BUILD_UPSTREAM="1.9.2" FROM ${BUILD_FROM}${BUILD_UPSTREAM} ################## diff --git a/paperless_ngx/config.json b/paperless_ngx/config.json index 009393a68..530393aa4 100644 --- a/paperless_ngx/config.json +++ b/paperless_ngx/config.json @@ -84,6 +84,6 @@ }, "slug": "paperless_ng", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "v1.9.2", + "version": "1.9.2", "webui": "[PROTO:ssl]://[HOST]:[PORT:8000]" } diff --git a/paperless_ngx/updater.json b/paperless_ngx/updater.json index 9b516f9dc..9b45a4522 100644 --- a/paperless_ngx/updater.json +++ b/paperless_ngx/updater.json @@ -5,5 +5,5 @@ "slug": "paperless_ngx", "source": "github", "upstream_repo": "paperless-ngx/paperless-ngx", - "upstream_version": "v1.9.2" + "upstream_version": "1.9.2" } From 3b6fc0ed8baa46517134520439605ca8695af828 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Wed, 2 Nov 2022 16:01:49 +0100 Subject: [PATCH 243/243] Update 00-data_location.sh --- webtop_kde/rootfs/etc/cont-init.d/00-data_location.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/webtop_kde/rootfs/etc/cont-init.d/00-data_location.sh b/webtop_kde/rootfs/etc/cont-init.d/00-data_location.sh index ffc8ceb2a..d099512c8 100644 --- a/webtop_kde/rootfs/etc/cont-init.d/00-data_location.sh +++ b/webtop_kde/rootfs/etc/cont-init.d/00-data_location.sh @@ -1,5 +1,6 @@ #!/usr/bin/with-contenv bashio # shellcheck shell=bash +# shellcheck disable=SC2046 # Define user PUID=$(bashio::config "PUID")