From 30c361db49c8f6c6f1b55f24fb24770ea9c0b31d Mon Sep 17 00:00:00 2001
From: Jason Dove <1695733+jasongdove@users.noreply.github.com>
Date: Sat, 18 Apr 2026 16:29:36 -0500
Subject: [PATCH] only bundle the ersatztv-channel binary (#2851)

---
 .github/workflows/artifacts.yml | 11 ++++++-----
 .github/workflows/docker.yml    |  7 ++++---
 docker/Dockerfile               |  2 +-
 docker/arm32v7/Dockerfile       |  2 +-
 docker/arm64/Dockerfile         |  2 +-
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/artifacts.yml b/.github/workflows/artifacts.yml
index 5664b75ea..cfda3d4e7 100644
--- a/.github/workflows/artifacts.yml
+++ b/.github/workflows/artifacts.yml
@@ -195,9 +195,10 @@ jobs:
 
           # download next artifacts
           gh release download develop --repo ErsatzTV/next --pattern "ersatztv-next-*-${{ matrix.target }}.tar.gz" --dir next-download
-          mkdir -p "$release_name/next"
-          tar xzvf next-download/*.tar.gz -C "$release_name/next" --strip-components 1
-          rm -rf next-download
+          mkdir next-extracted
+          tar xzvf next-download/*.tar.gz -C next-extracted --strip-components 1
+          mv next-extracted/ersatztv-channel "$release_name/"
+          rm -rf next-download next-extracted
 
           tar czvf "${release_name}.tar.gz" "$release_name"
 
@@ -318,9 +319,8 @@ jobs:
 
           # download next artifacts
           gh release download develop --repo ErsatzTV/next --pattern "ersatztv-next-*-windows-x64.zip" --dir next-download
-          mkdir -p "$release_name/next"
           7z x next-download/*.zip -onext-extracted
-          mv next-extracted/ersatztv-next-*/ersatztv*.exe "$release_name/next/"
+          mv next-extracted/ersatztv-next-*/ersatztv-channel.exe "$release_name/"
           rm -rf next-download next-extracted
 
           7z e "ffmpeg/${{ steps.downloadffmpeg.outputs.filename }}" -o"$release_name" '*.exe' -r
@@ -341,3 +341,4 @@ jobs:
         env:
           GH_TOKEN: ${{ github.token }}
         run: gh release upload ${{ inputs.release_tag }} "${{ env.RELEASE_NAME }}.zip" --repo ${{ github.repository }}
+ease upload ${{ inputs.release_tag }} "${{ env.RELEASE_NAME }}.zip" --repo ${{ github.repository }}
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index e8e7328a8..425fda62d 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -59,9 +59,10 @@ jobs:
             arm64) TARGET="linux-arm64" ;;
           esac
           gh release download develop --repo ErsatzTV/next --pattern "ersatztv-next-*-${TARGET}.tar.gz" --dir next-download
-          mkdir -p next
-          tar xzvf next-download/*.tar.gz -C next --strip-components 1
-          rm -rf next-download
+          mkdir next-extracted
+          tar xzvf next-download/*.tar.gz -C next-extracted --strip-components 1
+          mv next-extracted/ersatztv-channel .
+          rm -rf next-download next-extracted
 
       - name: Set up QEMU
         if: ${{ matrix.name == 'arm32v7' }}
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 2bbb765d4..95193093a 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -60,7 +60,7 @@ ENV FONTCONFIG_PATH=/etc/fonts
 RUN fc-cache update
 WORKDIR /app
 COPY --from=build /app ./
-COPY next/ ./next/
+COPY ersatztv-channel ./
 ENV PYTHONPATH=/app/pythonlibs
 ENV ETV_CONFIG_FOLDER=/config
 ENV ETV_TRANSCODE_FOLDER=/transcode
diff --git a/docker/arm32v7/Dockerfile b/docker/arm32v7/Dockerfile
index 64807b43a..88564ec19 100644
--- a/docker/arm32v7/Dockerfile
+++ b/docker/arm32v7/Dockerfile
@@ -46,7 +46,7 @@ ENV FONTCONFIG_PATH=/etc/fonts
 RUN fc-cache update
 WORKDIR /app
 COPY --from=build /app ./
-COPY next/ ./next/
+COPY ersatztv-channel ./
 ENV ETV_CONFIG_FOLDER=/config
 ENV ETV_TRANSCODE_FOLDER=/transcode
 ENTRYPOINT ["./ErsatzTV"]
diff --git a/docker/arm64/Dockerfile b/docker/arm64/Dockerfile
index d8357c258..1e70b4d8a 100644
--- a/docker/arm64/Dockerfile
+++ b/docker/arm64/Dockerfile
@@ -46,7 +46,7 @@ ENV FONTCONFIG_PATH=/etc/fonts
 RUN fc-cache update
 WORKDIR /app
 COPY --from=build /app ./
-COPY next/ ./next/
+COPY ersatztv-channel ./
 ENV ETV_CONFIG_FOLDER=/config
 ENV ETV_TRANSCODE_FOLDER=/transcode
 ENTRYPOINT ["./ErsatzTV"]