issue 2019: fix entrypoint, remove transcoding support (ffmpeg)

diff --git a/Containerfile.alpine b/Containerfile.alpine
index 997589fc806f66bac183fee101e685e14c461756..9a245169201157e81b7b99d87724f71ecb9208e6 100644 (file)
--- a/Containerfile.alpine
+++ b/Containerfile.alpine
@@ -19,25 +19,19 @@ RUN apk add --no-cache \
         'cmake' \
         'coreutils' \
         'dbus-dev' \
-        'ffmpeg-dev' \
         'findutils' \
         'gettext-dev' \
         'git' \
         'gnu-libiconv-dev' \
         'libdvbcsa-dev' \
         'libhdhomerun-dev' \
-        'libva-dev' \
-        'libvpx-dev' \
         'linux-headers' \
         'musl-dev' \
         'openssl-dev>3' \
-        'opus-dev' \
         'pngquant' \
         'python3' \
         'uriparser-dev' \
         'wget' \
-        'x264-dev' \
-        'x265-dev' \
         'zlib-dev' \
     && \
     git config --global --add safe.directory '/src/data/dvb-scan' && \
@@ -55,14 +49,17 @@ RUN apk add --no-cache \
                 --disable-libvpx_static \
                 --disable-libx264_static \
                 --disable-libx265_static \
+                --disable-libvpx_static \
+                --disable-libtheora_static \
+                --disable-libvorbis_static \
+                --disable-libfdkaac_static \
+                --disable-libopus_static \
                 --enable-bundle \
                 --enable-dvbcsa \
                 --enable-hdhomerun_client \
                 --enable-kqueue \
-                --enable-libav \
-                --enable-nvenc \
+                --disable-libav \
                 --enable-pngquant \
-                --enable-qsv \
                 --python=python3 \
         && \
         make DESTDIR='/tvheadend' -j$(($(nproc) - 1)) install
@@ -79,15 +76,6 @@ RUN apk add --no-cache \
         'avahi' \
         'bzip2' \
         'dbus-libs' \
-        'ffmpeg' \
-        'ffmpeg-libavcodec' \
-        'ffmpeg-libavdevice' \
-        'ffmpeg-libavfilter' \
-        'ffmpeg-libavformat' \
-        'ffmpeg-libavutil' \
-        'ffmpeg-libpostproc' \
-        'ffmpeg-libswresample' \
-        'ffmpeg-libswscale' \
         'gnu-libiconv-libs' \
         'libcrypto3' \
         'libdvbcsa' \
@@ -97,13 +85,11 @@ RUN apk add --no-cache \
         'libva' \
         'libvpx' \
         'mesa' \
-        'opus' \
         'perl-http-entity-parser' \
         'pngquant' \
+        'pcre2' \
         'python3' \
         'tini' \
-        'x264-libs' \
-        'x265-libs' \
         'xmltv' \
         'zlib' \
     && \
@@ -128,4 +114,4 @@ VOLUME /var/lib/tvheadend/recordings
 WORKDIR /var/lib/tvheadend/
 USER tvheadend
 
-ENTRYPOINT [ "/sbin/tini-static", "--", "/init" ]
+ENTRYPOINT [ "/sbin/tini", "--", "/init" ]

diff --git a/README.Docker.md b/README.Docker.md
index 28bc20d500bf32fcd2cf5bf2d9fdab2a6d44675b..fe0d82c07a8cff6db57d0670872bf2a763b1b313 100644 (file)
--- a/README.Docker.md
+++ b/README.Docker.md
@@ -16,7 +16,7 @@ $ git clone https://github.com/tvheadend/tvheadend
 Then, from within the repository
 
 ```sh
-docker image build
+docker buildx build
     --rm \
     --tag 'tvheadend:issue-123' \
     './'