From 03eb878d30464c682a28d92ad4f19cdf95515a01 Mon Sep 17 00:00:00 2001 From: Mole Date: Tue, 10 Dec 2024 10:25:50 +0100 Subject: [PATCH] V15: Fix docker (#17722) * Bump dotnet version * Ensure LF line endings for shell scripts --- .gitattributes | 1 + templates/UmbracoProject/Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitattributes b/.gitattributes index 8ac58cf5fedf..6e707b77968f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -46,6 +46,7 @@ *.xml text=auto *.resx text=auto *.yml text eol=lf core.whitespace whitespace=tab-in-indent,trailing-space,tabwidth=2 +*.sh eol=lf *.csproj text=auto merge=union *.vbproj text=auto merge=union diff --git a/templates/UmbracoProject/Dockerfile b/templates/UmbracoProject/Dockerfile index e3eda648ddfb..0e1b379b2095 100644 --- a/templates/UmbracoProject/Dockerfile +++ b/templates/UmbracoProject/Dockerfile @@ -1,10 +1,10 @@ -FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base +FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base USER $APP_UID WORKDIR /app EXPOSE 8080 EXPOSE 8081 -FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build ARG BUILD_CONFIGURATION=Release WORKDIR /src COPY ["UmbracoProject/UmbracoProject.csproj", "UmbracoProject/"]