yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

V15: Fix docker (#17722)

Browse Source 
* Bump dotnet version

* Ensure LF line endings for shell scripts
This commit is contained in:
Mole
2024-12-10 10:25:50 +01:00
committed by GitHub
parent e757b90ee1
commit 03eb878d30
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@@ -46,6 +46,7 @@
*.xml text=auto *.xml text=auto
*.resx text=auto *.resx text=auto
*.yml text eol=lf core.whitespace whitespace=tab-in-indent,trailing-space,tabwidth=2 *.yml text eol=lf core.whitespace whitespace=tab-in-indent,trailing-space,tabwidth=2
*.sh eol=lf
*.csproj text=auto merge=union *.csproj text=auto merge=union
*.vbproj text=auto merge=union *.vbproj text=auto merge=union

4
templates/UmbracoProject/Dockerfile
View File

@@ -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 USER $APP_UID
WORKDIR /app WORKDIR /app
EXPOSE 8080 EXPOSE 8080
EXPOSE 8081 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 ARG BUILD_CONFIGURATION=Release
WORKDIR /src WORKDIR /src
COPY ["UmbracoProject/UmbracoProject.csproj", "UmbracoProject/"] COPY ["UmbracoProject/UmbracoProject.csproj", "UmbracoProject/"]