Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Develop #376

Merged
merged 3 commits into from
Jun 3, 2024
Merged

Develop #376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c43cdd
HandBrake still requires FfMpeg6
ptr727 Jun 3, 2024
c3c766b
Merge branch 'develop' of https://github.com/ptr727/PlexCleaner into …
ptr727 Jun 3, 2024
719141e
Merge branch 'main' into develop
ptr727 Jun 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Docker/Debian.Stable.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions Docker/Debian.Testing.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions Docker/Ubuntu.Devel.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions Docker/Ubuntu.Rolling.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 7 additions & 1 deletion Docker/Ubuntu.Savoury.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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 \
Expand Down