Rebase to Ubuntu Noble

Dockerfile

@@ -1,145 +1,8 @@
 # syntax=docker/dockerfile:1
 
-############## picons stage ##############
-# built by https://github.com/linuxserver/picons-builder
-FROM ghcr.io/linuxserver/picons-builder as piconsstage
+FROM ghcr.io/linuxserver/baseimage-alpine:edge AS extractstage
 
-
-FROM ghcr.io/linuxserver/baseimage-alpine:3.20 as buildstage
-############## build stage ##############
-
-# package versions
-ARG ARGTABLE_VER="2.13"
-
-# environment settings
-ARG TZ="Etc/UTC"
-ARG TVHEADEND_COMMIT
-ENV HOME="/config"
-
-# copy patches and picons
-COPY patches/ /tmp/patches/
-COPY --from=piconsstage /picons.tar.bz2 /picons.tar.bz2
-
-RUN \
-  echo "**** install build packages ****" && \
-  apk add --no-cache \
-    autoconf \
-    automake \
-    bsd-compat-headers \
-    build-base \
-    cmake \
-    ffmpeg4-dev \
-    file \
-    findutils \
-    gettext-dev \
-    git \
-    gnu-libiconv-dev \
-    libdvbcsa-dev \
-    libgcrypt-dev \
-    libhdhomerun-dev \
-    libtool \
-    libva-dev \
-    libvpx-dev \
-    libxml2-dev \
-    libxslt-dev \
-    linux-headers \
-    openssl-dev \
-    opus-dev \
-    patch \
-    pcre2-dev \
-    pkgconf \
-    pngquant \
-    python3 \
-    sdl2-dev \
-    uriparser-dev \
-    x264-dev \
-    x265-dev \
-    zlib-dev
-
-RUN \
-  echo "**** remove musl iconv.h and replace with gnu-iconv.h ****" && \
-  rm -rf /usr/include/iconv.h && \
-  cp /usr/include/gnu-libiconv/iconv.h /usr/include/iconv.h
-
-RUN \
-  echo "**** compile tvheadend ****" && \
-  if [ -z ${TVHEADEND_COMMIT+x} ]; then \
-    TVHEADEND_COMMIT=$(curl -sX GET https://api.github.com/repos/tvheadend/tvheadend/commits/master \
-    | jq -r '. | .sha'); \
-  fi && \
-  mkdir -p \
-    /tmp/tvheadend && \
-  git clone https://github.com/tvheadend/tvheadend.git /tmp/tvheadend && \
-  cd /tmp/tvheadend && \
-  git checkout ${TVHEADEND_COMMIT} && \
-  ./configure \
-    `#Encoding` \
-    --disable-ffmpeg_static \
-    --disable-libfdkaac_static \
-    --disable-libtheora_static \
-    --disable-libopus_static \
-    --disable-libvorbis_static \
-    --disable-libvpx_static \
-    --disable-libx264_static \
-    --disable-libx265_static \
-    --disable-libfdkaac \
-    --enable-libopus \
-    --enable-libvorbis \
-    --enable-libvpx \
-    --enable-libx264 \
-    --enable-libx265 \
-    \
-    `#Options` \
-    --disable-avahi \
-    --disable-dbus_1 \
-    --disable-bintray_cache \
-    --disable-execinfo \
-    --disable-hdhomerun_static \
-    --enable-hdhomerun_client \
-    --enable-libav \
-    --enable-pngquant \
-    --enable-trace \
-    --enable-vaapi \
-    --infodir=/usr/share/info \
-    --localstatedir=/var \
-    --mandir=/usr/share/man \
-    --prefix=/usr \
-    --python=python3 \
-    --sysconfdir=/config && \
-  make -j 2 && \
-  make DESTDIR=/tmp/tvheadend-build install
-
-RUN \
-  echo "**** compile argtable2 ****" && \
-  ARGTABLE_VER1="${ARGTABLE_VER//./-}" && \
-  mkdir -p \
-    /tmp/argtable && \
-  curl -s -o \
-  /tmp/argtable-src.tar.gz -L \
-    "https://sourceforge.net/projects/argtable/files/argtable/argtable-${ARGTABLE_VER}/argtable${ARGTABLE_VER1}.tar.gz" && \
-  tar xf \
-  /tmp/argtable-src.tar.gz -C \
-    /tmp/argtable --strip-components=1 && \
-  cp /tmp/patches/config.* /tmp/argtable && \
-  cd /tmp/argtable && \
-  ./configure \
-    --prefix=/usr && \
-  make -j 2 && \
-  make check && \
-  make DESTDIR=/tmp/argtable-build install && \
-  echo "**** copy to /usr for comskip dependency ****" && \
-  cp -pr /tmp/argtable-build/usr/* /usr/
-
-RUN \
-  echo "***** compile comskip ****" && \
-  git clone https://github.com/erikkaashoek/Comskip /tmp/comskip && \
-  cd /tmp/comskip && \
-  ./autogen.sh && \
-  ./configure \
-    --bindir=/usr/bin \
-    --sysconfdir=/config/comskip && \
-  make -j 2 && \
-  make DESTDIR=/tmp/comskip-build install
+COPY --from=ghcr.io/linuxserver/picons-builder /picons.tar.bz2 /picons.tar.bz2
 
 RUN \
   echo "***** extract picons ****" && \
@@ -148,8 +11,7 @@ RUN \
     /picons.tar.bz2 -C \
     /picons
 
-############## runtime stage ##############
-FROM ghcr.io/linuxserver/baseimage-alpine:3.20
+FROM ghcr.io/linuxserver/baseimage-ubuntu:noble
 
 # set version label
 ARG BUILD_DATE
@@ -158,52 +20,43 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
 LABEL maintainer="saarg"
 
 # environment settings
-ENV HOME="/config"
+ENV HOME="/config" \
+  ATTACHED_DEVICES_PERMS="/dev/dvb /dev/dri -type c"
 
 RUN \
   echo "**** install runtime packages ****" && \
-  apk add --no-cache \
-    bsd-compat-headers \
+  curl -1sLf 'https://dl.cloudsmith.io/public/tvheadend/tvheadend/gpg.C6CC06BD69B430C6.key' |  gpg --dearmor >> /usr/share/keyrings/tvheadend-tvheadend-archive-keyring.gpg && \
+  curl -1sLf 'https://dl.cloudsmith.io/public/tvheadend/tvheadend/config.deb.txt?distro=ubuntu&codename=noble&component=main' > /etc/apt/sources.list.d/tvheadend-tvheadend.list && \
+  chmod 644 /usr/share/keyrings/tvheadend-tvheadend-archive-keyring.gpg && \
+  chmod 644 /etc/apt/sources.list.d/tvheadend-tvheadend.list && \
+  apt-get update && \
+  apt-get install -y \
+    comskip \
     ffmpeg \
-    ffmpeg4-libavcodec \
-    ffmpeg4-libavdevice \
-    ffmpeg4-libavfilter \
-    ffmpeg4-libavformat \
-    ffmpeg4-libavutil \
-    ffmpeg4-libpostproc \
-    ffmpeg4-libswresample \
-    ffmpeg4-libswscale \
-    gnu-libiconv \
-    libdvbcsa \
-    libhdhomerun-libs \
-    libva \
-    libva-intel-driver \
-    intel-media-driver \
-    libvpx \
+    libdvbcsa1 \
+    libhdhomerun5 \
+    libva2 \
+    intel-media-va-driver \
+    libvpx9 \
     libxml2 \
-    libxslt \
-    linux-headers \
-    mesa-va-gallium \
-    opus \
-    pcre2 \
+    libxslt1.1 \
+    mesa-va-drivers \
+    libopus0 \
+    libpcre2-32-0 \
     perl \
-    perl-datetime-format-strptime \
-    perl-json \
-    perl-json-xs \
-    py3-requests \
+    python3-requests \
     python3 \
-    uriparser \
-    x264 \
-    x265 \
-    xmltv \
-    zlib && \
-  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version
+    tvheadend \
+    liburiparser1 \
+    libx264-164 \
+    libx265-199 \
+    xmltv && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
+  rm -rf \
+    /var/lib/apt/lists
 
 # copy local files and buildstage artifacts
-COPY --from=buildstage /tmp/argtable-build/usr/ /usr/
-COPY --from=buildstage /tmp/comskip-build/usr/ /usr/
-COPY --from=buildstage /tmp/tvheadend-build/usr/ /usr/
-COPY --from=buildstage /picons /picons
+COPY --from=extractstage /picons /picons
 COPY root/ /
 
 # ports and volumes