From 0c43cdd5a2255432d615035fd3f37e85f0936647 Mon Sep 17 00:00:00 2001 From: Pieter Viljoen Date: Mon, 3 Jun 2024 13:29:28 -0700 Subject: [PATCH] HandBrake still requires FfMpeg6 --- Docker/Debian.Stable.Dockerfile | 3 +++ Docker/Debian.Testing.Dockerfile | 3 +++ Docker/Ubuntu.Devel.Dockerfile | 3 +++ Docker/Ubuntu.Rolling.Dockerfile | 3 +++ Docker/Ubuntu.Savoury.Dockerfile | 8 +++++++- 5 files changed, 19 insertions(+), 1 deletion(-) diff --git a/Docker/Debian.Stable.Dockerfile b/Docker/Debian.Stable.Dockerfile index ee06dd40..3f9fa4bd 100644 --- a/Docker/Debian.Stable.Dockerfile +++ b/Docker/Debian.Stable.Dockerfile @@ -41,6 +41,9 @@ ARG BUILD_CONFIGURATION="Debug" \ BUILD_INFORMATION_VERSION="1.0.0.0" \ BUILD_PACKAGE_VERSION="1.0.0.0" +# Prevent EULA and confirmation prompts in installers +ENV DEBIAN_FRONTEND=noninteractive + # Upgrade RUN apt-get update \ && apt-get upgrade -y diff --git a/Docker/Debian.Testing.Dockerfile b/Docker/Debian.Testing.Dockerfile index 85c68a9b..1fef8192 100644 --- a/Docker/Debian.Testing.Dockerfile +++ b/Docker/Debian.Testing.Dockerfile @@ -41,6 +41,9 @@ ARG BUILD_CONFIGURATION="Debug" \ BUILD_INFORMATION_VERSION="1.0.0.0" \ BUILD_PACKAGE_VERSION="1.0.0.0" +# Prevent EULA and confirmation prompts in installers +ENV DEBIAN_FRONTEND=noninteractive + # Upgrade RUN apt-get update \ && apt-get upgrade -y diff --git a/Docker/Ubuntu.Devel.Dockerfile b/Docker/Ubuntu.Devel.Dockerfile index 69a88ffc..c80b5fe0 100644 --- a/Docker/Ubuntu.Devel.Dockerfile +++ b/Docker/Ubuntu.Devel.Dockerfile @@ -41,6 +41,9 @@ ARG BUILD_CONFIGURATION="Debug" \ BUILD_INFORMATION_VERSION="1.0.0.0" \ BUILD_PACKAGE_VERSION="1.0.0.0" +# Prevent EULA and confirmation prompts in installers +ENV DEBIAN_FRONTEND=noninteractive + # Upgrade RUN apt-get update \ && apt-get upgrade -y diff --git a/Docker/Ubuntu.Rolling.Dockerfile b/Docker/Ubuntu.Rolling.Dockerfile index 2fdf9fe6..961dab70 100644 --- a/Docker/Ubuntu.Rolling.Dockerfile +++ b/Docker/Ubuntu.Rolling.Dockerfile @@ -41,6 +41,9 @@ ARG BUILD_CONFIGURATION="Debug" \ BUILD_INFORMATION_VERSION="1.0.0.0" \ BUILD_PACKAGE_VERSION="1.0.0.0" +# Prevent EULA and confirmation prompts in installers +ENV DEBIAN_FRONTEND=noninteractive + # Upgrade RUN apt-get update \ && apt-get upgrade -y diff --git a/Docker/Ubuntu.Savoury.Dockerfile b/Docker/Ubuntu.Savoury.Dockerfile index 8dcb6fbf..09c1738d 100644 --- a/Docker/Ubuntu.Savoury.Dockerfile +++ b/Docker/Ubuntu.Savoury.Dockerfile @@ -41,6 +41,9 @@ ARG BUILD_CONFIGURATION="Debug" \ BUILD_INFORMATION_VERSION="1.0.0.0" \ BUILD_PACKAGE_VERSION="1.0.0.0" +# Prevent EULA and confirmation prompts in installers +ENV DEBIAN_FRONTEND=noninteractive + # Upgrade RUN apt-get update \ && apt-get upgrade -y @@ -126,7 +129,7 @@ RUN wget -O /usr/share/keyrings/gpg-pub-moritzbunkus.gpg https://mkvtoolnix.down # Install FfMpeg and HandBrake from Rob Savoury's private PPA # https://launchpad.net/~savoury1 # https://launchpad.net/~/+archivesubscriptions -# https://launchpad.net/~savoury1/+archive/ubuntu/ffmpeg6 +# https://launchpad.net/~savoury1/+archive/ubuntu/ffmpeg7 # https://launchpad.net/~savoury1/+archive/ubuntu/handbrake # Use docker secrets and link the secret file to the filesystem auth.conf @@ -143,7 +146,10 @@ RUN --mount=type=secret,id=SAVOURY_PPA_AUTH ln -s /run/secrets/SAVOURY_PPA_AUTH && sh -c 'echo "deb https://private-ppa.launchpadcontent.net/savoury1/ffmpeg/ubuntu $(lsb_release -sc) main" >> /etc/apt/sources.list.d/savoury.list' \ && add-apt-repository -y ppa:savoury1/graphics \ && add-apt-repository -y ppa:savoury1/multimedia \ + # FfMpeg 6 and 7 requires FfMpeg 4 && add-apt-repository -y ppa:savoury1/ffmpeg4 \ + # HandBrake requires FfMpeg 6 + && add-apt-repository -y ppa:savoury1/ffmpeg6 \ && add-apt-repository -y ppa:savoury1/ffmpeg7 \ && add-apt-repository -y ppa:savoury1/handbrake \ && apt-get update \