From 69a4fc91355cead5352f7d71d7926ad4895c184e Mon Sep 17 00:00:00 2001 From: Kjeld Schouten Date: Wed, 6 May 2026 22:19:02 +0200 Subject: [PATCH 1/5] chore(tvheadend): move from porting/ to apps/ --- {porting => apps}/tvheadend/Dockerfile | 0 {porting => apps}/tvheadend/container-test.yaml | 0 {porting => apps}/tvheadend/docker-bake.hcl | 0 {porting => apps}/tvheadend/patches/config.guess | 0 {porting => apps}/tvheadend/patches/config.sub | 0 .../tvheadend/root/defaults/7a5edfbe189851e5b1d1df19c93962f0 | 0 {porting => apps}/tvheadend/root/defaults/comskip.ini.org | 0 {porting => apps}/tvheadend/root/defaults/config | 0 {porting => apps}/tvheadend/root/usr/bin/tv_grab_file | 0 {porting => apps}/tvheadend/root/usr/bin/tv_grab_url | 0 {porting => apps}/tvheadend/root/usr/bin/tv_grab_wg | 0 {porting => apps}/tvheadend/settings.yaml | 0 {porting => apps}/tvheadend/start.sh | 0 13 files changed, 0 insertions(+), 0 deletions(-) rename {porting => apps}/tvheadend/Dockerfile (100%) rename {porting => apps}/tvheadend/container-test.yaml (100%) rename {porting => apps}/tvheadend/docker-bake.hcl (100%) rename {porting => apps}/tvheadend/patches/config.guess (100%) rename {porting => apps}/tvheadend/patches/config.sub (100%) rename {porting => apps}/tvheadend/root/defaults/7a5edfbe189851e5b1d1df19c93962f0 (100%) rename {porting => apps}/tvheadend/root/defaults/comskip.ini.org (100%) rename {porting => apps}/tvheadend/root/defaults/config (100%) rename {porting => apps}/tvheadend/root/usr/bin/tv_grab_file (100%) rename {porting => apps}/tvheadend/root/usr/bin/tv_grab_url (100%) rename {porting => apps}/tvheadend/root/usr/bin/tv_grab_wg (100%) rename {porting => apps}/tvheadend/settings.yaml (100%) rename {porting => apps}/tvheadend/start.sh (100%) diff --git a/porting/tvheadend/Dockerfile b/apps/tvheadend/Dockerfile similarity index 100% rename from porting/tvheadend/Dockerfile rename to apps/tvheadend/Dockerfile diff --git a/porting/tvheadend/container-test.yaml b/apps/tvheadend/container-test.yaml similarity index 100% rename from porting/tvheadend/container-test.yaml rename to apps/tvheadend/container-test.yaml diff --git a/porting/tvheadend/docker-bake.hcl b/apps/tvheadend/docker-bake.hcl similarity index 100% rename from porting/tvheadend/docker-bake.hcl rename to apps/tvheadend/docker-bake.hcl diff --git a/porting/tvheadend/patches/config.guess b/apps/tvheadend/patches/config.guess similarity index 100% rename from porting/tvheadend/patches/config.guess rename to apps/tvheadend/patches/config.guess diff --git a/porting/tvheadend/patches/config.sub b/apps/tvheadend/patches/config.sub similarity index 100% rename from porting/tvheadend/patches/config.sub rename to apps/tvheadend/patches/config.sub diff --git a/porting/tvheadend/root/defaults/7a5edfbe189851e5b1d1df19c93962f0 b/apps/tvheadend/root/defaults/7a5edfbe189851e5b1d1df19c93962f0 similarity index 100% rename from porting/tvheadend/root/defaults/7a5edfbe189851e5b1d1df19c93962f0 rename to apps/tvheadend/root/defaults/7a5edfbe189851e5b1d1df19c93962f0 diff --git a/porting/tvheadend/root/defaults/comskip.ini.org b/apps/tvheadend/root/defaults/comskip.ini.org similarity index 100% rename from porting/tvheadend/root/defaults/comskip.ini.org rename to apps/tvheadend/root/defaults/comskip.ini.org diff --git a/porting/tvheadend/root/defaults/config b/apps/tvheadend/root/defaults/config similarity index 100% rename from porting/tvheadend/root/defaults/config rename to apps/tvheadend/root/defaults/config diff --git a/porting/tvheadend/root/usr/bin/tv_grab_file b/apps/tvheadend/root/usr/bin/tv_grab_file similarity index 100% rename from porting/tvheadend/root/usr/bin/tv_grab_file rename to apps/tvheadend/root/usr/bin/tv_grab_file diff --git a/porting/tvheadend/root/usr/bin/tv_grab_url b/apps/tvheadend/root/usr/bin/tv_grab_url similarity index 100% rename from porting/tvheadend/root/usr/bin/tv_grab_url rename to apps/tvheadend/root/usr/bin/tv_grab_url diff --git a/porting/tvheadend/root/usr/bin/tv_grab_wg b/apps/tvheadend/root/usr/bin/tv_grab_wg similarity index 100% rename from porting/tvheadend/root/usr/bin/tv_grab_wg rename to apps/tvheadend/root/usr/bin/tv_grab_wg diff --git a/porting/tvheadend/settings.yaml b/apps/tvheadend/settings.yaml similarity index 100% rename from porting/tvheadend/settings.yaml rename to apps/tvheadend/settings.yaml diff --git a/porting/tvheadend/start.sh b/apps/tvheadend/start.sh similarity index 100% rename from porting/tvheadend/start.sh rename to apps/tvheadend/start.sh From 5f6f210ecfe7c6f38a1b4f75a29350e8b6204fd8 Mon Sep 17 00:00:00 2001 From: Kjeld Schouten Date: Thu, 7 May 2026 09:52:40 +0200 Subject: [PATCH 2/5] Update Python base image to version 3.14.4 Signed-off-by: Kjeld Schouten --- apps/tvheadend/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/tvheadend/Dockerfile b/apps/tvheadend/Dockerfile index 476335cf1..b1f83f6e7 100644 --- a/apps/tvheadend/Dockerfile +++ b/apps/tvheadend/Dockerfile @@ -1,6 +1,6 @@ ############## picons stage ############## # built by https://github.com/linuxserver/picons-builder -FROM ghcr.io/trueforge-org/python:3.13.12 AS piconsstage +FROM ghcr.io/trueforge-org/python:3.14.4 AS piconsstage USER root RUN tar czf /picons.tar.bz2 -T /dev/null From 2c878baa8c08a0ad25132fd3a1c0b7e4a21d885d Mon Sep 17 00:00:00 2001 From: "anthropic-code-agent[bot]" <242468646+Claude@users.noreply.github.com> Date: Thu, 7 May 2026 10:07:24 +0000 Subject: [PATCH 3/5] fix(ci): use app-specific docker-bake.hcl path in workflow The app-builder workflow was referencing ./docker-bake.hcl from the repository root, but each app has its own docker-bake.hcl in apps//. This caused the build to fail with "patches: not found" because the context wasn't set correctly. Changed the workflow to reference ./apps/${{ inputs.app }}/docker-bake.hcl which correctly resolves the docker-bake.hcl file for each app and sets the proper build context. Agent-Logs-Url: https://github.com/trueforge-org/containerforge/sessions/7b3e701f-21aa-4e1a-bad2-1fbe3dc1ff40 Co-authored-by: Crow-Control <7613738+Crow-Control@users.noreply.github.com> --- .github/workflows/app-builder.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/app-builder.yaml b/.github/workflows/app-builder.yaml index 344aa415e..e929e05d9 100644 --- a/.github/workflows/app-builder.yaml +++ b/.github/workflows/app-builder.yaml @@ -141,7 +141,7 @@ jobs: id: bake with: files: | - ./docker-bake.hcl + ./apps/${{ inputs.app }}/docker-bake.hcl cwd://${{ runner.temp }}/docker-metadata-action-bake.json set: | *.args.VENDOR="TrueForge" From e568eb7858f94ebef206d024b68e4455dc9bec6a Mon Sep 17 00:00:00 2001 From: "anthropic-code-agent[bot]" <242468646+Claude@users.noreply.github.com> Date: Thu, 7 May 2026 10:09:35 +0000 Subject: [PATCH 4/5] trigger build Co-authored-by: Crow-Control <7613738+Crow-Control@users.noreply.github.com> --- apps/tvheadend/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 apps/tvheadend/.gitkeep diff --git a/apps/tvheadend/.gitkeep b/apps/tvheadend/.gitkeep new file mode 100644 index 000000000..e69de29bb From 6267e92b4fd5eff25081b9cba24d2f3bad8bff38 Mon Sep 17 00:00:00 2001 From: "anthropic-code-agent[bot]" <242468646+Claude@users.noreply.github.com> Date: Thu, 7 May 2026 10:11:58 +0000 Subject: [PATCH 5/5] chore: remove .gitkeep Co-authored-by: Crow-Control <7613738+Crow-Control@users.noreply.github.com> --- apps/tvheadend/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 apps/tvheadend/.gitkeep diff --git a/apps/tvheadend/.gitkeep b/apps/tvheadend/.gitkeep deleted file mode 100644 index e69de29bb..000000000