From d8e98e1cd0d8dfa976f0e505f0ffcc310d1544ba Mon Sep 17 00:00:00 2001 From: bruvv <3063928+bruvv@users.noreply.github.com> Date: Sun, 26 Dec 2021 11:20:56 +0100 Subject: [PATCH 01/15] Made a lot clearer why this addon exists ;) --- addons_updater/README.md | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/addons_updater/README.md b/addons_updater/README.md index df0d109f0..2538e36e0 100644 --- a/addons_updater/README.md +++ b/addons_updater/README.md @@ -1,12 +1,15 @@ # Home assistant add-on: addons updater [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) +[![Support Thread][support-badge]](https://community.home-assistant.io/t/new-addon-automatically-update-addons-based-on-github-upstream-new-releases/) [donation-badge]: https://img.shields.io/badge/Buy%20me%20a%20coffee-%23d32f2f?logo=buy-me-a-coffee&style=flat&logoColor=white +[support-badge]: https://camo.githubusercontent.com/f4dbb995049f512fdc97fcc9e022ac243fa38c408510df9d46c7467d0970d959/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f537570706f72742d7468726561642d677265656e2e737667 ![Version](https://img.shields.io/badge/dynamic/json?label=Version&query=%24.version&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Faddons_updater%2Fconfig.json) ![Ingress](https://img.shields.io/badge/dynamic/json?label=Ingress&query=%24.ingress&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Faddons_updater%2Fconfig.json) -![Arch](https://img.shields.io/badge/dynamic/json?color=success&label=Arch&query=%24.arch&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Faddons_updater%2Fconfig.json) +![Arch](https://img.shields.io/badge/dynamic/json?color=success&label=Arch&query=%24.arch&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Faddons_updater%2Fconfig.json) + _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ @@ -14,7 +17,7 @@ _Thanks to everyone having starred my repo! To star it click on the image below, ## About -This script allows to automatically update addons based on upstream new releases +This script allows to automatically update addons based on upstream new releases. This is only an helper tool for developers. End users don’t need that to update their addons - they are automatically alerted by HA when an update is available ## Installation @@ -43,8 +46,29 @@ addon: upstream: name/repo, example is 'linuxserver/docker-emby' source : github or dockerhub gituser: your github username -gituser: your github email -gitpass: add your github password here, or a specific key if you have two factor identification enabled +gitpass: your github password +gitmail: your github email +verbose: 'false' +gitapi: optional, it is the API key from your github repo +``` + +Example: +```yaml + - slug: sonarr + beta: false + fulltag: false + repository: alexbelgium/hassio-addons + upstream: linuxserver/docker-sonarr + - slug: transmission + beta: false + fulltag: true + repository: alexbelgium/hassio-addons + upstream: linuxserver/docker-transmission + - slug: ubooquity + beta: false + fulltag: false + repository: alexbelgium/hassio-addons + upstream: linuxserver/docker-ubooquity ``` [repository]: https://github.com/alexbelgium/hassio-addons From c7ae1272827e6990fd5ef22cf2b1ea0b4355e112 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sun, 26 Dec 2021 16:20:45 +0100 Subject: [PATCH 02/15] Not used --- jackett/rootfs/etc/cont-init.d/00-ha-env | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 jackett/rootfs/etc/cont-init.d/00-ha-env diff --git a/jackett/rootfs/etc/cont-init.d/00-ha-env b/jackett/rootfs/etc/cont-init.d/00-ha-env deleted file mode 100644 index 3b3e69246..000000000 --- a/jackett/rootfs/etc/cont-init.d/00-ha-env +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/with-contenv bashio - -for k in $(bashio::jq "${__BASHIO_ADDON_CONFIG}" 'keys | .[]'); do - printf "$(bashio::config $k)" > /var/run/s6/container_environment/$k -done \ No newline at end of file From d312811800ef9d703171f47461a1a6aa9466bea9 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sun, 26 Dec 2021 16:59:04 +0100 Subject: [PATCH 03/15] Align config folder to /config/addons_config/Jackett --- jackett/Dockerfile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/jackett/Dockerfile b/jackett/Dockerfile index c36227757..ac1155b4a 100644 --- a/jackett/Dockerfile +++ b/jackett/Dockerfile @@ -22,14 +22,19 @@ FROM ${BUILD_FROM} ################## # use /data instead of /config for hass.io environment -RUN sed -i "s|/config|/config/jackett|g" /etc/services.d/jackett/run \ - && sed -i "s|/config|/config/jackett|g" /etc/cont-init.d/30-config \ +RUN sed -i "s|/config|/config/addons_config/Jackett|g" /etc/services.d/jackett/run \ + && sed -i "s|/config|/config/addons_config/Jackett|g" /etc/cont-init.d/30-config \ + && sed -i "1a [ -f /config/Jackett ] && (mkdir -p /config/addons_config/Jackett && mv /config/Jackett /config/addons_config/jackett)" /etc/cont-init.d/30-config \ \ # Allow UID and GID setting && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \ && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser +# Changes config directory +ENV XDG_DATA_HOME="/config/addons_config" \ + XDG_CONFIG_HOME="/config/addons_config" + ################## # 3 Install apps # ################## From 52c74ddcd47606ff6a33c61f5b2b6d22318e8c65 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sun, 26 Dec 2021 17:21:09 +0100 Subject: [PATCH 04/15] Typo correct --- jackett/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jackett/Dockerfile b/jackett/Dockerfile index ac1155b4a..4063bb77f 100644 --- a/jackett/Dockerfile +++ b/jackett/Dockerfile @@ -24,7 +24,7 @@ FROM ${BUILD_FROM} # use /data instead of /config for hass.io environment RUN sed -i "s|/config|/config/addons_config/Jackett|g" /etc/services.d/jackett/run \ && sed -i "s|/config|/config/addons_config/Jackett|g" /etc/cont-init.d/30-config \ - && sed -i "1a [ -f /config/Jackett ] && (mkdir -p /config/addons_config/Jackett && mv /config/Jackett /config/addons_config/jackett)" /etc/cont-init.d/30-config \ + && sed -i "1a [ -f /config/Jackett ] && (mkdir -p /config/addons_config/Jackett && cp -r /config/Jackett/ /config/addons_config/Jackett/ && rm -r /config/Jackett)" /etc/cont-init.d/30-config \ \ # Allow UID and GID setting && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ From 83ef72e0345a089a07219a35ed1f8164c8a02ad1 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sun, 26 Dec 2021 17:34:52 +0100 Subject: [PATCH 05/15] Update Dockerfile --- jackett/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jackett/Dockerfile b/jackett/Dockerfile index 4063bb77f..e69b34848 100644 --- a/jackett/Dockerfile +++ b/jackett/Dockerfile @@ -24,7 +24,7 @@ FROM ${BUILD_FROM} # use /data instead of /config for hass.io environment RUN sed -i "s|/config|/config/addons_config/Jackett|g" /etc/services.d/jackett/run \ && sed -i "s|/config|/config/addons_config/Jackett|g" /etc/cont-init.d/30-config \ - && sed -i "1a [ -f /config/Jackett ] && (mkdir -p /config/addons_config/Jackett && cp -r /config/Jackett/ /config/addons_config/Jackett/ && rm -r /config/Jackett)" /etc/cont-init.d/30-config \ + && sed -i "1a if [ -f /config/Jackett ]; then mkdir -p /config/addons_config/Jackett && cp -r /config/Jackett/ /config/addons_config/Jackett/ && rm -r /config/Jackett; fi" /etc/cont-init.d/30-config \ \ # Allow UID and GID setting && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ From 77e6559e7719f6cd46cf1182e6b03a634f28fc1e Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sun, 26 Dec 2021 17:49:24 +0100 Subject: [PATCH 06/15] Update Dockerfile --- jackett/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jackett/Dockerfile b/jackett/Dockerfile index e69b34848..e6383c73b 100644 --- a/jackett/Dockerfile +++ b/jackett/Dockerfile @@ -24,7 +24,7 @@ FROM ${BUILD_FROM} # use /data instead of /config for hass.io environment RUN sed -i "s|/config|/config/addons_config/Jackett|g" /etc/services.d/jackett/run \ && sed -i "s|/config|/config/addons_config/Jackett|g" /etc/cont-init.d/30-config \ - && sed -i "1a if [ -f /config/Jackett ]; then mkdir -p /config/addons_config/Jackett && cp -r /config/Jackett/ /config/addons_config/Jackett/ && rm -r /config/Jackett; fi" /etc/cont-init.d/30-config \ + && sed -i "1a mkdir -p /config/addons_config/Jackett && if [ -d /config/Jackett ]; then cp -r /config/Jackett/ /config/addons_config/Jackett/ && rm -r /config/Jackett; fi" /etc/cont-init.d/30-config \ \ # Allow UID and GID setting && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ From 9d63d1392f489d9d404a78e19be08b3412a2e70f Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sun, 26 Dec 2021 17:50:38 +0100 Subject: [PATCH 07/15] Update CHANGELOG.md --- jackett/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/jackett/CHANGELOG.md b/jackett/CHANGELOG.md index cdea22158..7e5edfff8 100644 --- a/jackett/CHANGELOG.md +++ b/jackett/CHANGELOG.md @@ -1,3 +1,4 @@ +- Relocate config in /config/addons_config/Jackett to avoid double config folders ## 0.20.197 (24-12-2021) - Update to latest version from linuxserver/docker-jackett From 5817cdc8d4137fe1ec80d927b9409674122de8b4 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sun, 26 Dec 2021 17:57:27 +0100 Subject: [PATCH 08/15] Update config.json --- jackett/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jackett/config.json b/jackett/config.json index a1fcd6e73..e214613e2 100644 --- a/jackett/config.json +++ b/jackett/config.json @@ -45,6 +45,6 @@ "startup": "services", "upstream": "0.20.197", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "0.20.197", + "version": "0.20.197-2", "webui": "http://[HOST]:[PORT:9117]" } From 5dbd5d1d5eff9190ed70f5801d6afd9960a8f580 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sun, 26 Dec 2021 18:10:14 +0100 Subject: [PATCH 09/15] Update 20-folders --- jackett/rootfs/etc/cont-init.d/20-folders | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jackett/rootfs/etc/cont-init.d/20-folders b/jackett/rootfs/etc/cont-init.d/20-folders index 0a8112e46..f8993cd50 100644 --- a/jackett/rootfs/etc/cont-init.d/20-folders +++ b/jackett/rootfs/etc/cont-init.d/20-folders @@ -12,8 +12,8 @@ if [ ! -d /share/downloads ]; then chown -R abc:abc /share/downloads fi -if [ ! -d /config/jackett ]; then - echo "Creating /config/jackett" - mkdir -p /config/jackett - chown -R abc:abc /config/jackett +if [ ! -d /config/addons_config/Jackett ]; then + echo "Creating /config/addons_config/Jackett" + mkdir -p /config/addons_config/Jackett + chown -R abc:abc /config/addons_config/Jackett fi From 356fc90c95e774116f87ae47add71ef29b2c3092 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sun, 26 Dec 2021 18:11:01 +0100 Subject: [PATCH 10/15] Update Dockerfile --- jackett/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jackett/Dockerfile b/jackett/Dockerfile index e6383c73b..79ee78de3 100644 --- a/jackett/Dockerfile +++ b/jackett/Dockerfile @@ -24,7 +24,7 @@ FROM ${BUILD_FROM} # use /data instead of /config for hass.io environment RUN sed -i "s|/config|/config/addons_config/Jackett|g" /etc/services.d/jackett/run \ && sed -i "s|/config|/config/addons_config/Jackett|g" /etc/cont-init.d/30-config \ - && sed -i "1a mkdir -p /config/addons_config/Jackett && if [ -d /config/Jackett ]; then cp -r /config/Jackett/ /config/addons_config/Jackett/ && rm -r /config/Jackett; fi" /etc/cont-init.d/30-config \ + && sed -i "1a if [ -d /config/Jackett ]; then cp -r /config/Jackett/ /config/addons_config/Jackett/ && rm -r /config/Jackett; fi" /etc/cont-init.d/30-config \ \ # Allow UID and GID setting && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ From 741358c5b3118850aac2513a22f6881df4239475 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sun, 26 Dec 2021 18:11:48 +0100 Subject: [PATCH 11/15] Correct folders creation --- jackett/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jackett/config.json b/jackett/config.json index e214613e2..53c1f954e 100644 --- a/jackett/config.json +++ b/jackett/config.json @@ -45,6 +45,6 @@ "startup": "services", "upstream": "0.20.197", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "0.20.197-2", + "version": "0.20.197-3", "webui": "http://[HOST]:[PORT:9117]" } From fb9eac7a6235c092a217039d35e0edeeaf0b1c2d Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sun, 26 Dec 2021 18:14:14 +0100 Subject: [PATCH 12/15] Update Dockerfile --- jackett/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jackett/Dockerfile b/jackett/Dockerfile index 79ee78de3..c859320c8 100644 --- a/jackett/Dockerfile +++ b/jackett/Dockerfile @@ -24,7 +24,7 @@ FROM ${BUILD_FROM} # use /data instead of /config for hass.io environment RUN sed -i "s|/config|/config/addons_config/Jackett|g" /etc/services.d/jackett/run \ && sed -i "s|/config|/config/addons_config/Jackett|g" /etc/cont-init.d/30-config \ - && sed -i "1a if [ -d /config/Jackett ]; then cp -r /config/Jackett/ /config/addons_config/Jackett/ && rm -r /config/Jackett; fi" /etc/cont-init.d/30-config \ + && sed -i "1a if [ -d /config/Jackett ]; then cp -r /config/Jackett/* /config/addons_config/Jackett && rm -r /config/Jackett; fi" /etc/cont-init.d/30-config \ \ # Allow UID and GID setting && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ From c482bb97aeb4944936b5e8a94b3b896cd3b0184d Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sun, 26 Dec 2021 18:36:17 +0100 Subject: [PATCH 13/15] Revert location change --- jackett/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/jackett/Dockerfile b/jackett/Dockerfile index c859320c8..40f5dc7ce 100644 --- a/jackett/Dockerfile +++ b/jackett/Dockerfile @@ -24,7 +24,6 @@ FROM ${BUILD_FROM} # use /data instead of /config for hass.io environment RUN sed -i "s|/config|/config/addons_config/Jackett|g" /etc/services.d/jackett/run \ && sed -i "s|/config|/config/addons_config/Jackett|g" /etc/cont-init.d/30-config \ - && sed -i "1a if [ -d /config/Jackett ]; then cp -r /config/Jackett/* /config/addons_config/Jackett && rm -r /config/Jackett; fi" /etc/cont-init.d/30-config \ \ # Allow UID and GID setting && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ From c6f1a9803bf37f118ba094e5e122cc7ce15c8f02 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sun, 26 Dec 2021 18:36:40 +0100 Subject: [PATCH 14/15] Update CHANGELOG.md --- jackett/CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/jackett/CHANGELOG.md b/jackett/CHANGELOG.md index 7e5edfff8..cdea22158 100644 --- a/jackett/CHANGELOG.md +++ b/jackett/CHANGELOG.md @@ -1,4 +1,3 @@ -- Relocate config in /config/addons_config/Jackett to avoid double config folders ## 0.20.197 (24-12-2021) - Update to latest version from linuxserver/docker-jackett From dbc7d502240fab0ea2cc1c2e0ff7a2b7a12e8e9c Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sun, 26 Dec 2021 18:40:38 +0100 Subject: [PATCH 15/15] Update Dockerfile --- jackett/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jackett/Dockerfile b/jackett/Dockerfile index 40f5dc7ce..bec13476f 100644 --- a/jackett/Dockerfile +++ b/jackett/Dockerfile @@ -22,8 +22,8 @@ FROM ${BUILD_FROM} ################## # use /data instead of /config for hass.io environment -RUN sed -i "s|/config|/config/addons_config/Jackett|g" /etc/services.d/jackett/run \ - && sed -i "s|/config|/config/addons_config/Jackett|g" /etc/cont-init.d/30-config \ +RUN sed -i "s|/config|/config/Jackett|g" /etc/services.d/jackett/run \ + && sed -i "s|/config|/config/Jackett|g" /etc/cont-init.d/30-config \ \ # Allow UID and GID setting && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ @@ -31,8 +31,8 @@ RUN sed -i "s|/config|/config/addons_config/Jackett|g" /etc/services.d/jackett/r && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser # Changes config directory -ENV XDG_DATA_HOME="/config/addons_config" \ - XDG_CONFIG_HOME="/config/addons_config" +ENV XDG_DATA_HOME="/config" \ + XDG_CONFIG_HOME="/config" ################## # 3 Install apps #