Fix the release Workflow

Fix #14703
OrchardCMS · Nov 16, 2023 · 8b3906e · 8b3906e
1 parent 0493ab0
commit 8b3906e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/preview_ci.yml b/.github/workflows/preview_ci.yml
@@ -69,7 +69,7 @@ jobs:
         Get-ChildItem ./src/OrchardCore.Cms.Web/App_Data_Tests -Recurse | Remove-Item -Recurse -Confirm:$false
         $output = [System.IO.Path]::GetFullPath("./.build/release")
         dotnet publish -c Release --property:PublishDir=$output --no-build --framework net8.0
-        docker build -f Dockerfile-CI -t orchardproject/orchardcore-cms-linux:dev .
+        docker build -f Dockerfile-CI --build-arg TARGET_IMAGE=mcr.microsoft.com/dotnet/aspnet:8.0 -t orchardproject/orchardcore-cms-linux:dev .
         docker push orchardproject/orchardcore-cms-linux:dev
     - name: Deploy preview docker image for windows
       if: matrix.os == 'windows-latest'
@@ -78,6 +78,6 @@ jobs:
         Get-ChildItem ./src/OrchardCore.Cms.Web/App_Data_Tests -Recurse | Remove-Item -Recurse -Confirm:$false
         $output = [System.IO.Path]::GetFullPath("./.build/release")
         dotnet publish -c Release --property:PublishDir=$output --no-build --framework net8.0
-        docker build -f Dockerfile-CI -t orchardproject/orchardcore-cms-windows:dev .
+        docker build -f Dockerfile-CI --build-arg TARGET_IMAGE=mcr.microsoft.com/dotnet/aspnet:8.0-nanoserver-1809 -t orchardproject/orchardcore-cms-windows:dev .
         echo "${{ secrets.DOCKERHUB_PASSWORD }}" | docker login -u="${{ secrets.DOCKERHUB_USERNAME }}" --password-stdin
         docker push orchardproject/orchardcore-cms-windows:dev
diff --git a/.github/workflows/release_ci.yml b/.github/workflows/release_ci.yml
@@ -80,7 +80,7 @@ jobs:
         Get-ChildItem ./src/OrchardCore.Cms.Web/App_Data_Tests -Recurse | Remove-Item -Recurse -Confirm:$false
         $output = [System.IO.Path]::GetFullPath("./.build/release")
         dotnet publish -c Release --property:PublishDir=$output --no-build --framework net8.0
-        docker build -f Dockerfile-CI -t orchardproject/orchardcore-cms-linux:latest -t orchardproject/orchardcore-cms-linux:${{ steps.get_version.outputs.VERSION }} .
+        docker build -f Dockerfile-CI --build-arg TARGET_IMAGE=mcr.microsoft.com/dotnet/aspnet:8.0 -t orchardproject/orchardcore-cms-linux:latest -t orchardproject/orchardcore-cms-linux:${{ steps.get_version.outputs.VERSION }} .
         docker push orchardproject/orchardcore-cms-linux:latest 
         docker push "orchardproject/orchardcore-cms-linux:${{ steps.get_version.outputs.VERSION }}"
     - name: Deploy preview docker image for windows
@@ -90,7 +90,7 @@ jobs:
         Get-ChildItem ./src/OrchardCore.Cms.Web/App_Data_Tests -Recurse | Remove-Item -Recurse -Confirm:$false
         $output = [System.IO.Path]::GetFullPath("./.build/release")
         dotnet publish -c Release --property:PublishDir=$output --no-build --framework net8.0
-        docker build -f Dockerfile-CI -t orchardproject/orchardcore-cms-windows:latest -t orchardproject/orchardcore-cms-windows:${{ steps.get_version.outputs.VERSION }} .
+        docker build -f Dockerfile-CI --build-arg TARGET_IMAGE=mcr.microsoft.com/dotnet/aspnet:8.0-nanoserver-1809 -t orchardproject/orchardcore-cms-windows:latest -t orchardproject/orchardcore-cms-windows:${{ steps.get_version.outputs.VERSION }} .
         echo "${{ secrets.DOCKERHUB_PASSWORD }}" | docker login -u="${{ secrets.DOCKERHUB_USERNAME }}" --password-stdin
         docker push orchardproject/orchardcore-cms-windows:latest 
         docker push "orchardproject/orchardcore-cms-windows:${{ steps.get_version.outputs.VERSION }}"
diff --git a/Dockerfile-CI b/Dockerfile-CI
@@ -1,7 +1,8 @@
 # This Docker file is intended for the CI
 # A prerequisite is a published application in the .build/release  
 
-FROM mcr.microsoft.com/dotnet/aspnet:8.0
+ARG TARGET_IMAGE
+FROM ${TARGET_IMAGE}
 
 EXPOSE 80
 ENV ASPNETCORE_URLS http://+:80