From 9315a600166580da6e27dbdda3ed4d6623b38c79 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 4 Sep 2022 00:14:19 +0000 Subject: [PATCH 1/6] Github bot : script beautyshied --- addons_updater/rootfs/etc/cont-init.d/99-run.sh | 12 ++++++------ .../etc/cont-init.d/91-qbittorrent_configuration.sh | 2 +- qbittorrent/rootfs/etc/cont-init.d/93-openvpn.sh | 2 +- tandoor_recipes/rootfs/etc/cont-init.d/32-ingress.sh | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/addons_updater/rootfs/etc/cont-init.d/99-run.sh b/addons_updater/rootfs/etc/cont-init.d/99-run.sh index bcf4ceef1..fb02c8b58 100644 --- a/addons_updater/rootfs/etc/cont-init.d/99-run.sh +++ b/addons_updater/rootfs/etc/cont-init.d/99-run.sh @@ -75,12 +75,12 @@ for f in */; do BYDATE=$(jq -r .dockerhub_by_date updater.json) # Number of elements to check in dockerhub - if grep -Fxq "dockerhub_list_size" updater.json; then - LISTSIZE=$(jq -r .dockerhub_list_size updater.json) + if grep -Fxq "dockerhub_list_size" updater.json; then + LISTSIZE=$(jq -r .dockerhub_list_size updater.json) else - LISTSIZE=100 + LISTSIZE=100 fi - + #Skip if paused if [[ "$PAUSED" = true ]]; then bashio::log.magenta "... $SLUG addon updates are paused, skipping"; continue; fi @@ -111,7 +111,7 @@ for f in */; do sort -V | tail -n 1 ) - + [ "${BYDATE}" = true ] && LASTVERSION=$( curl -f -L -s --fail "https://hub.docker.com/v2/repositories/${DOCKERHUB_REPO}/${DOCKERHUB_IMAGE}/tags/?page_size=$LISTSIZE" | @@ -122,7 +122,7 @@ for f in */; do sort -V | tail -n 1 ) && \ - DATE=$( + DATE=$( curl -f -L -s --fail "https://hub.docker.com/v2/repositories/${DOCKERHUB_REPO}/${DOCKERHUB_IMAGE}/tags/?page_size=$LISTSIZE" | jq '.results[] | select(.name==$LASTVERSION) | .last_updated' -r --arg LASTVERSION "$LASTVERSION" ) && \ 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 4d16c1343..fac01581e 100644 --- a/qbittorrent/rootfs/etc/cont-init.d/91-qbittorrent_configuration.sh +++ b/qbittorrent/rootfs/etc/cont-init.d/91-qbittorrent_configuration.sh @@ -10,7 +10,7 @@ mkdir -p /config/qBittorrent # copy default config if [ ! -f /config/qBittorrent/qBittorrent.conf ]; then - cp /defaults/qBittorrent.conf /config/qBittorrent/qBittorrent.conf + cp /defaults/qBittorrent.conf /config/qBittorrent/qBittorrent.conf fi cd /config/qBittorrent/ || true diff --git a/qbittorrent/rootfs/etc/cont-init.d/93-openvpn.sh b/qbittorrent/rootfs/etc/cont-init.d/93-openvpn.sh index 9e961ae31..199f93073 100644 --- a/qbittorrent/rootfs/etc/cont-init.d/93-openvpn.sh +++ b/qbittorrent/rootfs/etc/cont-init.d/93-openvpn.sh @@ -110,7 +110,7 @@ else # Ensure no redirection by removing the direction tag if [ -f "$QBT_CONFIG_FILE" ]; then - sed -i '/Interface/d' "$QBT_CONFIG_FILE" + sed -i '/Interface/d' "$QBT_CONFIG_FILE" fi bashio::log.info "Direct connection without VPN enabled" diff --git a/tandoor_recipes/rootfs/etc/cont-init.d/32-ingress.sh b/tandoor_recipes/rootfs/etc/cont-init.d/32-ingress.sh index 7f519a86d..576060d26 100644 --- a/tandoor_recipes/rootfs/etc/cont-init.d/32-ingress.sh +++ b/tandoor_recipes/rootfs/etc/cont-init.d/32-ingress.sh @@ -5,10 +5,10 @@ # TEST # ######## if [ -f /config/tandooringress.conf ]; then - echo "running test file" - rm /etc/nginx/servers/ingress.conf - cp /config/tandooringress.conf /etc/nginx/servers/ingress.conf - chmod 775 /etc/nginx/servers/ingress.conf + echo "running test file" + rm /etc/nginx/servers/ingress.conf + cp /config/tandooringress.conf /etc/nginx/servers/ingress.conf + chmod 775 /etc/nginx/servers/ingress.conf fi ################# From a9e8065aeaa58120f47b64169174a805a1988760 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 4 Sep 2022 00:27:48 +0000 Subject: [PATCH 2/6] Github bot : json sorted --- epicgamesfree/updater.json | 2 +- gitea/config.json | 8 ++++---- omada/config.json | 2 +- tandoor_recipes/config.json | 4 ++-- xteve/config.json | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/epicgamesfree/updater.json b/epicgamesfree/updater.json index f03aa8d25..c745ec9a7 100644 --- a/epicgamesfree/updater.json +++ b/epicgamesfree/updater.json @@ -1,6 +1,6 @@ { - "dockerhub_list_size": 2, "dockerhub_by_date": true, + "dockerhub_list_size": 2, "github_fulltag": "false", "last_update": "2021-12-17", "repository": "alexbelgium/hassio-addons", diff --git a/gitea/config.json b/gitea/config.json index 203382f26..f3bc9c055 100644 --- a/gitea/config.json +++ b/gitea/config.json @@ -18,12 +18,12 @@ "ssl": false }, "ports": { - "3000/tcp": 3000, - "22/tcp": 2222 + "22/tcp": 2222, + "3000/tcp": 3000 }, "ports_description": { - "3000/tcp": "Http web interface", - "22/tcp": "Ssh" + "22/tcp": "Ssh", + "3000/tcp": "Http web interface" }, "schema": { "certfile": "str", diff --git a/omada/config.json b/omada/config.json index 0d1369754..c5c3e437e 100644 --- a/omada/config.json +++ b/omada/config.json @@ -16,6 +16,7 @@ "SSL_KEY_NAME": "tls.key", "TZ": "Etc/UTC" }, + "host_network": true, "image": "ghcr.io/alexbelgium/omada-{arch}", "map": [ "config:rw", @@ -42,7 +43,6 @@ "8088/tcp": "web interface http", "8843/tcp": "portal https" }, - "host_network": true, "slug": "omada", "url": "https://github.com/alexbelgium/hassio-addons", "version": "5.5-chromium-amd64-2022-09-02", diff --git a/tandoor_recipes/config.json b/tandoor_recipes/config.json index 425fac597..2ffac9e26 100644 --- a/tandoor_recipes/config.json +++ b/tandoor_recipes/config.json @@ -8,9 +8,9 @@ "description": "recipe manager", "environment": { "DB_ENGINE": "django.db.backends.sqlite3", - "TRUSTED_PROXIES": "**", "DEBUG": "1", - "POSTGRES_DB": "/config/addons_config/tandoor_recipes/recipes.db" + "POSTGRES_DB": "/config/addons_config/tandoor_recipes/recipes.db", + "TRUSTED_PROXIES": "**" }, "ingress": true, "map": [ diff --git a/xteve/config.json b/xteve/config.json index c76063e70..f55416032 100644 --- a/xteve/config.json +++ b/xteve/config.json @@ -7,8 +7,8 @@ "codenotary": "alexandrep.github@gmail.com", "description": "M3U Proxy for Plex DVR and Emby Live TV", "environment": { - "XTEVE_HOME": "/data", - "XTEVE_CONF": "/data/conf" + "XTEVE_CONF": "/data/conf", + "XTEVE_HOME": "/data" }, "map": [ "config:rw", From 612368dc14689d53f49c75f52b99ba8102f7b45c Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sun, 4 Sep 2022 07:18:10 +0200 Subject: [PATCH 3/6] Update updater.json --- qbittorrent/updater.json | 1 + 1 file changed, 1 insertion(+) diff --git a/qbittorrent/updater.json b/qbittorrent/updater.json index 2b9f95f25..a07981d8c 100644 --- a/qbittorrent/updater.json +++ b/qbittorrent/updater.json @@ -1,4 +1,5 @@ { + "paused": true, "github_fulltag": "true", "last_update": "01-09-2022", "repository": "alexbelgium/hassio-addons", From 9181f3ffc4a75c8d7d58e8bb1cd35497716f07ef Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sun, 4 Sep 2022 09:16:10 +0200 Subject: [PATCH 4/6] Revert --- qbittorrent/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qbittorrent/Dockerfile b/qbittorrent/Dockerfile index b0ce18b5c..12accdd96 100644 --- a/qbittorrent/Dockerfile +++ b/qbittorrent/Dockerfile @@ -16,7 +16,7 @@ ARG BUILD_FROM ARG BUILD_VERSION -ARG BUILD_UPSTREAM="4.4.5-r0-ls213" +ARG BUILD_UPSTREAM="4.4.3.1-r1-ls208" FROM ${BUILD_FROM}-$BUILD_UPSTREAM ################## From 97feb4643d1b5a3c1c19e71f326234c48a6dbafb Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sun, 4 Sep 2022 09:16:28 +0200 Subject: [PATCH 5/6] Update config.json --- qbittorrent/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qbittorrent/config.json b/qbittorrent/config.json index 72374d957..e6a382e58 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-ls213" + "version": "4.4.3.1-r1-ls208" } From 0c15b86f63009ef828021dc58255be7e90737283 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sun, 4 Sep 2022 09:16:48 +0200 Subject: [PATCH 6/6] Update updater.json --- qbittorrent/updater.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qbittorrent/updater.json b/qbittorrent/updater.json index a07981d8c..ea0b42436 100644 --- a/qbittorrent/updater.json +++ b/qbittorrent/updater.json @@ -6,5 +6,5 @@ "slug": "qbittorrent", "source": "github", "upstream_repo": "linuxserver/docker-qbittorrent", - "upstream_version": "4.4.5-r0-ls213" + "upstream_version": "4.4.3.1-r1-ls208" }