diff --git a/configs/linux.config b/configs/linux.config index 98539354..8d8c5193 100644 --- a/configs/linux.config +++ b/configs/linux.config @@ -18,8 +18,8 @@ dotnetLinuxComponentName=${dotnetComponentName} x86 Checksum (SHA512) ${dotnetLi # https://packages.ubuntu.com/focal/git # http://ppa.launchpad.net/git-core/ppa/ubuntu/dists/focal/main/binary-amd64/ -gitLinuxComponentVersion=1:2.43.0-0ppa1~ubuntu20.04.1 -gitLinuxComponentName=Git v.2.43.0 +gitLinuxComponentVersion=1:2.43.2-0ppa1~ubuntu20.04.1 +gitLinuxComponentName=Git v.2.43.2 # https://packages.ubuntu.com/focal/git-lfs gitLFSLinuxComponentVersion=2.9.2-1 diff --git a/context/generated/linux/Agent/Ubuntu/20.04/Dockerfile b/context/generated/linux/Agent/Ubuntu/20.04/Dockerfile index c38126c7..f5f486f2 100644 --- a/context/generated/linux/Agent/Ubuntu/20.04/Dockerfile +++ b/context/generated/linux/Agent/Ubuntu/20.04/Dockerfile @@ -6,7 +6,7 @@ ARG dotnetLibs='libc6 libgcc1 libgssapi-krb5-2 libicu66 libssl1.1 libstdc++6 zli ARG dotnetLinuxComponent='https://dotnetcli.blob.core.windows.net/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-linux-x64.tar.gz' ARG dotnetLinuxComponentSHA512='ee0a77d54e6d4917be7310ff0abb3bad5525bfb4beb1db0c215e65f64eb46511f5f12d6c7ff465a1d4ab38577e6a1950fde479ee94839c50e627020328a702de' ARG gitLFSLinuxComponentVersion='2.9.2-1' -ARG gitLinuxComponentVersion='1:2.43.0-0ppa1~ubuntu20.04.1' +ARG gitLinuxComponentVersion='1:2.43.2-0ppa1~ubuntu20.04.1' ARG p4Version='2022.2-2531894' ARG repo='https://hub.docker.com/r/jetbrains/' ARG teamcityMinimalAgentImage='teamcity-minimal-agent:EAP-linux' diff --git a/context/generated/linux/Agent/UbuntuARM/20.04/Dockerfile b/context/generated/linux/Agent/UbuntuARM/20.04/Dockerfile index 2f46caa8..d72b9034 100644 --- a/context/generated/linux/Agent/UbuntuARM/20.04/Dockerfile +++ b/context/generated/linux/Agent/UbuntuARM/20.04/Dockerfile @@ -6,7 +6,7 @@ ARG dotnetLibs='libc6 libgcc1 libgssapi-krb5-2 libicu66 libssl1.1 libstdc++6 zli ARG dotnetLinuxARM64Component='https://dotnetcli.blob.core.windows.net/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-linux-arm64.tar.gz' ARG dotnetLinuxARM64ComponentSHA512='7f05a9774d79e694da5a6115d9916abf87a65e40bd6bdaa5dca1f705795436bc8e764242f7045207386a86732ef5519f60bdb516a3860e4860bca7ee91a21759' ARG gitLFSLinuxComponentVersion='2.9.2-1' -ARG gitLinuxComponentVersion='1:2.43.0-0ppa1~ubuntu20.04.1' +ARG gitLinuxComponentVersion='1:2.43.2-0ppa1~ubuntu20.04.1' ARG repo='https://hub.docker.com/r/jetbrains/' ARG teamcityMinimalAgentImage='teamcity-minimal-agent:EAP-linux-arm64' diff --git a/context/generated/linux/Server/Ubuntu/20.04/Dockerfile b/context/generated/linux/Server/Ubuntu/20.04/Dockerfile index f7b39165..dd8d85fe 100644 --- a/context/generated/linux/Server/Ubuntu/20.04/Dockerfile +++ b/context/generated/linux/Server/Ubuntu/20.04/Dockerfile @@ -1,6 +1,6 @@ # Default arguments ARG gitLFSLinuxComponentVersion='2.9.2-1' -ARG gitLinuxComponentVersion='1:2.43.0-0ppa1~ubuntu20.04.1' +ARG gitLinuxComponentVersion='1:2.43.2-0ppa1~ubuntu20.04.1' ARG jdkServerLinuxComponent='https://corretto.aws/downloads/resources/17.0.7.7.1/amazon-corretto-17.0.7.7.1-linux-x64.tar.gz' ARG jdkServerLinuxComponentMD5SUM='443750a02c28ff2807c80032ee2e8ebc' ARG p4Version='2022.2-2531894' diff --git a/context/generated/linux/Server/UbuntuARM/20.04/Dockerfile b/context/generated/linux/Server/UbuntuARM/20.04/Dockerfile index 250ba6e1..8e58f40a 100644 --- a/context/generated/linux/Server/UbuntuARM/20.04/Dockerfile +++ b/context/generated/linux/Server/UbuntuARM/20.04/Dockerfile @@ -1,6 +1,6 @@ # Default arguments ARG gitLFSLinuxComponentVersion='2.9.2-1' -ARG gitLinuxComponentVersion='1:2.43.0-0ppa1~ubuntu20.04.1' +ARG gitLinuxComponentVersion='1:2.43.2-0ppa1~ubuntu20.04.1' ARG jdkServerLinuxARM64Component='https://corretto.aws/downloads/resources/17.0.7.7.1/amazon-corretto-17.0.7.7.1-linux-aarch64.tar.gz' ARG jdkServerLinuxARM64ComponentMD5SUM='c55e3d0615fac07f948ac3adaed818e9' ARG repo='' diff --git a/context/generated/teamcity-agent.md b/context/generated/teamcity-agent.md index 3cd46ba3..f249a713 100644 --- a/context/generated/teamcity-agent.md +++ b/context/generated/teamcity-agent.md @@ -91,7 +91,7 @@ Installed components: - [JDK Amazon Corretto x64 v.17.0.7.7.1 Checksum (MD5) 443750a02c28ff2807c80032ee2e8ebc](https://corretto.aws/downloads/resources/17.0.7.7.1/amazon-corretto-17.0.7.7.1-linux-x64.tar.gz) - [Python venv](https://docs.python.org/3/library/venv.html#module-venv) - Git LFS v.2.9.2 -- Git v.2.43.0 +- Git v.2.43.2 - Mercurial - [Docker v.5:20.10.12](https://github.com/docker/cli/releases/tag/v20.10.12) - [Docker Compose v.1.28.5](https://github.com/docker/compose/releases/tag/1.28.5) @@ -130,7 +130,7 @@ Installed components: - [JDK Amazon Corretto aarch64 v.17.0.7.7.1 Checksum (MD5) c55e3d0615fac07f948ac3adaed818e9](https://corretto.aws/downloads/resources/17.0.7.7.1/amazon-corretto-17.0.7.7.1-linux-aarch64.tar.gz) - [Python venv](https://docs.python.org/3/library/venv.html#module-venv) -- Git v.2.43.0 +- Git v.2.43.2 - Git LFS v.2.9.2 - Mercurial - [Docker v.5:20.10.12](https://github.com/docker/cli/releases/tag/v20.10.12) @@ -170,7 +170,7 @@ Installed components: - [JDK Amazon Corretto aarch64 v.17.0.7.7.1 Checksum (MD5) c55e3d0615fac07f948ac3adaed818e9](https://corretto.aws/downloads/resources/17.0.7.7.1/amazon-corretto-17.0.7.7.1-linux-aarch64.tar.gz) - [Python venv](https://docs.python.org/3/library/venv.html#module-venv) -- Git v.2.43.0 +- Git v.2.43.2 - Git LFS v.2.9.2 - Mercurial - [Docker v.5:20.10.12](https://github.com/docker/cli/releases/tag/v20.10.12) @@ -212,7 +212,7 @@ Installed components: - [JDK Amazon Corretto x64 v.17.0.7.7.1 Checksum (MD5) 443750a02c28ff2807c80032ee2e8ebc](https://corretto.aws/downloads/resources/17.0.7.7.1/amazon-corretto-17.0.7.7.1-linux-x64.tar.gz) - [Python venv](https://docs.python.org/3/library/venv.html#module-venv) - Git LFS v.2.9.2 -- Git v.2.43.0 +- Git v.2.43.2 - Mercurial - [Docker v.5:20.10.12](https://github.com/docker/cli/releases/tag/v20.10.12) - [Docker Compose v.1.28.5](https://github.com/docker/compose/releases/tag/1.28.5) @@ -430,7 +430,7 @@ Installed components: - [JDK Amazon Corretto x64 v.17.0.7.7.1 Checksum (MD5) 443750a02c28ff2807c80032ee2e8ebc](https://corretto.aws/downloads/resources/17.0.7.7.1/amazon-corretto-17.0.7.7.1-linux-x64.tar.gz) - [Python venv](https://docs.python.org/3/library/venv.html#module-venv) - Git LFS v.2.9.2 -- Git v.2.43.0 +- Git v.2.43.2 - Mercurial - [Docker v.5:20.10.12](https://github.com/docker/cli/releases/tag/v20.10.12) - [Docker Compose v.1.28.5](https://github.com/docker/compose/releases/tag/1.28.5) @@ -504,7 +504,7 @@ Installed components: - [JDK Amazon Corretto aarch64 v.17.0.7.7.1 Checksum (MD5) c55e3d0615fac07f948ac3adaed818e9](https://corretto.aws/downloads/resources/17.0.7.7.1/amazon-corretto-17.0.7.7.1-linux-aarch64.tar.gz) - [Python venv](https://docs.python.org/3/library/venv.html#module-venv) -- Git v.2.43.0 +- Git v.2.43.2 - Git LFS v.2.9.2 - Mercurial - [Docker v.5:20.10.12](https://github.com/docker/cli/releases/tag/v20.10.12) diff --git a/context/generated/teamcity-server.md b/context/generated/teamcity-server.md index c195fa2a..ea4c4269 100644 --- a/context/generated/teamcity-server.md +++ b/context/generated/teamcity-server.md @@ -65,7 +65,7 @@ The docker image is available on: Installed components: - [JDK Amazon Corretto x64 v.17.0.7.7.1 Checksum (MD5) 443750a02c28ff2807c80032ee2e8ebc](https://corretto.aws/downloads/resources/17.0.7.7.1/amazon-corretto-17.0.7.7.1-linux-x64.tar.gz) -- Git v.2.43.0 +- Git v.2.43.2 - Git LFS v.2.9.2 - Perforce Helix Core client (p4) [2022.2-2531894](https://www.perforce.com/products/helix-core) @@ -177,7 +177,7 @@ The docker image is not available and may be created manually. Installed components: - [JDK Amazon Corretto aarch64 v.17.0.7.7.1 Checksum (MD5) c55e3d0615fac07f948ac3adaed818e9](https://corretto.aws/downloads/resources/17.0.7.7.1/amazon-corretto-17.0.7.7.1-linux-aarch64.tar.gz) -- Git v.2.43.0 +- Git v.2.43.2 - Git LFS v.2.9.2 Container platform: linux diff --git a/context/generated/windows/Agent/windowsservercore/2004/Dockerfile b/context/generated/windows/Agent/windowsservercore/2004/Dockerfile deleted file mode 100644 index 9f0b3d86..00000000 --- a/context/generated/windows/Agent/windowsservercore/2004/Dockerfile +++ /dev/null @@ -1,98 +0,0 @@ -# Default arguments -ARG dotnetWindowsComponent='https://dotnetcli.blob.core.windows.net/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-win-x64.zip' -ARG dotnetWindowsComponentSHA512='a9e1bbb52484ad0667b258451ebb6b47ce6c7b788c015aee8a86c5e0c4dcf4ee8c82d796921869d64c92bb2afef2c7ceea09cfe255d8519d48f2471a098c361e' -ARG gitWindowsComponent='https://github.com/git-for-windows/git/releases/download/v2.43.0.windows.1/MinGit-2.43.0-64-bit.zip' -ARG gitWindowsComponentSHA256='1905d93068e986258fafc69517df8fddff829bb2a289c1fa4dcc6cdf720ddf36' -ARG jdkWindowsComponent='https://corretto.aws/downloads/resources/17.0.7.7.1/amazon-corretto-17.0.7.7.1-windows-x64-jdk.zip' -ARG jdkWindowsComponentMD5SUM='feb7eab99c647a0b4347be9f0a3276de' -ARG mercurialWindowsComponent='https://www.mercurial-scm.org/release/windows/mercurial-5.9.1-x64.msi' -ARG teamcityMinimalAgentImage='teamcity-minimal-agent:2023.11-nanoserver-2004' -ARG windowsservercoreImage='mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-2004' - -# The list of required arguments -# ARG windowsservercoreImage -# ARG dotnetWindowsComponent -# ARG dotnetWindowsComponentSHA512 -# ARG jdkWindowsComponent -# ARG jdkWindowsComponentMD5SUM -# ARG gitWindowsComponent -# ARG gitWindowsComponentSHA256 -# ARG mercurialWindowsComponentName -# ARG teamcityMinimalAgentImage - - - - -FROM ${teamcityMinimalAgentImage} AS buildagent - -ARG windowsservercoreImage -FROM ${windowsservercoreImage} - -COPY scripts/*.cs /scripts/ - -# PowerShell -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -ARG dotnetWindowsComponent -ARG dotnetWindowsComponentSHA512 -ARG jdkWindowsComponent -ARG jdkWindowsComponentMD5SUM -ARG gitWindowsComponent -ARG gitWindowsComponentSHA256 -ARG mercurialWindowsComponent - -RUN [Net.ServicePointManager]::SecurityProtocol = 'tls12, tls11, tls' ; \ - $code = Get-Content -Path "scripts/Web.cs" -Raw ; \ - Add-Type -IgnoreWarnings -TypeDefinition "$code" -Language CSharp ; \ - $downloadScript = [Scripts.Web]::DownloadFiles($Env:jdkWindowsComponent + '#MD5#' + $Env:jdkWindowsComponentMD5SUM, 'jdk.zip', $Env:gitWindowsComponent + '#SHA256#' + $Env:gitWindowsComponentSHA256, 'git.zip', $Env:mercurialWindowsComponent, 'hg.msi', $Env:dotnetWindowsComponent + '#SHA512#' + $Env:dotnetWindowsComponentSHA512, 'dotnet.zip') ; \ - Remove-Item -Force -Recurse $Env:ProgramFiles\dotnet; \ -# .NET 6.0, .NET Framework 4 is inherited from base image - Expand-Archive dotnet.zip -Force -DestinationPath $Env:ProgramFiles\dotnet; \ - Remove-Item -Force dotnet.zip; \ - Get-ChildItem -Path $Env:ProgramFiles\dotnet -Include *.lzma -File -Recurse | foreach { $_.Delete()}; \ -# JDK - Expand-Archive jdk.zip -DestinationPath $Env:ProgramFiles\Java ; \ - Get-ChildItem $Env:ProgramFiles\Java | Rename-Item -NewName "OpenJDK" ; \ - Remove-Item $Env:ProgramFiles\Java\OpenJDK\lib\src.zip -Force ; \ - Remove-Item -Force jdk.zip ; \ -# Git - $gitPath = $Env:ProgramFiles + '\Git'; \ - Expand-Archive git.zip -DestinationPath $gitPath ; \ - Remove-Item -Force git.zip ; \ - # avoid circular dependencies in gitconfig - $gitConfigFile = $gitPath + '\etc\gitconfig'; \ - $configContent = Get-Content $gitConfigFile; \ - $configContent = $configContent.Replace('path = C:/Program Files/Git/etc/gitconfig', ''); \ - Set-Content $gitConfigFile $configContent; \ -# Mercirual - Start-Process msiexec -Wait -ArgumentList /q, /i, hg.msi ; \ - Remove-Item -Force hg.msi - -COPY --from=buildagent /BuildAgent /BuildAgent - -EXPOSE 9090 - -VOLUME C:/BuildAgent/conf - -CMD ["powershell", "./BuildAgent/run-agent.ps1"] - - # Configuration file for TeamCity agent -ENV CONFIG_FILE="C:/BuildAgent/conf/buildAgent.properties" \ - # Java home directory - JAVA_HOME="C:\Program Files\Java\OpenJDK" \ - # Opt out of the telemetry feature - DOTNET_CLI_TELEMETRY_OPTOUT=true \ - # Disable first time experience - DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true \ - # Configure Kestrel web server to bind to port 80 when present - ASPNETCORE_URLS=http://+:80 \ - # Enable detection of running in a container - DOTNET_RUNNING_IN_CONTAINER=true \ - # Enable correct mode for dotnet watch (only mode supported in a container) - DOTNET_USE_POLLING_FILE_WATCHER=true \ - # Skip extraction of XML docs - generally not useful within an image/container - helps perfomance - NUGET_XMLDOC_MODE=skip - -USER ContainerAdministrator -RUN setx /M PATH ('{0};{1}\bin;C:\Program Files\Git\cmd;C:\Program Files\Mercurial' -f $env:PATH, $env:JAVA_HOME) -USER ContainerUser