F2calv/2023 11 dotnet8 (#22)

* imagePullPolicy IfNotPresent * dev tag to latest-dev * latest-dev * bump to dotnet8 * bump nugets
f2calv · Nov 21, 2023 · 7a1dfee · 7a1dfee
1 parent 4c6bcbb
commit 7a1dfee
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 12 deletions.
diff --git a/.scripts/Invoke-Setup.ps1 b/.scripts/Invoke-Setup.ps1
@@ -12,7 +12,7 @@ $IMAGE_NAME = "multi-arch-container-dotnet"
 $REPOSITORY = "$DOCKERHUB_USERNAME/$IMAGE_NAME"
 $REPO_ROOT = git rev-parse --show-toplevel
 $GIT_REPO = $REPO_ROOT | Split-Path -Leaf
-$GIT_TAG = "dev"
+$GIT_TAG = "latest-dev"
 $GIT_BRANCH = $(git branch --show-current)
 $GIT_COMMIT = $(git rev-parse HEAD)
 $GITHUB_WORKFLOW = "n/a"

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <RootNamespace>CasCap</RootNamespace>
-    <LangVersion>11.0</LangVersion>
+    <LangVersion>12.0</LangVersion>
     <!--nullable we enable on a per project basis-->
     <!--<Nullable>enable</Nullable>-->
   </PropertyGroup>

diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,5 @@
-#FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
-#FROM mcr.microsoft.com/dotnet/sdk:7.0-bullseye-slim-amd64 AS build
-FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:7.0 AS build
+#FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
+FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0 AS build
 WORKDIR /repo
 COPY ["src/multi-arch-container-dotnet/multi-arch-container-dotnet.csproj", "src/multi-arch-container-dotnet/"]
 RUN dotnet restore "src/multi-arch-container-dotnet/multi-arch-container-dotnet.csproj"
@@ -15,7 +14,7 @@ RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then \
     fi \
     && dotnet publish "src/multi-arch-container-dotnet/multi-arch-container-dotnet.csproj" -c Release -o /app/publish -r $RID --self-contained false
 
-FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS final
+FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS final
 WORKDIR /app
 COPY --from=build /app/publish .
 

diff --git a/README.md b/README.md
@@ -67,7 +67,7 @@ First clone the repository (ideally by opening it as [vscode devcontainer](https
 GIT_REPO=$(basename `git rev-parse --show-toplevel`)
 GIT_BRANCH=$(git branch --show-current)
 GIT_COMMIT=$(git rev-parse HEAD)
-GIT_TAG="dev"
+GIT_TAG="latest-dev"
 GITHUB_WORKFLOW="n/a"
 GITHUB_RUN_ID=0
 GITHUB_RUN_NUMBER=0

diff --git a/build.ps1 b/build.ps1
@@ -4,7 +4,7 @@ $ErrorActionPreference = "Stop"
 #set variables to emulate running in the workflow/pipeline
 $REPO_ROOT = git rev-parse --show-toplevel
 $GIT_REPO = $REPO_ROOT | Split-Path -Leaf
-$GIT_TAG = "dev"
+$GIT_TAG = "latest-dev"
 $GIT_BRANCH = $(git branch --show-current)
 $GIT_COMMIT = $(git rev-parse HEAD)
 $GITHUB_WORKFLOW = "n/a"

diff --git a/build.sh b/build.sh
@@ -4,7 +4,7 @@
 GIT_REPO=$(basename `git rev-parse --show-toplevel`)
 GIT_BRANCH=$(git branch --show-current)
 GIT_COMMIT=$(git rev-parse HEAD)
-GIT_TAG="dev"
+GIT_TAG="latest-dev"
 GITHUB_WORKFLOW="n/a"
 GITHUB_RUN_ID=0
 GITHUB_RUN_NUMBER=0

diff --git a/kustomize/deployment.yaml b/kustomize/deployment.yaml
@@ -18,7 +18,7 @@ spec:
       containers:
       - name: primary
         image: ghcr.io/f2calv/multi-arch-container-dotnet:dev
-        imagePullPolicy: Always
+        imagePullPolicy: IfNotPresent
         ports:
         - name: http
           containerPort: 80

diff --git a/src/multi-arch-container-dotnet/multi-arch-container-dotnet.csproj b/src/multi-arch-container-dotnet/multi-arch-container-dotnet.csproj
@@ -2,13 +2,13 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
+    <PackageReference Include="Serilog.AspNetCore" Version="8.0.0" />
     <PackageReference Include="Serilog.Enrichers.Environment" Version="2.3.0" />
   </ItemGroup>