From a519a40edc9900bc79e6e180bf1aaefbfbe8fcba Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Fri, 9 Dec 2022 21:40:01 +0100 Subject: [PATCH 1/8] Update Dockerfile --- photoprism/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/photoprism/Dockerfile b/photoprism/Dockerfile index cc4630c8d..22d64483d 100644 --- a/photoprism/Dockerfile +++ b/photoprism/Dockerfile @@ -16,8 +16,8 @@ ARG BUILD_FROM ARG BUILD_VERSION -ARG BUILD_UPSTREAM="20220121" -FROM photoprism/photoprism:latest +ARG BUILD_UPSTREAM="221105-jammy" +FROM photoprism/photoprism:$BUILD_UPSTREAM ################## # 2 Modify Image # From 363fbc15fb33792d11df6bd273f3b5eff1603031 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Fri, 9 Dec 2022 21:40:30 +0100 Subject: [PATCH 2/8] Update config.json --- photoprism/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/photoprism/config.json b/photoprism/config.json index 4172a5b1d..33524c265 100644 --- a/photoprism/config.json +++ b/photoprism/config.json @@ -101,5 +101,5 @@ ], "slug": "photoprism", "url": "https://github.com/alexbelgium/hassio-addons-test", - "version": "20220121-8" + "version": "20220121-reverted" } From fd1336040f1e37ee2051bce174e024f76e6b72fb Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Fri, 9 Dec 2022 21:49:28 +0100 Subject: [PATCH 3/8] Update weekly_stats.yaml --- .github/workflows/weekly_stats.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/weekly_stats.yaml b/.github/workflows/weekly_stats.yaml index 059cc0d45..4f8673e4c 100644 --- a/.github/workflows/weekly_stats.yaml +++ b/.github/workflows/weekly_stats.yaml @@ -82,7 +82,7 @@ jobs: sed -i "/$SLUG/s|^-|$DOWNLOADS|" "$file" # Sort file - sort -k1 -r -n "$file" > tmp && mv tmp "$file" + (head -n 2 "$file" && tail -n +3 "$file" | sort -k1 -r -n) > tmp && mv tmp "$file" #sed -i "1i Name Total armv7 amd64 aarch64" "$file" #TOTAL="$(awk '{SUM+=$2}END{print SUM}' Stats)" From 12f7fd0fe9602e0e6611c4f3f1d1c53bb93d70e0 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Fri, 9 Dec 2022 21:50:13 +0100 Subject: [PATCH 4/8] Update Stats --- Stats | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Stats b/Stats index 28fb8f8e1..1dd88215a 100644 --- a/Stats +++ b/Stats @@ -1,5 +1,5 @@ -3691 TOTAL 2022-12-09 Date +3691 TOTAL 555 portainer 313 epicgamesfree 264 filebrowser From 8c4098b772cb8adec9f951ca0354cc1ac7e8cf71 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Fri, 9 Dec 2022 21:51:10 +0100 Subject: [PATCH 5/8] Update Stats --- Stats | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Stats b/Stats index 1dd88215a..587978d62 100644 --- a/Stats +++ b/Stats @@ -1,4 +1,4 @@ -2022-12-09 Date +2022-12-08 Date 3691 TOTAL 555 portainer 313 epicgamesfree @@ -67,4 +67,3 @@ 4 ombi 3 mylar3 1 requestrr -- From 08070d1611a2f47347a927383cea26b9f91b8264 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Fri, 9 Dec 2022 22:25:24 +0100 Subject: [PATCH 6/8] Update updater.json --- photoprism/updater.json | 1 + 1 file changed, 1 insertion(+) diff --git a/photoprism/updater.json b/photoprism/updater.json index db8b1725a..4a927c928 100644 --- a/photoprism/updater.json +++ b/photoprism/updater.json @@ -1,6 +1,7 @@ { "github_fulltag": "true", "last_update": "01-09-2022", + "paused": true, "repository": "alexbelgium/hassio-addons", "slug": "photoprism", "source": "dockerhub", From 2b10becd145dcad1114710c973d5fa80d2609fcb Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Fri, 9 Dec 2022 22:32:56 +0100 Subject: [PATCH 7/8] Clean --- photoprism/rootfs/etc/nginx/servers/ingress.conf | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/photoprism/rootfs/etc/nginx/servers/ingress.conf b/photoprism/rootfs/etc/nginx/servers/ingress.conf index 85bc42f6d..39da94117 100644 --- a/photoprism/rootfs/etc/nginx/servers/ingress.conf +++ b/photoprism/rootfs/etc/nginx/servers/ingress.conf @@ -5,13 +5,9 @@ server { client_max_body_size 0; server_name photoprism.*; - add_header 'Referrer-Policy' 'no-referrer'; - proxy_set_header Range $http_range; - proxy_set_header If-Range $http_if_range; - location / { # Proxy - proxy_pass http://127.0.0.1:2341%%ingress_entry%%/; + proxy_pass http://127.0.0.1:2341%%ingress_entry%%; proxy_read_timeout 300; proxy_redirect off; From aa96ec609d2fabd481b20ca8c26fe5d6646508cd Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Fri, 9 Dec 2022 22:43:55 +0100 Subject: [PATCH 8/8] Update ingress.conf --- photoprism/rootfs/etc/nginx/servers/ingress.conf | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/photoprism/rootfs/etc/nginx/servers/ingress.conf b/photoprism/rootfs/etc/nginx/servers/ingress.conf index 39da94117..85bc42f6d 100644 --- a/photoprism/rootfs/etc/nginx/servers/ingress.conf +++ b/photoprism/rootfs/etc/nginx/servers/ingress.conf @@ -5,9 +5,13 @@ server { client_max_body_size 0; server_name photoprism.*; + add_header 'Referrer-Policy' 'no-referrer'; + proxy_set_header Range $http_range; + proxy_set_header If-Range $http_if_range; + location / { # Proxy - proxy_pass http://127.0.0.1:2341%%ingress_entry%%; + proxy_pass http://127.0.0.1:2341%%ingress_entry%%/; proxy_read_timeout 300; proxy_redirect off;