From 8051fbc91554a3c983719bf676e1ab83cf89c535 Mon Sep 17 00:00:00 2001 From: tobasium Date: Fri, 15 May 2026 15:23:12 +0200 Subject: [PATCH 1/9] Update MEDIATHEK_VERSION to 14.5.0 Updated MediathekView version from 14.4.2 to 14.5.0 in Dockerfile. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 95a90e8..eac2ccc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM jlesage/baseimage-gui:debian-12-v4 ENV USER_ID=0 GROUP_ID=0 TERM=xterm -ENV MEDIATHEK_VERSION=14.4.2 +ENV MEDIATHEK_VERSION=14.5.0 # Refresh apt cache RUN apt-get update \ From cbbdef144e3da2d3c9ed8f59feb5bf51c4fec67d Mon Sep 17 00:00:00 2001 From: tobasium Date: Fri, 15 May 2026 16:15:44 +0200 Subject: [PATCH 2/9] Add GHCR Docker build workflow --- docker-ghcr.yml | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 docker-ghcr.yml diff --git a/docker-ghcr.yml b/docker-ghcr.yml new file mode 100644 index 0000000..3cbbefe --- /dev/null +++ b/docker-ghcr.yml @@ -0,0 +1,39 @@ +name: Build and publish Docker image + +on: + workflow_dispatch: + push: + branches: + - master + - main + +permissions: + contents: read + packages: write + +env: + IMAGE_NAME: docker-mediathekview-webinterface + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Login to GHCR + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Build and push image + uses: docker/build-push-action@v6 + with: + context: . + push: true + tags: | + ghcr.io/tobasium/docker-mediathekview-webinterface:latest + ghcr.io/tobasium/docker-mediathekview-webinterface:14.5.0 From 582d77724370892c6c39e4d446773d64e4e2b340 Mon Sep 17 00:00:00 2001 From: tobasium Date: Fri, 15 May 2026 16:18:56 +0200 Subject: [PATCH 3/9] Add GHCR Docker build workflow --- .github/workflows/docker-ghcr.yml | 39 +++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 .github/workflows/docker-ghcr.yml diff --git a/.github/workflows/docker-ghcr.yml b/.github/workflows/docker-ghcr.yml new file mode 100644 index 0000000..3cbbefe --- /dev/null +++ b/.github/workflows/docker-ghcr.yml @@ -0,0 +1,39 @@ +name: Build and publish Docker image + +on: + workflow_dispatch: + push: + branches: + - master + - main + +permissions: + contents: read + packages: write + +env: + IMAGE_NAME: docker-mediathekview-webinterface + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Login to GHCR + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Build and push image + uses: docker/build-push-action@v6 + with: + context: . + push: true + tags: | + ghcr.io/tobasium/docker-mediathekview-webinterface:latest + ghcr.io/tobasium/docker-mediathekview-webinterface:14.5.0 From 70d6b75e6b077aff196251d82ef5f6530a1a9016 Mon Sep 17 00:00:00 2001 From: tobasium Date: Fri, 15 May 2026 16:19:13 +0200 Subject: [PATCH 4/9] Delete docker-ghcr.yml --- docker-ghcr.yml | 39 --------------------------------------- 1 file changed, 39 deletions(-) delete mode 100644 docker-ghcr.yml diff --git a/docker-ghcr.yml b/docker-ghcr.yml deleted file mode 100644 index 3cbbefe..0000000 --- a/docker-ghcr.yml +++ /dev/null @@ -1,39 +0,0 @@ -name: Build and publish Docker image - -on: - workflow_dispatch: - push: - branches: - - master - - main - -permissions: - contents: read - packages: write - -env: - IMAGE_NAME: docker-mediathekview-webinterface - -jobs: - build: - runs-on: ubuntu-latest - - steps: - - name: Checkout repository - uses: actions/checkout@v4 - - - name: Login to GHCR - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Build and push image - uses: docker/build-push-action@v6 - with: - context: . - push: true - tags: | - ghcr.io/tobasium/docker-mediathekview-webinterface:latest - ghcr.io/tobasium/docker-mediathekview-webinterface:14.5.0 From 1758113639e5417c6bc0cb6185892a04e7f571a8 Mon Sep 17 00:00:00 2001 From: tobasium Date: Fri, 15 May 2026 16:26:14 +0200 Subject: [PATCH 5/9] Simplify Dockerfile by removing apt-get upgrade Removed the upgrade step from apt-get update. --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index eac2ccc..7e1d21e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,8 +6,7 @@ ENV USER_ID=0 GROUP_ID=0 TERM=xterm ENV MEDIATHEK_VERSION=14.5.0 # Refresh apt cache -RUN apt-get update \ - && apt-get upgrade -y +RUN apt-get update # Locale needed for storing files with umlaut RUN apt-get install -y apt-utils locales \ From 65b6255bebc20ebf4d498121b151d4295f20c844 Mon Sep 17 00:00:00 2001 From: tobasium Date: Fri, 15 May 2026 16:31:34 +0200 Subject: [PATCH 6/9] Refactor Dockerfile for improved readability and updates --- Dockerfile | 55 +++++++++++++++++++++++++++--------------------------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7e1d21e..dfcaa39 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,31 +1,31 @@ # Pull base image. FROM jlesage/baseimage-gui:debian-12-v4 -ENV USER_ID=0 GROUP_ID=0 TERM=xterm - -ENV MEDIATHEK_VERSION=14.5.0 - -# Refresh apt cache -RUN apt-get update - -# Locale needed for storing files with umlaut -RUN apt-get install -y apt-utils locales \ - && echo en_US.UTF-8 UTF-8 > /etc/locale.gen \ - && locale-gen - -ENV LC_ALL en_US.UTF-8 -ENV LANGUAGE en_US.UTF-8 -ENV LANG en_US.UTF-8 - -# Runtime deps -RUN apt-get install -y \ +ENV USER_ID=0 \ + GROUP_ID=0 \ + TERM=xterm + +ARG MEDIATHEK_VERSION=14.5.0 +ENV MEDIATHEK_VERSION=${MEDIATHEK_VERSION} + +# Locale and runtime dependencies. +RUN apt-get update \ + && apt-get install -y --no-install-recommends \ + apt-utils \ + locales \ wget \ - procps \ + procps \ vlc \ - flvstreamer \ ffmpeg \ + ca-certificates \ + && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \ + && locale-gen \ && rm -rf /var/lib/apt/lists/* +ENV LC_ALL=en_US.UTF-8 \ + LANGUAGE=en_US.UTF-8 \ + LANG=en_US.UTF-8 + # Maximize only the main/initial window. COPY src/main-window-selection.xml /etc/openbox/main-window-selection.xml @@ -41,16 +41,17 @@ VOLUME ["/output"] LABEL \ org.label-schema.name="mediathekview" \ org.label-schema.description="Docker container for Mediathekview" \ - org.label-schema.version=$MEDIATHEK_VERSION \ + org.label-schema.version="${MEDIATHEK_VERSION}" \ org.label-schema.vcs-url="https://github.com/conrad784/docker-mediathekview-webinterface" \ org.label-schema.schema-version="1.0" -# Define software download URLs. -ARG MEDIATHEKVIEW_URL=https://download.mediathekview.de/stabil/MediathekView-$MEDIATHEK_VERSION-linux.tar.gz +# Define software download URL. +ARG MEDIATHEKVIEW_URL=https://download.mediathekview.de/stabil/MediathekView-${MEDIATHEK_VERSION}-linux.tar.gz -# download Mediathekview -RUN mkdir -p /opt/MediathekView -RUN wget -q ${MEDIATHEKVIEW_URL} -O MediathekView.tar.gz -RUN tar xf MediathekView.tar.gz -C /opt +# Download MediathekView. +RUN mkdir -p /opt \ + && wget -q "${MEDIATHEKVIEW_URL}" -O /tmp/MediathekView.tar.gz \ + && tar xf /tmp/MediathekView.tar.gz -C /opt \ + && rm -f /tmp/MediathekView.tar.gz COPY src/startapp.sh /startapp.sh From 3f08f09df69db465550ea495f59219486755d73f Mon Sep 17 00:00:00 2001 From: tobasium Date: Fri, 15 May 2026 16:35:21 +0200 Subject: [PATCH 7/9] Fix noninteractive apt build and fontconfig setup --- Dockerfile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index dfcaa39..1b0d49f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,8 @@ FROM jlesage/baseimage-gui:debian-12-v4 ENV USER_ID=0 \ GROUP_ID=0 \ - TERM=xterm + TERM=xterm \ + DEBIAN_FRONTEND=noninteractive ARG MEDIATHEK_VERSION=14.5.0 ENV MEDIATHEK_VERSION=${MEDIATHEK_VERSION} @@ -12,15 +13,17 @@ ENV MEDIATHEK_VERSION=${MEDIATHEK_VERSION} RUN apt-get update \ && apt-get install -y --no-install-recommends \ apt-utils \ + ca-certificates \ + fontconfig \ locales \ wget \ procps \ vlc \ ffmpeg \ - ca-certificates \ && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \ && locale-gen \ - && rm -rf /var/lib/apt/lists/* + && fc-cache -f -v \ + && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* ENV LC_ALL=en_US.UTF-8 \ LANGUAGE=en_US.UTF-8 \ From fd18934c4d0e5983937f201d49775dd5247a2aaa Mon Sep 17 00:00:00 2001 From: tobasium Date: Fri, 15 May 2026 16:40:09 +0200 Subject: [PATCH 8/9] Refactor Dockerfile for improved clarity and structure --- Dockerfile | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1b0d49f..563537d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,30 +1,29 @@ # Pull base image. FROM jlesage/baseimage-gui:debian-12-v4 +# General environment. ENV USER_ID=0 \ GROUP_ID=0 \ TERM=xterm \ DEBIAN_FRONTEND=noninteractive +# MediathekView version. ARG MEDIATHEK_VERSION=14.5.0 ENV MEDIATHEK_VERSION=${MEDIATHEK_VERSION} -# Locale and runtime dependencies. +# Install runtime dependencies. RUN apt-get update \ && apt-get install -y --no-install-recommends \ - apt-utils \ ca-certificates \ - fontconfig \ locales \ wget \ procps \ - vlc \ ffmpeg \ && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \ && locale-gen \ - && fc-cache -f -v \ - && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* + && rm -rf /var/lib/apt/lists/* +# Locale settings. ENV LC_ALL=en_US.UTF-8 \ LANGUAGE=en_US.UTF-8 \ LANG=en_US.UTF-8 @@ -32,7 +31,7 @@ ENV LC_ALL=en_US.UTF-8 \ # Maximize only the main/initial window. COPY src/main-window-selection.xml /etc/openbox/main-window-selection.xml -# Set environment variables. +# Application settings. ENV APP_NAME="Mediathekview" \ S6_KILL_GRACETIME=8000 @@ -42,19 +41,20 @@ VOLUME ["/output"] # Metadata. LABEL \ - org.label-schema.name="mediathekview" \ - org.label-schema.description="Docker container for Mediathekview" \ - org.label-schema.version="${MEDIATHEK_VERSION}" \ - org.label-schema.vcs-url="https://github.com/conrad784/docker-mediathekview-webinterface" \ - org.label-schema.schema-version="1.0" + org.label-schema.name="mediathekview" \ + org.label-schema.description="Docker container for Mediathekview" \ + org.label-schema.version="${MEDIATHEK_VERSION}" \ + org.label-schema.vcs-url="https://github.com/conrad784/docker-mediathekview-webinterface" \ + org.label-schema.schema-version="1.0" -# Define software download URL. +# Download URL. ARG MEDIATHEKVIEW_URL=https://download.mediathekview.de/stabil/MediathekView-${MEDIATHEK_VERSION}-linux.tar.gz -# Download MediathekView. +# Download and extract MediathekView. RUN mkdir -p /opt \ && wget -q "${MEDIATHEKVIEW_URL}" -O /tmp/MediathekView.tar.gz \ && tar xf /tmp/MediathekView.tar.gz -C /opt \ && rm -f /tmp/MediathekView.tar.gz +# Startup script. COPY src/startapp.sh /startapp.sh From 700f9926dafecf176ae0daeb4694da0dce752d24 Mon Sep 17 00:00:00 2001 From: tobasium Date: Fri, 15 May 2026 16:48:20 +0200 Subject: [PATCH 9/9] revert Back --- Dockerfile | 71 ++++++++++++++++++++++++++---------------------------- 1 file changed, 34 insertions(+), 37 deletions(-) diff --git a/Dockerfile b/Dockerfile index 563537d..eac2ccc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,37 +1,36 @@ # Pull base image. FROM jlesage/baseimage-gui:debian-12-v4 -# General environment. -ENV USER_ID=0 \ - GROUP_ID=0 \ - TERM=xterm \ - DEBIAN_FRONTEND=noninteractive +ENV USER_ID=0 GROUP_ID=0 TERM=xterm -# MediathekView version. -ARG MEDIATHEK_VERSION=14.5.0 -ENV MEDIATHEK_VERSION=${MEDIATHEK_VERSION} +ENV MEDIATHEK_VERSION=14.5.0 -# Install runtime dependencies. +# Refresh apt cache RUN apt-get update \ - && apt-get install -y --no-install-recommends \ - ca-certificates \ - locales \ + && apt-get upgrade -y + +# Locale needed for storing files with umlaut +RUN apt-get install -y apt-utils locales \ + && echo en_US.UTF-8 UTF-8 > /etc/locale.gen \ + && locale-gen + +ENV LC_ALL en_US.UTF-8 +ENV LANGUAGE en_US.UTF-8 +ENV LANG en_US.UTF-8 + +# Runtime deps +RUN apt-get install -y \ wget \ - procps \ + procps \ + vlc \ + flvstreamer \ ffmpeg \ - && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \ - && locale-gen \ && rm -rf /var/lib/apt/lists/* -# Locale settings. -ENV LC_ALL=en_US.UTF-8 \ - LANGUAGE=en_US.UTF-8 \ - LANG=en_US.UTF-8 - # Maximize only the main/initial window. COPY src/main-window-selection.xml /etc/openbox/main-window-selection.xml -# Application settings. +# Set environment variables. ENV APP_NAME="Mediathekview" \ S6_KILL_GRACETIME=8000 @@ -41,20 +40,18 @@ VOLUME ["/output"] # Metadata. LABEL \ - org.label-schema.name="mediathekview" \ - org.label-schema.description="Docker container for Mediathekview" \ - org.label-schema.version="${MEDIATHEK_VERSION}" \ - org.label-schema.vcs-url="https://github.com/conrad784/docker-mediathekview-webinterface" \ - org.label-schema.schema-version="1.0" - -# Download URL. -ARG MEDIATHEKVIEW_URL=https://download.mediathekview.de/stabil/MediathekView-${MEDIATHEK_VERSION}-linux.tar.gz - -# Download and extract MediathekView. -RUN mkdir -p /opt \ - && wget -q "${MEDIATHEKVIEW_URL}" -O /tmp/MediathekView.tar.gz \ - && tar xf /tmp/MediathekView.tar.gz -C /opt \ - && rm -f /tmp/MediathekView.tar.gz - -# Startup script. + org.label-schema.name="mediathekview" \ + org.label-schema.description="Docker container for Mediathekview" \ + org.label-schema.version=$MEDIATHEK_VERSION \ + org.label-schema.vcs-url="https://github.com/conrad784/docker-mediathekview-webinterface" \ + org.label-schema.schema-version="1.0" + +# Define software download URLs. +ARG MEDIATHEKVIEW_URL=https://download.mediathekview.de/stabil/MediathekView-$MEDIATHEK_VERSION-linux.tar.gz + +# download Mediathekview +RUN mkdir -p /opt/MediathekView +RUN wget -q ${MEDIATHEKVIEW_URL} -O MediathekView.tar.gz +RUN tar xf MediathekView.tar.gz -C /opt + COPY src/startapp.sh /startapp.sh