From cb8db37ffa5255a32d09a643ee6232e7b4bed60f Mon Sep 17 00:00:00 2001 From: Colin Seymour Date: Sun, 31 Mar 2024 09:20:53 +0100 Subject: [PATCH 1/5] Remove test text --- build.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.json b/build.json index e4cd60b..6419726 100644 --- a/build.json +++ b/build.json @@ -8,7 +8,7 @@ "ghostfolio_version": "2.65.0" }, "labels": { - "org.opencontainers.image.title": "Home Assistant Add-on: Ghostfolio TESTME", + "org.opencontainers.image.title": "Home Assistant Add-on: Ghostfolio", "org.opencontainers.image.description": "Privacy-first, open source dashboard for your personal finances.", "org.opencontainers.image.source": "https://github.com/lildude/ha-addon-ghostfolio/", "org.opencontainers.image.licenses": "MIT" @@ -16,4 +16,4 @@ "codenotary": { "signer": "colin@symr.io" } -} \ No newline at end of file +} From 229ba11b17433bba369311bacb4ab4ea4bcebb5c Mon Sep 17 00:00:00 2001 From: Colin Seymour Date: Sun, 31 Mar 2024 09:33:17 +0100 Subject: [PATCH 2/5] Add docker config --- .github/dependabot.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml index 83b26ea..4355c3d 100644 --- a/.github/dependabot.yaml +++ b/.github/dependabot.yaml @@ -3,5 +3,10 @@ updates: - package-ecosystem: "github-actions" directory: "/" schedule: - interval: weekly + interval: "weekly" + time: "06:00" + - package-ecosystem: "docker" + directory: "/" + schedule: + interval: "weekly" time: "06:00" From 61ee97c5419eec37711fd1cbe108c8cae2b42887 Mon Sep 17 00:00:00 2001 From: Colin Seymour Date: Sun, 31 Mar 2024 11:01:58 +0000 Subject: [PATCH 3/5] Only modify if haven't yet --- rootfs/etc/services.d/ghostfolio/run | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/rootfs/etc/services.d/ghostfolio/run b/rootfs/etc/services.d/ghostfolio/run index 30cc1b1..47d5d66 100644 --- a/rootfs/etc/services.d/ghostfolio/run +++ b/rootfs/etc/services.d/ghostfolio/run @@ -43,8 +43,10 @@ ingress_entry=$(curl -X GET \ -s http://supervisor/addons/self/info | \ jq -r '.data.ingress_entry') -sed -Ei "s^(\`|\")/api^\1${ingress_entry}/api^g" /ghostfolio/apps/client/*/*.js -sed -Ei "s^\(/assets^\(${ingress_entry}/assets^g" /ghostfolio/apps/client/*/*.js +if [[ $(grep hassio_ingress /ghostfolio/apps/client/en/main.*.js) -eq 0 ]]; then + sed -Ei "s^(\`|\")/api^\1${ingress_entry}/api^g" /ghostfolio/apps/client/*/*.js + sed -Ei "s^\(/assets^\(${ingress_entry}/assets^g" /ghostfolio/apps/client/*/*.js +fi cd /ghostfolio/apps/api yarn start:production \ No newline at end of file From 9e76a836d57627a51febcefca19fd9582f936789 Mon Sep 17 00:00:00 2001 From: Colin Seymour Date: Sun, 31 Mar 2024 11:13:42 +0000 Subject: [PATCH 4/5] Specify source directly in dockerfile So we can get dependabot to do the updates for us --- Dockerfile | 3 +-- build.json | 5 ----- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 204c1de..8554578 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,4 @@ -ARG BUILD_FROM -FROM $BUILD_FROM +FROM "ghostfolio/ghostfolio:2.65.0" ARG BUILD_ARCH ARG BASHIO_VERSION=0.16.2 diff --git a/build.json b/build.json index 6419726..36e9b0b 100644 --- a/build.json +++ b/build.json @@ -1,9 +1,4 @@ { - "build_from": { - "aarch64": "ghostfolio/ghostfolio:2.65.0", - "amd64": "ghostfolio/ghostfolio:2.65.0", - "armv7": "ghostfolio/ghostfolio:2.65.0" - }, "args": { "ghostfolio_version": "2.65.0" }, From 8c3fbe4c6f9d45b7324c329425fc69684be83d34 Mon Sep 17 00:00:00 2001 From: Colin Seymour Date: Sun, 31 Mar 2024 11:26:05 +0000 Subject: [PATCH 5/5] Fudge it to trick the info action --- build.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/build.json b/build.json index 36e9b0b..2b9fd5f 100644 --- a/build.json +++ b/build.json @@ -1,4 +1,9 @@ { + "build_from": { + "aarch64": "ghostfolio/ghostfolio:not-used", + "amd64": "ghostfolio/ghostfolio:not-used", + "armv7": "ghostfolio/ghostfolio:not-used" + }, "args": { "ghostfolio_version": "2.65.0" }, @@ -11,4 +16,4 @@ "codenotary": { "signer": "colin@symr.io" } -} +} \ No newline at end of file