[TW-83347] Update .NET Runtime / SDK versions within TeamCity Docker …

…Images (#102) Update .NET Runtime versions: * 3.1.21 -> 3.1.32 * 5.0.12 -> 5.0.17 * 6.0.0 (SDK 6.0.100) -> 6.0.21 (SDK 6.0.413)
JetBrains · Aug 29, 2023 · f805556 · f805556
1 parent 489b48d
commit f805556
Show file tree

Hide file tree

Showing 51 changed files with 351 additions and 337 deletions.
diff --git a/configs/common.config b/configs/common.config
@@ -1,16 +1,30 @@
-serverCommentHeader=This is an official [JetBrains TeamCity](https://www.jetbrains.com/teamcity/) server image. The image is suitable for production use and evaluation purposes.
+######################################################################################
+#                                                                                    #
+#            TeamCity Docker Images Common Configuration                             #
+#                                                                                    #
+# This configuration file is used to specify common settings for TeamCity Docker     #
+# images. Please note that the versions of different tools may reference SHA-512     #
+# checksums within OS-specific configuration files - they must be updated            #
+# accordingly.                                                                       #
+#                                                                                    #
+######################################################################################
+
 
+serverCommentHeader=This is an official [JetBrains TeamCity](https://www.jetbrains.com/teamcity/) server image. The image is suitable for production use and evaluation purposes.
 agentCommentHeader=This is an official [JetBrains TeamCity](https://www.jetbrains.com/teamcity/) build agent image.
 
 proxyUrl=
 powerShellComponentName=[PowerShell](https://github.com/PowerShell/PowerShell#get-powershell)
 
-# Please update checksum(SHA512) in windows.config and linux.config after version change
-dotnetComponentVersion=6.0.100
+
+# Matches .NET Runtime 6.0.21 - https://dotnet.microsoft.com/en-us/download/dotnet/6.0
+dotnetComponentVersion=6.0.413
 dotnetComponentName=.NET SDK v.${dotnetComponentVersion}
 
-dotnetComponentVersion_31=3.1.21
+# .NET 3.1.32 - https://dotnet.microsoft.com/en-us/download/dotnet/3.1
+dotnetComponentVersion_31=3.1.32
 dotnetComponentName_31=.NET Runtime v.${dotnetComponentVersion_31}
 
-dotnetComponentVersion_50=5.0.12
+# .NET 5.0.17 - https://dotnet.microsoft.com/en-us/download/dotnet/5.0
+dotnetComponentVersion_50=5.0.17
 dotnetComponentName_50=.NET Runtime v.${dotnetComponentVersion_50}
diff --git a/configs/linux.config b/configs/linux.config
@@ -13,19 +13,19 @@ jdkServerLinuxComponentName=JDK <img align="center" height="18" src="/docs/media
 # https://dotnet.microsoft.com/download/dotnet/6.0
 dotnetLinuxComponentVersion=${dotnetComponentVersion}
 dotnetLinuxComponent=https://${proxyUrl}dotnetcli.blob.core.windows.net/dotnet/Sdk/${dotnetComponentVersion}/dotnet-sdk-${dotnetComponentVersion}-linux-x64.tar.gz
-dotnetLinuxComponentSHA512=cb0d174a79d6294c302261b645dba6a479da8f7cf6c1fe15ae6998bc09c5e0baec810822f9e0104e84b0efd51fdc0333306cb2a0a6fcdbaf515a8ad8cf1af25b
+dotnetLinuxComponentSHA512=4390ba65e592c4f770b247f11228bbd2ed70aab30fbe6613c2bf7ec0c7c54d09b5a47ff160d4424dacc59661613fd4c9460d62f141a64def02a7228dd160f916
 dotnetLinuxComponentName=${dotnetComponentName} x86 Checksum (SHA512) ${dotnetLinuxComponentSHA512}
 
 # https://dotnet.microsoft.com/download/dotnet/3.1
 dotnetLinuxComponentVersion_31=${dotnetComponentVersion_31}
 dotnetLinuxComponent_31=https://${proxyUrl}dotnetcli.azureedge.net/dotnet/Runtime/${dotnetComponentVersion_31}/dotnet-runtime-${dotnetComponentVersion_31}-linux-x64.tar.gz
-dotnetLinuxComponentSHA512_31=cc4b2fef46e94df88bf0fc11cb15439e79bd48da524561dffde80d3cd6db218133468ad2f6785803cf0c13f000d95ff71eb258cec76dd8eb809676ec1cb38fac
+dotnetLinuxComponentSHA512_31=56c5e045844f5474a9a12b42e4a22c851985fac5690e227ce62b529d644c4faeaafdfe255de2f1e86a90c0c114e7de66ce4de1692fbf66357ac4d35341f933c3
 dotnetLinuxComponentName_31=${dotnetComponentName_31} x86 Checksum (SHA512) ${dotnetLinuxComponentSHA512_31}
 
 # https://dotnet.microsoft.com/download/dotnet/5.0
 dotnetLinuxComponentVersion_50=${dotnetComponentVersion_50}
 dotnetLinuxComponent_50=https://${proxyUrl}dotnetcli.azureedge.net/dotnet/Runtime/${dotnetComponentVersion_50}/dotnet-runtime-${dotnetComponentVersion_50}-linux-x64.tar.gz
-dotnetLinuxComponentSHA512_50=32b5f86db3b1d4c21e3cf616d22f0e4a7374385dac0cf03cdebf3520dcf846460d9677ec1829a180920740a0237d64f6eaa2421d036a67f4fe9fb15d4f6b1db9
+dotnetLinuxComponentSHA512_50=f47eec03d2b6777e78e2a993306727fa6871cf7f6e295ed70f684745a9f9fc960f0068750007519733426db52afa10e0bcd1c58879019d5d8f1f5f295868e4f3
 dotnetLinuxComponentName_50=${dotnetComponentName_50} x86 Checksum (SHA512) ${dotnetLinuxComponentSHA512_50}
 
 # https://packages.ubuntu.com/focal/git

diff --git a/configs/linuxARM.config b/configs/linuxARM.config
@@ -11,17 +11,17 @@ jdkServerLinuxARM64ComponentName=JDK <img align="center" height="18" src="/docs/
 # https://dotnet.microsoft.com/download/dotnet/6.0
 dotnetLinuxARM64ComponentVersion=${dotnetComponentVersion}
 dotnetLinuxARM64Component=https://${proxyUrl}dotnetcli.blob.core.windows.net/dotnet/Sdk/${dotnetComponentVersion}/dotnet-sdk-${dotnetComponentVersion}-linux-arm64.tar.gz
-dotnetLinuxARM64ComponentSHA512=e5983c1c599d6dc7c3c7496b9698e47c68247f04a5d0d1e3162969d071471297bce1c2fd3a1f9fb88645006c327ae79f880dcbdd8eefc9166fd717331f2716e7
+dotnetLinuxARM64ComponentSHA512=7f05a9774d79e694da5a6115d9916abf87a65e40bd6bdaa5dca1f705795436bc8e764242f7045207386a86732ef5519f60bdb516a3860e4860bca7ee91a21759
 dotnetLinuxARM64ComponentName=${dotnetComponentName} arm64 Checksum (SHA512) ${dotnetLinuxARM64ComponentSHA512}
 
 # https://dotnet.microsoft.com/download/dotnet/3.1
 dotnetLinuxARM64ComponentVersion_31=${dotnetComponentVersion_31}
 dotnetLinuxARM64Component_31=https://${proxyUrl}dotnetcli.azureedge.net/dotnet/Runtime/${dotnetComponentVersion_31}/dotnet-runtime-${dotnetComponentVersion_31}-linux-arm64.tar.gz
-dotnetLinuxARM64ComponentSHA512_31=80971125650a2fa0163e39a2de98bc2e871c295b723559e6081a3ab59d99195aa5b794450f8182c5eb4e7e472ca1c13340ef1cc8a5588114c494bbb5981f19c4
+dotnetLinuxARM64ComponentSHA512_31=ff311df0db488f3b5cc03c7f6724f8442de7e60fa0a503ec8f536361ce7a357ad26d09d2499d68c50ebdfa751a5520bba4aaa77a38b191c892d5a018561ce422
 dotnetLinuxARM64ComponentName_31=${dotnetComponentName_31} arm64 Checksum (SHA512) ${dotnetLinuxARM64ComponentSHA512_31}
 
 # https://dotnet.microsoft.com/download/dotnet/5.0
 dotnetLinuxARM64ComponentVersion_50=${dotnetComponentVersion_50}
 dotnetLinuxARM64Component_50=https://${proxyUrl}dotnetcli.azureedge.net/dotnet/Runtime/${dotnetComponentVersion_50}/dotnet-runtime-${dotnetComponentVersion_50}-linux-arm64.tar.gz
-dotnetLinuxARM64ComponentSHA512_50=a8089fad8d21a4b582aa6c3d7162d56a21fee697fd400f050a772f67c2ace5e4196d1c4261d3e861d6dc2e5439666f112c406104d6271e5ab60cda80ef2ffc64
+dotnetLinuxARM64ComponentSHA512_50=99cb11871924d3abedcc9c8079c54bc0c550203c7cbe4e349ed70d4355f40e4620b68d90b797e6461d898c06bed6953580e2cd4ad01483e5de107ca5a3409610
 dotnetLinuxARM64ComponentName_50=${dotnetComponentName_50} arm65 Checksum (SHA512) ${dotnetLinuxARM64ComponentSHA512_50}
diff --git a/configs/windows.config b/configs/windows.config
@@ -18,19 +18,19 @@ jdkWindowsComponentName=JDK <img align="center" height="18" src="/docs/media/cor
 # https://dotnet.microsoft.com/download/dotnet/6.0
 dotnetWindowsComponentVersion=${dotnetComponentVersion}
 dotnetWindowsComponent=https://${proxyUrl}dotnetcli.blob.core.windows.net/dotnet/Sdk/${dotnetComponentVersion}/dotnet-sdk-${dotnetComponentVersion}-win-x64.zip
-dotnetWindowsComponentSHA512=d2fa2f0d2b4550ac3408b924ab356add378af1d0f639623f0742e37f57b3f2b525d81f5d5c029303b6d95fed516b04a7b6c3a98f27f770fc8b4e76414cf41660
+dotnetWindowsComponentSHA512=d3e8273d451b3bc15cd8f656ffdaaff4d1b0d17059ada578967063f4b9882b74926af61c6e0919f66b5bdeddd66e5047743544ac4768026b60de7a7591e1fab5
 dotnetWindowsComponentName=${dotnetComponentName} x86 Checksum (SHA512) ${dotnetWindowsComponentSHA512}
 
 # https://dotnet.microsoft.com/download/dotnet/3.1
 dotnetWindowsComponentVersion_31=${dotnetComponentVersion_31}
 dotnetWindowsComponent_31=https://${proxyUrl}dotnetcli.azureedge.net/dotnet/Runtime/${dotnetComponentVersion_31}/dotnet-runtime-${dotnetComponentVersion_31}-win-x64.zip
-dotnetWindowsComponentSHA512_31=7ba766b2f388ab09beee6a465f1eeb6b9a6858c8b6da51dacc79622b110558ef6211a40e715a16b526f2da08216c99143570b8253ff2c5ad874400475d1feb44
+dotnetWindowsComponentSHA512_31=0a9cc67349adaebb8b81754aae5d7c478a043e25661537d149c65b098c13446ec78626f23e7eab4c5a6539485888f4f0a200e539038bae0be9e45aaefc76c05b
 dotnetWindowsComponentName_31=${dotnetComponentName_31} x86 Checksum (SHA512) ${dotnetWindowsComponentSHA512_31}
 
 # https://dotnet.microsoft.com/download/dotnet/5.0
 dotnetWindowsComponentVersion_50=${dotnetComponentVersion_50}
 dotnetWindowsComponent_50=https://${proxyUrl}dotnetcli.azureedge.net/dotnet/Runtime/${dotnetComponentVersion_50}/dotnet-runtime-${dotnetComponentVersion_50}-win-x64.zip
-dotnetWindowsComponentSHA512_50=636f22bfbfd98c80c96f2fc3815beb42ee2699cf2a410eeba24ddcc9304bc39594260eca4061b012d4b02b9c4592fa6927343077df053343a9c344a9289658e1
+dotnetWindowsComponentSHA512_50=09721d707779168484579d07fc76e5c29ada8c32b9533689f9f066da3aa98d4a615d825b7212aedf4744d017e9cf3ba86d6a570d00826b732bbc5dd6976a8774
 dotnetWindowsComponentName_50=${dotnetComponentName_50} x86 Checksum (SHA512) ${dotnetWindowsComponentSHA512_50}
 
 mercurialWindowsComponentName=Mercurial x64 v.5.9.1

diff --git a/context/generated/linux/Agent/Ubuntu/18.04/Dockerfile b/context/generated/linux/Agent/Ubuntu/18.04/Dockerfile
@@ -3,12 +3,12 @@ ARG containerdIoLinuxComponentVersion='1.4.12-1'
 ARG dockerComposeLinuxComponentVersion='1.28.5'
 ARG dockerLinuxComponentVersion='5:20.10.12~3-0~ubuntu'
 ARG dotnetLibs='libc6 libgcc1 libgssapi-krb5-2 libicu60 libssl1.1 libstdc++6 zlib1g'
-ARG dotnetLinuxComponent='https://dotnetcli.blob.core.windows.net/dotnet/Sdk/6.0.100/dotnet-sdk-6.0.100-linux-x64.tar.gz'
-ARG dotnetLinuxComponent_31='https://dotnetcli.azureedge.net/dotnet/Runtime/3.1.21/dotnet-runtime-3.1.21-linux-x64.tar.gz'
-ARG dotnetLinuxComponent_50='https://dotnetcli.azureedge.net/dotnet/Runtime/5.0.12/dotnet-runtime-5.0.12-linux-x64.tar.gz'
-ARG dotnetLinuxComponentSHA512='cb0d174a79d6294c302261b645dba6a479da8f7cf6c1fe15ae6998bc09c5e0baec810822f9e0104e84b0efd51fdc0333306cb2a0a6fcdbaf515a8ad8cf1af25b'
-ARG dotnetLinuxComponentSHA512_31='cc4b2fef46e94df88bf0fc11cb15439e79bd48da524561dffde80d3cd6db218133468ad2f6785803cf0c13f000d95ff71eb258cec76dd8eb809676ec1cb38fac'
-ARG dotnetLinuxComponentSHA512_50='32b5f86db3b1d4c21e3cf616d22f0e4a7374385dac0cf03cdebf3520dcf846460d9677ec1829a180920740a0237d64f6eaa2421d036a67f4fe9fb15d4f6b1db9'
+ARG dotnetLinuxComponent='https://dotnetcli.blob.core.windows.net/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-linux-x64.tar.gz'
+ARG dotnetLinuxComponent_31='https://dotnetcli.azureedge.net/dotnet/Runtime/3.1.32/dotnet-runtime-3.1.32-linux-x64.tar.gz'
+ARG dotnetLinuxComponent_50='https://dotnetcli.azureedge.net/dotnet/Runtime/5.0.17/dotnet-runtime-5.0.17-linux-x64.tar.gz'
+ARG dotnetLinuxComponentSHA512='4390ba65e592c4f770b247f11228bbd2ed70aab30fbe6613c2bf7ec0c7c54d09b5a47ff160d4424dacc59661613fd4c9460d62f141a64def02a7228dd160f916'
+ARG dotnetLinuxComponentSHA512_31='56c5e045844f5474a9a12b42e4a22c851985fac5690e227ce62b529d644c4faeaafdfe255de2f1e86a90c0c114e7de66ce4de1692fbf66357ac4d35341f933c3'
+ARG dotnetLinuxComponentSHA512_50='f47eec03d2b6777e78e2a993306727fa6871cf7f6e295ed70f684745a9f9fc960f0068750007519733426db52afa10e0bcd1c58879019d5d8f1f5f295868e4f3'
 ARG gitLFSLinuxComponentVersion='2.3.4-1'
 ARG gitLinuxComponentVersion='1:2.41.0-0ppa1~ubuntu18.04.1'
 ARG p4Version='2022.2-2468771'

diff --git a/context/generated/linux/Agent/Ubuntu/20.04/Dockerfile b/context/generated/linux/Agent/Ubuntu/20.04/Dockerfile
@@ -3,12 +3,12 @@ ARG containerdIoLinuxComponentVersion='1.4.12-1'
 ARG dockerComposeLinuxComponentVersion='1.28.5'
 ARG dockerLinuxComponentVersion='5:20.10.12~3-0~ubuntu'
 ARG dotnetLibs='libc6 libgcc1 libgssapi-krb5-2 libicu66 libssl1.1 libstdc++6 zlib1g'
-ARG dotnetLinuxComponent='https://dotnetcli.blob.core.windows.net/dotnet/Sdk/6.0.100/dotnet-sdk-6.0.100-linux-x64.tar.gz'
-ARG dotnetLinuxComponent_31='https://dotnetcli.azureedge.net/dotnet/Runtime/3.1.21/dotnet-runtime-3.1.21-linux-x64.tar.gz'
-ARG dotnetLinuxComponent_50='https://dotnetcli.azureedge.net/dotnet/Runtime/5.0.12/dotnet-runtime-5.0.12-linux-x64.tar.gz'
-ARG dotnetLinuxComponentSHA512='cb0d174a79d6294c302261b645dba6a479da8f7cf6c1fe15ae6998bc09c5e0baec810822f9e0104e84b0efd51fdc0333306cb2a0a6fcdbaf515a8ad8cf1af25b'
-ARG dotnetLinuxComponentSHA512_31='cc4b2fef46e94df88bf0fc11cb15439e79bd48da524561dffde80d3cd6db218133468ad2f6785803cf0c13f000d95ff71eb258cec76dd8eb809676ec1cb38fac'
-ARG dotnetLinuxComponentSHA512_50='32b5f86db3b1d4c21e3cf616d22f0e4a7374385dac0cf03cdebf3520dcf846460d9677ec1829a180920740a0237d64f6eaa2421d036a67f4fe9fb15d4f6b1db9'
+ARG dotnetLinuxComponent='https://dotnetcli.blob.core.windows.net/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-linux-x64.tar.gz'
+ARG dotnetLinuxComponent_31='https://dotnetcli.azureedge.net/dotnet/Runtime/3.1.32/dotnet-runtime-3.1.32-linux-x64.tar.gz'
+ARG dotnetLinuxComponent_50='https://dotnetcli.azureedge.net/dotnet/Runtime/5.0.17/dotnet-runtime-5.0.17-linux-x64.tar.gz'
+ARG dotnetLinuxComponentSHA512='4390ba65e592c4f770b247f11228bbd2ed70aab30fbe6613c2bf7ec0c7c54d09b5a47ff160d4424dacc59661613fd4c9460d62f141a64def02a7228dd160f916'
+ARG dotnetLinuxComponentSHA512_31='56c5e045844f5474a9a12b42e4a22c851985fac5690e227ce62b529d644c4faeaafdfe255de2f1e86a90c0c114e7de66ce4de1692fbf66357ac4d35341f933c3'
+ARG dotnetLinuxComponentSHA512_50='f47eec03d2b6777e78e2a993306727fa6871cf7f6e295ed70f684745a9f9fc960f0068750007519733426db52afa10e0bcd1c58879019d5d8f1f5f295868e4f3'
 ARG gitLFSLinuxComponentVersion='2.9.2-1'
 ARG gitLinuxComponentVersion='1:2.42.0-0ppa1~ubuntu20.04.1'
 ARG p4Version='2022.2-2468771'

diff --git a/context/generated/linux/Agent/UbuntuARM/18.04/Dockerfile b/context/generated/linux/Agent/UbuntuARM/18.04/Dockerfile
@@ -3,12 +3,12 @@ ARG containerdIoLinuxComponentVersion='1.4.12-1'
 ARG dockerComposeLinuxComponentVersion='1.28.5'
 ARG dockerLinuxComponentVersion='5:20.10.12~3-0~ubuntu'
 ARG dotnetLibs='libc6 libgcc1 libgssapi-krb5-2 libicu60 libssl1.1 libstdc++6 zlib1g'
-ARG dotnetLinuxARM64Component='https://dotnetcli.blob.core.windows.net/dotnet/Sdk/6.0.100/dotnet-sdk-6.0.100-linux-arm64.tar.gz'
-ARG dotnetLinuxARM64Component_31='https://dotnetcli.azureedge.net/dotnet/Runtime/3.1.21/dotnet-runtime-3.1.21-linux-arm64.tar.gz'
-ARG dotnetLinuxARM64Component_50='https://dotnetcli.azureedge.net/dotnet/Runtime/5.0.12/dotnet-runtime-5.0.12-linux-arm64.tar.gz'
-ARG dotnetLinuxARM64ComponentSHA512='e5983c1c599d6dc7c3c7496b9698e47c68247f04a5d0d1e3162969d071471297bce1c2fd3a1f9fb88645006c327ae79f880dcbdd8eefc9166fd717331f2716e7'
-ARG dotnetLinuxARM64ComponentSHA512_31='80971125650a2fa0163e39a2de98bc2e871c295b723559e6081a3ab59d99195aa5b794450f8182c5eb4e7e472ca1c13340ef1cc8a5588114c494bbb5981f19c4'
-ARG dotnetLinuxARM64ComponentSHA512_50='a8089fad8d21a4b582aa6c3d7162d56a21fee697fd400f050a772f67c2ace5e4196d1c4261d3e861d6dc2e5439666f112c406104d6271e5ab60cda80ef2ffc64'
+ARG dotnetLinuxARM64Component='https://dotnetcli.blob.core.windows.net/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-linux-arm64.tar.gz'
+ARG dotnetLinuxARM64Component_31='https://dotnetcli.azureedge.net/dotnet/Runtime/3.1.32/dotnet-runtime-3.1.32-linux-arm64.tar.gz'
+ARG dotnetLinuxARM64Component_50='https://dotnetcli.azureedge.net/dotnet/Runtime/5.0.17/dotnet-runtime-5.0.17-linux-arm64.tar.gz'
+ARG dotnetLinuxARM64ComponentSHA512='7f05a9774d79e694da5a6115d9916abf87a65e40bd6bdaa5dca1f705795436bc8e764242f7045207386a86732ef5519f60bdb516a3860e4860bca7ee91a21759'
+ARG dotnetLinuxARM64ComponentSHA512_31='ff311df0db488f3b5cc03c7f6724f8442de7e60fa0a503ec8f536361ce7a357ad26d09d2499d68c50ebdfa751a5520bba4aaa77a38b191c892d5a018561ce422'
+ARG dotnetLinuxARM64ComponentSHA512_50='99cb11871924d3abedcc9c8079c54bc0c550203c7cbe4e349ed70d4355f40e4620b68d90b797e6461d898c06bed6953580e2cd4ad01483e5de107ca5a3409610'
 ARG gitLFSLinuxComponentVersion='2.3.4-1'
 ARG gitLinuxComponentVersion='1:2.41.0-0ppa1~ubuntu18.04.1'
 ARG repo=''

diff --git a/context/generated/linux/Agent/UbuntuARM/20.04/Dockerfile b/context/generated/linux/Agent/UbuntuARM/20.04/Dockerfile
@@ -3,12 +3,12 @@ ARG containerdIoLinuxComponentVersion='1.4.12-1'
 ARG dockerComposeLinuxComponentVersion='1.28.5'
 ARG dockerLinuxComponentVersion='5:20.10.12~3-0~ubuntu'
 ARG dotnetLibs='libc6 libgcc1 libgssapi-krb5-2 libicu66 libssl1.1 libstdc++6 zlib1g'
-ARG dotnetLinuxARM64Component='https://dotnetcli.blob.core.windows.net/dotnet/Sdk/6.0.100/dotnet-sdk-6.0.100-linux-arm64.tar.gz'
-ARG dotnetLinuxARM64Component_31='https://dotnetcli.azureedge.net/dotnet/Runtime/3.1.21/dotnet-runtime-3.1.21-linux-arm64.tar.gz'
-ARG dotnetLinuxARM64Component_50='https://dotnetcli.azureedge.net/dotnet/Runtime/5.0.12/dotnet-runtime-5.0.12-linux-arm64.tar.gz'
-ARG dotnetLinuxARM64ComponentSHA512='e5983c1c599d6dc7c3c7496b9698e47c68247f04a5d0d1e3162969d071471297bce1c2fd3a1f9fb88645006c327ae79f880dcbdd8eefc9166fd717331f2716e7'
-ARG dotnetLinuxARM64ComponentSHA512_31='80971125650a2fa0163e39a2de98bc2e871c295b723559e6081a3ab59d99195aa5b794450f8182c5eb4e7e472ca1c13340ef1cc8a5588114c494bbb5981f19c4'
-ARG dotnetLinuxARM64ComponentSHA512_50='a8089fad8d21a4b582aa6c3d7162d56a21fee697fd400f050a772f67c2ace5e4196d1c4261d3e861d6dc2e5439666f112c406104d6271e5ab60cda80ef2ffc64'
+ARG dotnetLinuxARM64Component='https://dotnetcli.blob.core.windows.net/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-linux-arm64.tar.gz'
+ARG dotnetLinuxARM64Component_31='https://dotnetcli.azureedge.net/dotnet/Runtime/3.1.32/dotnet-runtime-3.1.32-linux-arm64.tar.gz'
+ARG dotnetLinuxARM64Component_50='https://dotnetcli.azureedge.net/dotnet/Runtime/5.0.17/dotnet-runtime-5.0.17-linux-arm64.tar.gz'
+ARG dotnetLinuxARM64ComponentSHA512='7f05a9774d79e694da5a6115d9916abf87a65e40bd6bdaa5dca1f705795436bc8e764242f7045207386a86732ef5519f60bdb516a3860e4860bca7ee91a21759'
+ARG dotnetLinuxARM64ComponentSHA512_31='ff311df0db488f3b5cc03c7f6724f8442de7e60fa0a503ec8f536361ce7a357ad26d09d2499d68c50ebdfa751a5520bba4aaa77a38b191c892d5a018561ce422'
+ARG dotnetLinuxARM64ComponentSHA512_50='99cb11871924d3abedcc9c8079c54bc0c550203c7cbe4e349ed70d4355f40e4620b68d90b797e6461d898c06bed6953580e2cd4ad01483e5de107ca5a3409610'
 ARG gitLFSLinuxComponentVersion='2.9.2-1'
 ARG gitLinuxComponentVersion='1:2.42.0-0ppa1~ubuntu20.04.1'
 ARG repo='https://hub.docker.com/r/jetbrains/'

diff --git a/context/generated/teamcity-agent-EAP-linux-18.04-sudo.cmd b/context/generated/teamcity-agent-EAP-linux-18.04-sudo.cmd
@@ -1,10 +1,10 @@
-cd ../..
-docker pull ubuntu:18.04
-echo TeamCity/webapps > context/.dockerignore
-echo TeamCity/devPackage >> context/.dockerignore
-echo TeamCity/lib >> context/.dockerignore
-docker build -f "context/generated/linux/MinimalAgent/Ubuntu/18.04/Dockerfile" -t teamcity-minimal-agent:EAP-linux-18.04 "context"
-echo 2> context/.dockerignore
-echo TeamCity >> context/.dockerignore
-docker build -f "context/generated/linux/Agent/Ubuntu/18.04/Dockerfile" -t teamcity-agent:EAP-linux-18.04 "context"
+cd ../..
+docker pull ubuntu:18.04
+echo TeamCity/webapps > context/.dockerignore
+echo TeamCity/devPackage >> context/.dockerignore
+echo TeamCity/lib >> context/.dockerignore
+docker build -f "context/generated/linux/MinimalAgent/Ubuntu/18.04/Dockerfile" -t teamcity-minimal-agent:EAP-linux-18.04 "context"
+echo 2> context/.dockerignore
+echo TeamCity >> context/.dockerignore
+docker build -f "context/generated/linux/Agent/Ubuntu/18.04/Dockerfile" -t teamcity-agent:EAP-linux-18.04 "context"
 docker build -f "context/generated/linux/Agent/Ubuntu/18.04-sudo/Dockerfile" -t teamcity-agent:EAP-linux-18.04-sudo "context"
diff --git a/context/generated/teamcity-agent-EAP-linux-18.04.cmd b/context/generated/teamcity-agent-EAP-linux-18.04.cmd
@@ -1,9 +1,9 @@
-cd ../..
-docker pull ubuntu:18.04
-echo TeamCity/webapps > context/.dockerignore
-echo TeamCity/devPackage >> context/.dockerignore
-echo TeamCity/lib >> context/.dockerignore
-docker build -f "context/generated/linux/MinimalAgent/Ubuntu/18.04/Dockerfile" -t teamcity-minimal-agent:EAP-linux-18.04 "context"
-echo 2> context/.dockerignore
-echo TeamCity >> context/.dockerignore
+cd ../..
+docker pull ubuntu:18.04
+echo TeamCity/webapps > context/.dockerignore
+echo TeamCity/devPackage >> context/.dockerignore
+echo TeamCity/lib >> context/.dockerignore
+docker build -f "context/generated/linux/MinimalAgent/Ubuntu/18.04/Dockerfile" -t teamcity-minimal-agent:EAP-linux-18.04 "context"
+echo 2> context/.dockerignore
+echo TeamCity >> context/.dockerignore
 docker build -f "context/generated/linux/Agent/Ubuntu/18.04/Dockerfile" -t teamcity-agent:EAP-linux-18.04 "context"