Remove Savoury builds

ptr727 · Jan 27, 2025 · 5876122 · 5876122
1 parent ba11308
commit 5876122
Show file tree

Hide file tree

Showing 10 changed files with 147 additions and 147 deletions.
diff --git a/.github/workflows/BuildDockerPush.yml b/.github/workflows/BuildDockerPush.yml
@@ -75,42 +75,30 @@ jobs:
           - file: ./Docker/Debian.Stable.Dockerfile
             platforms: linux/amd64,linux/arm64,linux/arm/v7
             cache-scope: debian
-            secrets: SAVOURY_PPA_AUTH
             tags: |
               docker.io/ptr727/plexcleaner:${{ endsWith(github.ref, 'refs/heads/main') && 'debian' || 'debian-develop' }}
 
           - file: ./Docker/Debian.Testing.Dockerfile
             platforms: linux/amd64,linux/arm64,linux/arm/v7
             cache-scope: debian-testing
-            secrets: SAVOURY_PPA_AUTH
             tags: |
               docker.io/ptr727/plexcleaner:${{ endsWith(github.ref, 'refs/heads/main') && 'debian-testing' || 'debian-testing-develop' }}
 
           - file: ./Docker/Alpine.Stable.Dockerfile
             platforms: linux/amd64,linux/arm64
             cache-scope: alpine
-            secrets: SAVOURY_PPA_AUTH
             tags: |
               docker.io/ptr727/plexcleaner:${{ endsWith(github.ref, 'refs/heads/main') && 'alpine' || 'alpine-develop' }}
 
           - file: ./Docker/Alpine.Edge.Dockerfile
             platforms: linux/amd64,linux/arm64
             cache-scope: alpine-edge
-            secrets: SAVOURY_PPA_AUTH
             tags: |
               docker.io/ptr727/plexcleaner:${{ endsWith(github.ref, 'refs/heads/main') && 'alpine-edge' || 'alpine-edge-develop' }}
 
-          - file: ./Docker/Ubuntu.Savoury.Dockerfile
-            platforms: linux/amd64
-            cache-scope: savoury
-            secrets: SAVOURY_PPA_AUTH
-            tags: |
-              docker.io/ptr727/plexcleaner:${{ endsWith(github.ref, 'refs/heads/main') && 'savoury' || 'savoury-develop' }}
-
           - file: ./Docker/Ubuntu.Rolling.Dockerfile
             platforms: linux/amd64,linux/arm64,linux/arm/v7
             cache-scope: ubuntu
-            secrets: SAVOURY_PPA_AUTH
             tags: |
               docker.io/ptr727/plexcleaner:${{ endsWith(github.ref, 'refs/heads/main') && 'ubuntu' || 'ubuntu-develop' }}
               docker.io/ptr727/plexcleaner:${{ endsWith(github.ref, 'refs/heads/main') && 'latest' || 'develop' }}
@@ -119,7 +107,6 @@ jobs:
           - file: ./Docker/Ubuntu.Devel.Dockerfile
             platforms: linux/amd64,linux/arm64,linux/arm/v7
             cache-scope: ubuntu-devel
-            secrets: SAVOURY_PPA_AUTH
             tags: |
               docker.io/ptr727/plexcleaner:${{ endsWith(github.ref, 'refs/heads/main') && 'ubuntu-devel' || 'ubuntu-devel-develop' }}
 
@@ -157,8 +144,6 @@ jobs:
           context: .
           file: ${{ matrix.file }}
           push: ${{ (github.event_name != 'pull_request') }}
-          # TODO: How to test for secret not null and avoid "null= is not a valid secret"
-          secrets: ${{ matrix.secrets }}=${{ secrets[matrix.secrets] }}
           tags: ${{ matrix.tags }}
           platforms: ${{ matrix.platforms }}
           build-args: |
@@ -193,8 +178,6 @@ jobs:
             file: ubuntu.ver
           - tag: ${{ endsWith(github.ref, 'refs/heads/main') && 'ubuntu-devel' || 'ubuntu-devel-develop' }}
             file: ubuntu-devel.ver
-          - tag: ${{ endsWith(github.ref, 'refs/heads/main') && 'savoury' || 'savoury-develop' }}
-            file: savoury.ver
 
     steps:
 

diff --git a/Docker/Alpine.Stable.Dockerfile b/Docker/Alpine.Stable.Dockerfile
@@ -45,8 +45,8 @@ RUN apk update \
     && apk upgrade
 
 # Install .NET SDK
-# https://pkgs.alpinelinux.org/package/edge/community/x86_64/dotnet8-sdk
-RUN apk add dotnet8-sdk
+# https://pkgs.alpinelinux.org/package/v3.21/community/x86_64/dotnet8-sdk
+RUN apk add --no-cache dotnet8-sdk
 
 # Copy source and unit tests
 COPY ./Samples/. ./Samples/.
@@ -87,7 +87,7 @@ RUN apk update \
     && apk upgrade
 
 # Install dependencies
-RUN apk add \
+RUN apk add --no-cache \
         icu-data-full \
         icu-libs \
         p7zip \
@@ -96,14 +96,14 @@ RUN apk add \
 
 # Install .NET Runtime
 # https://pkgs.alpinelinux.org/package/edge/community/x86_64/dotnet8-runtime
-RUN apk add dotnet8-runtime
+RUN apk add --no-cache dotnet8-runtime
 
 # Install media tools
-# https://pkgs.alpinelinux.org/package/v3.20/community/x86_64/ffmpeg
-# https://pkgs.alpinelinux.org/package/v3.20/community/x86_64/mediainfo
-# https://pkgs.alpinelinux.org/package/v3.20/community/x86_64/mkvtoolnix
-# https://pkgs.alpinelinux.org/package/v3.20/community/x86_64/handbrake
-RUN apk add \
+# https://pkgs.alpinelinux.org/package/v3.21/community/x86_64/ffmpeg
+# https://pkgs.alpinelinux.org/package/v3.21/community/x86_64/mediainfo
+# https://pkgs.alpinelinux.org/package/v3.21/community/x86_64/mkvtoolnix
+# https://pkgs.alpinelinux.org/package/v3.21/community/x86_64/handbrake
+RUN apk add --no-cache \
         ffmpeg\
         handbrake \
         mediainfo \

diff --git a/Docker/README.m4 b/Docker/README.m4
@@ -19,11 +19,6 @@ Images are updated weekly with the latest upstream updates.
 
 - `latest`: Alias for `ubuntu`.
 - `develop`: Alias for `ubuntu-develop`.
-- `savoury`: Based on [Ubuntu Jammy 22.04 LTS](https://releases.ubuntu.com/) `ubuntu:jammy` base image.
-  - Installs the latest [MediaInfo](https://mediaarea.net/en/MediaInfo/Download/Ubuntu) from the MediaInfo repository.
-  - Installs the latest [MkvToolNix](https://mkvtoolnix.download/downloads.html#ubuntu) from the MkvToolNix repository.
-  - Installs the latest FFmpeg and HandBrake installed from [Rob Savoury's](https://launchpad.net/~savoury1) private PPA repository.
-  - Only `linux/amd64` platforms are supported.
 - `ubuntu`: Based on [Ubuntu Rolling](https://releases.ubuntu.com/) `ubuntu:rolling` latest stable release base image.
   - Installs media tools from Ubuntu repository.
   - Multi-architecture image supporting `linux/amd64`, `linux/arm64`, and `linux/arm/v7` builds.
@@ -34,7 +29,7 @@ Images are updated weekly with the latest upstream updates.
   - Installs media tools from the Alpine repository.
   - Multi-architecture image supporting `linux/amd64`, and `linux/arm64`.
   - Handbrake on Alpine does not support `linux/arm/v7` builds.
-- `alpine-edge`: [Alpine Edge](https://alpinelinux.org/releases/) `alpine-edge` pre-release base image.
+- `alpine-edge`: [Alpine Edge](https://alpinelinux.org/releases/) `alpine:edge` pre-release base image.
   - Installs media tools from the Alpine repository.
   - Multi-architecture image supporting `linux/amd64`, and `linux/arm64`.
   - Handbrake on Alpine does not support `linux/arm/v7` builds.
@@ -54,16 +49,9 @@ Images are updated weekly with the latest upstream updates.
 | `ubuntu` | &#9745; | &#9745; | &#9745; | ~320MB |
 | `alpine` | &#9745; | &#9745; | &#9744; | ~160MB |
 | `debian` | &#9745; | &#9745; | &#9745; | ~330MB |
-| `savoury` | &#9745; | &#9744; | &#9744; | ~400MB |
 
 ## Media Tool Versions
 
-### `ptr727/plexcleaner:savoury`
-
-```text
-include({{savoury.ver}})
-```
-
 ### `ptr727/plexcleaner:ubuntu`
 
 ```text

diff --git a/Docker/Ubuntu.Savoury.Dockerfile b/Docker/Ubuntu.Savoury.Dockerfile
@@ -14,6 +14,7 @@
 # export DEBIAN_FRONTEND=noninteractive
 
 # Build Dockerfile
+# Create ./Docker/auth.conf secret file: "machine private-ppa.launchpadcontent.net login [username] password [password]"
 # docker buildx create --name "plexcleaner" --use
 # docker buildx build --secret id=SAVOURY_PPA_AUTH,src=./Docker/auth.conf --platform linux/amd64 --tag testing:latest --file ./Docker/Ubuntu.Savoury.Dockerfile .
 
@@ -112,7 +113,7 @@ RUN apt-get install -y --no-install-recommends \
 # Install MediaInfo
 # https://mediaarea.net/en/MediaInfo/Download/Ubuntu
 # https://mediaarea.net/en/Repos
-RUN wget -O repo-mediaarea_all.deb https://mediaarea.net/repo/deb/repo-mediaarea_1.0-24_all.deb \
+RUN wget -O repo-mediaarea_all.deb https://mediaarea.net/repo/deb/repo-mediaarea_1.0-25_all.deb \
     && dpkg -i repo-mediaarea_all.deb \
     && apt-get update \
     && apt-get install -y --no-install-recommends mediainfo \

diff --git a/PlexCleaner.code-workspace b/PlexCleaner.code-workspace
@@ -6,14 +6,18 @@
 	],
 	"settings": {
 		"cSpell.words": [
+			"addnab",
 			"adduser",
 			"adpcm",
 			"aencode",
 			"aencoder",
 			"analyzeduration",
 			"archlinux",
+			"autoremove",
 			"AVFMT",
 			"avformat",
+			"buildpush",
+			"Buildx",
 			"changequote",
 			"checkfornewtools",
 			"checkfortools",
@@ -23,6 +27,7 @@
 			"createsidecar",
 			"csdevkit",
 			"cuda",
+			"datebadge",
 			"davidanson",
 			"decomb",
 			"defaultsettings",
@@ -31,7 +36,9 @@
 			"deinterlaced",
 			"deinterlacing",
 			"devel",
+			"dockerhub",
 			"dotnettools",
+			"dpkg",
 			"dvhe",
 			"EBML",
 			"Emby",
@@ -47,6 +54,7 @@
 			"gettagmap",
 			"gettoolinfo",
 			"getversioninfo",
+			"getvsdbg",
 			"getxxxinfo",
 			"gruntfuggly",
 			"Gyan",
@@ -56,7 +64,10 @@
 			"indeo",
 			"Jellyfin",
 			"kbits",
+			"keyrings",
 			"Kodi",
+			"lastbuild",
+			"launchpadcontent",
 			"libebml",
 			"libhb",
 			"libmatroska",
@@ -70,23 +81,29 @@
 			"Matroska",
 			"MBAFF",
 			"Mbps",
+			"mediaarea",
 			"mediafiles",
 			"mediainfo",
 			"Memberwise",
 			"mkvmerge",
 			"mkvtoolnix",
 			"mmco",
+			"moritzbunkus",
 			"msmpeg",
 			"msrle",
 			"muxer",
 			"Muxing",
+			"nbgv",
 			"Nerdbank",
 			"Newtonsoft",
+			"noninteractive",
 			"nonroot",
 			"NONSTRICT",
 			"nostats",
+			"numfmt",
 			"NVENC",
 			"partitioner",
+			"Pieter",
 			"Plex",
 			"plexcleaner",
 			"preprocess",
@@ -103,6 +120,7 @@
 			"remux",
 			"remuxed",
 			"remuxing",
+			"Rubba",
 			"schemafile",
 			"Serilog",
 			"settingsfile",
@@ -115,12 +133,17 @@
 			"threadcount",
 			"tmpint",
 			"tmprmx",
+			"toolversions",
 			"truehd",
+			"tzdata",
 			"unref",
+			"updatereadme",
 			"updatesidecar",
 			"upgradesidecar",
+			"Viljoen",
 			"VOBSUB",
 			"Vorbis",
+			"vsdbg",
 			"watchlist",
 			"WEBVTT",
 			"wmapro",

diff --git a/PlexCleaner/PlexCleaner.csproj b/PlexCleaner/PlexCleaner.csproj
@@ -1,58 +1,58 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
-    <ApplicationIcon>Mario.ico</ApplicationIcon>
-    <StartupObject>PlexCleaner.Program</StartupObject>
-    <AssemblyName>PlexCleaner</AssemblyName>
-    <RootNamespace>PlexCleaner</RootNamespace>
-    <Authors>Pieter Viljoen</Authors>
-    <Company>Pieter Viljoen</Company>
-    <Copyright>Pieter Viljoen</Copyright>
-    <Description>Utility to optimize media files for Direct Play in Plex, Emby, Jellyfin.</Description>
-    <PackageProjectUrl>https://github.com/ptr727/PlexCleaner</PackageProjectUrl>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <RepositoryUrl>https://github.com/ptr727/PlexCleaner</RepositoryUrl>
-    <NeutralLanguage>en</NeutralLanguage>
-    <Version>1.1.1</Version>
-    <FileVersion>1.1.1.1</FileVersion>
-    <AssemblyVersion>1.1.1.0</AssemblyVersion>
-    <PackageId>InsaneGenius.PlexCleaner</PackageId>
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <EmbedUntrackedSources>true</EmbedUntrackedSources>
-    <IncludeSymbols>true</IncludeSymbols>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
-    <AnalysisLevel>latest</AnalysisLevel>
-    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <PackageReadmeFile>README.md</PackageReadmeFile>
-    <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <None Include="..\README.md">
-      <Pack>True</Pack>
-      <PackagePath>\</PackagePath>
-    </None>
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="InsaneGenius.Utilities" Version="3.1.118" />
-    <PackageReference Include="JsonSchema.Net.Generation" Version="5.0.0" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
-    <PackageReference Include="Serilog" Version="4.2.0" />
-    <PackageReference Include="Serilog.Enrichers.Thread" Version="4.0.0" />
-    <PackageReference Include="Serilog.Sinks.Async" Version="2.1.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
-    <PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
-    <PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
-    <PackageReference Include="System.CommandLine.NamingConventionBinder" Version="2.0.0-beta4.22272.1" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <InternalsVisibleTo Include="PlexCleanerTests" />
-  </ItemGroup>
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net8.0</TargetFramework>
+    <ApplicationIcon>Mario.ico</ApplicationIcon>
+    <StartupObject>PlexCleaner.Program</StartupObject>
+    <AssemblyName>PlexCleaner</AssemblyName>
+    <RootNamespace>PlexCleaner</RootNamespace>
+    <Authors>Pieter Viljoen</Authors>
+    <Company>Pieter Viljoen</Company>
+    <Copyright>Pieter Viljoen</Copyright>
+    <Description>Utility to optimize media files for Direct Play in Plex, Emby, Jellyfin.</Description>
+    <PackageProjectUrl>https://github.com/ptr727/PlexCleaner</PackageProjectUrl>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <RepositoryUrl>https://github.com/ptr727/PlexCleaner</RepositoryUrl>
+    <NeutralLanguage>en</NeutralLanguage>
+    <Version>1.1.1</Version>
+    <FileVersion>1.1.1.1</FileVersion>
+    <AssemblyVersion>1.1.1.0</AssemblyVersion>
+    <PackageId>InsaneGenius.PlexCleaner</PackageId>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+    <AnalysisLevel>latest</AnalysisLevel>
+    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
+    <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Include="..\README.md">
+      <Pack>True</Pack>
+      <PackagePath>\</PackagePath>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="InsaneGenius.Utilities" Version="3.1.118" />
+    <PackageReference Include="JsonSchema.Net.Generation" Version="5.0.0" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
+    <PackageReference Include="Serilog" Version="4.2.0" />
+    <PackageReference Include="Serilog.Enrichers.Thread" Version="4.0.0" />
+    <PackageReference Include="Serilog.Sinks.Async" Version="2.1.0" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
+    <PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
+    <PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
+    <PackageReference Include="System.CommandLine.NamingConventionBinder" Version="2.0.0-beta4.22272.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <InternalsVisibleTo Include="PlexCleanerTests" />
+  </ItemGroup>
+
+</Project>