From a01b0f8c2089367f0b8b3c105704c4be82fbcad4 Mon Sep 17 00:00:00 2001 From: Tho Ho Date: Wed, 27 Mar 2024 15:05:26 +0800 Subject: [PATCH] Use the current .NET 3.1, 5.0 and 6.0, to reduce the image size --- .../workflows/docker-teamcityagent-image.yml | 84 ++++++++++--------- 1 file changed, 43 insertions(+), 41 deletions(-) diff --git a/.github/workflows/docker-teamcityagent-image.yml b/.github/workflows/docker-teamcityagent-image.yml index 49fc6c3..1618d56 100644 --- a/.github/workflows/docker-teamcityagent-image.yml +++ b/.github/workflows/docker-teamcityagent-image.yml @@ -90,38 +90,38 @@ jobs: echo "Docker compose version only: '$DOCKER_COMPOSE_VERSION'" echo "version=$DOCKER_COMPOSE_VERSION" >> $GITHUB_OUTPUT - - name: Get .NETCore 3.1 Versions - id: dotnetcore31_vers - shell: pwsh - run: | - $dotnet_info_raw=$(docker run --rm mcr.microsoft.com/dotnet/sdk:3.1-focal dotnet --info) -join ' ' - $dotnet_sdk_version=$dotnet_info_raw -replace '^.+\.NET Core SDKs installed:[^0-9]+([0-9.]+)[^0-9].*$','$1' - $aspnetcore_version=$dotnet_info_raw -replace '^.+Microsoft.AspNetCore.App\s+([0-9.]+)[^0-9.].*$','$1' - $dotnet_version=$dotnet_info_raw -replace '^.+Microsoft.NETCore.App\s+([0-9.]+)[^0-9.].*$','$1' - Write-Output "Version SDK:$dotnet_sdk_version ASP.NET:$aspnetcore_version .NETCore:$dotnet_version" - Write-Output "sdk=$dotnet_sdk_version" >> $env:GITHUB_OUTPUT - Write-Output "aspnet=$aspnetcore_version" >> $env:GITHUB_OUTPUT - Write-Output "dotnet=$dotnet_version" >> $env:GITHUB_OUTPUT - - - name: Get .NET 5.0 Versions - id: dotnet5_vers - shell: pwsh - run: | - $dotnet_vers=$(docker run --rm mcr.microsoft.com/dotnet/sdk:5.0-focal sh -c 'echo $DOTNET_SDK_VERSION;echo $ASPNET_VERSION;echo $DOTNET_VERSION') - Write-Output "Version SDK:$($dotnet_vers[0]) ASP.NET:$($dotnet_vers[1]) .NETCore:$($dotnet_vers[2])" - Write-Output "sdk=$($dotnet_vers[0])" >> $env:GITHUB_OUTPUT - Write-Output "aspnet=$($dotnet_vers[1])" >> $env:GITHUB_OUTPUT - Write-Output "dotnet=$($dotnet_vers[2])" >> $env:GITHUB_OUTPUT - - - name: Get .NET 6.0 Versions - id: dotnet6_vers - shell: pwsh - run: | - $dotnet_vers=$(docker run --rm mcr.microsoft.com/dotnet/sdk:6.0-focal sh -c 'echo $DOTNET_SDK_VERSION;echo $ASPNET_VERSION;echo $DOTNET_VERSION') - Write-Output "Version SDK:$($dotnet_vers[0]) ASP.NET:$($dotnet_vers[1]) .NETCore:$($dotnet_vers[2])" - Write-Output "sdk=$($dotnet_vers[0])" >> $env:GITHUB_OUTPUT - Write-Output "aspnet=$($dotnet_vers[1])" >> $env:GITHUB_OUTPUT - Write-Output "dotnet=$($dotnet_vers[2])" >> $env:GITHUB_OUTPUT + #- name: Get .NETCore 3.1 Versions + # id: dotnetcore31_vers + # shell: pwsh + # run: | + # $dotnet_info_raw=$(docker run --rm mcr.microsoft.com/dotnet/sdk:3.1-focal dotnet --info) -join ' ' + # $dotnet_sdk_version=$dotnet_info_raw -replace '^.+\.NET Core SDKs installed:[^0-9]+([0-9.]+)[^0-9].*$','$1' + # $aspnetcore_version=$dotnet_info_raw -replace '^.+Microsoft.AspNetCore.App\s+([0-9.]+)[^0-9.].*$','$1' + # $dotnet_version=$dotnet_info_raw -replace '^.+Microsoft.NETCore.App\s+([0-9.]+)[^0-9.].*$','$1' + # Write-Output "Version SDK:$dotnet_sdk_version ASP.NET:$aspnetcore_version .NETCore:$dotnet_version" + # Write-Output "sdk=$dotnet_sdk_version" >> $env:GITHUB_OUTPUT + # Write-Output "aspnet=$aspnetcore_version" >> $env:GITHUB_OUTPUT + # Write-Output "dotnet=$dotnet_version" >> $env:GITHUB_OUTPUT + + #- name: Get .NET 5.0 Versions + # id: dotnet5_vers + # shell: pwsh + # run: | + # $dotnet_vers=$(docker run --rm mcr.microsoft.com/dotnet/sdk:5.0-focal sh -c 'echo $DOTNET_SDK_VERSION;echo $ASPNET_VERSION;echo $DOTNET_VERSION') + # Write-Output "Version SDK:$($dotnet_vers[0]) ASP.NET:$($dotnet_vers[1]) .NETCore:$($dotnet_vers[2])" + # Write-Output "sdk=$($dotnet_vers[0])" >> $env:GITHUB_OUTPUT + # Write-Output "aspnet=$($dotnet_vers[1])" >> $env:GITHUB_OUTPUT + # Write-Output "dotnet=$($dotnet_vers[2])" >> $env:GITHUB_OUTPUT + + #- name: Get .NET 6.0 Versions + # id: dotnet6_vers + # shell: pwsh + # run: | + # $dotnet_vers=$(docker run --rm mcr.microsoft.com/dotnet/sdk:6.0-focal sh -c 'echo $DOTNET_SDK_VERSION;echo $ASPNET_VERSION;echo $DOTNET_VERSION') + # Write-Output "Version SDK:$($dotnet_vers[0]) ASP.NET:$($dotnet_vers[1]) .NETCore:$($dotnet_vers[2])" + # Write-Output "sdk=$($dotnet_vers[0])" >> $env:GITHUB_OUTPUT + # Write-Output "aspnet=$($dotnet_vers[1])" >> $env:GITHUB_OUTPUT + # Write-Output "dotnet=$($dotnet_vers[2])" >> $env:GITHUB_OUTPUT - name: Get .NET 7.0 Versions id: dotnet7_vers @@ -166,15 +166,6 @@ jobs: build-args: | MINVER_VERSION=${{ steps.minver_version.outputs.version }} DOCKER_COMPOSE_VERSION=${{ steps.docker_compose_version.outputs.version }} - DOTNET_SDK_VERSION31=${{ steps.dotnetcore31_vers.outputs.sdk }} - ASPNET_VERSION31=${{ steps.dotnetcore31_vers.outputs.aspnet }} - DOTNET_VERSION31=${{ steps.dotnetcore31_vers.outputs.dotnet }} - DOTNET_SDK_VERSION5=${{ steps.dotnet5_vers.outputs.sdk }} - ASPNET_VERSION5=${{ steps.dotnet5_vers.outputs.aspnet }} - DOTNET_VERSION5=${{ steps.dotnet5_vers.outputs.dotnet }} - DOTNET_SDK_VERSION6=${{ steps.dotnet6_vers.outputs.sdk }} - ASPNET_VERSION6=${{ steps.dotnet6_vers.outputs.aspnet }} - DOTNET_VERSION6=${{ steps.dotnet6_vers.outputs.dotnet }} DOTNET_SDK_VERSION7=${{ steps.dotnet7_vers.outputs.sdk }} ASPNET_VERSION7=${{ steps.dotnet7_vers.outputs.aspnet }} DOTNET_VERSION7=${{ steps.dotnet7_vers.outputs.dotnet }} @@ -185,5 +176,16 @@ jobs: ASPNET_VERSION9=${{ steps.dotnet9_vers.outputs.aspnet }} DOTNET_VERSION9=${{ steps.dotnet9_vers.outputs.dotnet }} POWERSHELL_VERSION=${{ steps.dotnet9_vers.outputs.pwsh }} + unused: | + DOTNET_SDK_VERSION31=${{ steps.dotnetcore31_vers.outputs.sdk }} + ASPNET_VERSION31=${{ steps.dotnetcore31_vers.outputs.aspnet }} + DOTNET_VERSION31=${{ steps.dotnetcore31_vers.outputs.dotnet }} + DOTNET_SDK_VERSION5=${{ steps.dotnet5_vers.outputs.sdk }} + ASPNET_VERSION5=${{ steps.dotnet5_vers.outputs.aspnet }} + DOTNET_VERSION5=${{ steps.dotnet5_vers.outputs.dotnet }} + DOTNET_SDK_VERSION6=${{ steps.dotnet6_vers.outputs.sdk }} + ASPNET_VERSION6=${{ steps.dotnet6_vers.outputs.aspnet }} + DOTNET_VERSION6=${{ steps.dotnet6_vers.outputs.dotnet }} + - name: Image digest run: echo ${{ steps.docker_build.outputs.digest }}