diff --git a/CHANGELOG.md b/CHANGELOG.md index 419e63e11..732994df3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## [Unreleased] +### Changed +- Upgrade to dotnet 7 +- Upgrade all docker images to ubuntu jammy and ffmpeg 5.1.2 ## [0.7.0-beta] - 2022-12-11 ### Fixed diff --git a/docker/Dockerfile b/docker/Dockerfile index 25f8e70ef..b6f9e4464 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/aspnet:7.0-focal-amd64 AS dotnet-runtime +FROM mcr.microsoft.com/dotnet/aspnet:7.0-jammy-amd64 AS dotnet-runtime FROM jasongdove/ffmpeg:5.1-ubuntu2004 AS runtime-base COPY --from=dotnet-runtime /usr/share/dotnet /usr/share/dotnet diff --git a/docker/arm32v7/Dockerfile b/docker/arm32v7/Dockerfile index 5ccd2038d..31655e13e 100644 --- a/docker/arm32v7/Dockerfile +++ b/docker/arm32v7/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/aspnet:7.0-focal-arm32v7 AS dotnet-runtime +FROM mcr.microsoft.com/dotnet/aspnet:7.0-jammy-arm32v7 AS dotnet-runtime FROM jasongdove/ersatztv-ffmpeg:5.1.2-arm AS runtime-base COPY --from=dotnet-runtime /usr/share/dotnet /usr/share/dotnet @@ -9,7 +9,7 @@ RUN apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get install -y libicu libgdiplus # https://hub.docker.com/_/microsoft-dotnet -FROM mcr.microsoft.com/dotnet/sdk:7.0-focal-arm32v7 AS build +FROM mcr.microsoft.com/dotnet/sdk:7.0-jammy-arm32v7 AS build RUN apt-get update && apt-get install -y ca-certificates RUN curl -fsSL https://deb.nodesource.com/setup_14.x | bash - RUN apt-get install -y nodejs diff --git a/docker/arm64/Dockerfile b/docker/arm64/Dockerfile index 2cb0a338f..856bb3b49 100644 --- a/docker/arm64/Dockerfile +++ b/docker/arm64/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/aspnet:7.0-focal-arm64v8 AS dotnet-runtime +FROM mcr.microsoft.com/dotnet/aspnet:7.0-jammy-arm64v8 AS dotnet-runtime FROM jasongdove/ersatztv-ffmpeg:5.1.2-arm64 AS runtime-base COPY --from=dotnet-runtime /usr/share/dotnet /usr/share/dotnet @@ -9,7 +9,7 @@ RUN apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get install -y libicu libgdiplus # https://hub.docker.com/_/microsoft-dotnet -FROM mcr.microsoft.com/dotnet/sdk:7.0-focal-arm64v8 AS build +FROM mcr.microsoft.com/dotnet/sdk:7.0-jammy-arm64v8 AS build RUN apt-get update && apt-get install -y ca-certificates RUN curl -fsSL https://deb.nodesource.com/setup_14.x | bash - RUN apt-get install -y nodejs