diff --git a/configs/linux.config b/configs/linux.config index 614c3a41a..029aee8c4 100644 --- a/configs/linux.config +++ b/configs/linux.config @@ -18,15 +18,15 @@ 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.47.0-0ppa2~ubuntu20.04.1 +gitLinuxComponentVersion=1:2.47.0-0ppa2~ubuntu22.04.1 gitLinuxComponentName=Git v.2.47.0 # https://packages.ubuntu.com/focal/git-lfs -gitLFSLinuxComponentVersion=2.9.2-1 -gitLFSLinuxComponentName=Git LFS v.2.9.2 +gitLFSLinuxComponentVersion=3.0.2-1 +gitLFSLinuxComponentName=Git LFS v.3.0.2-1 -dockerLinuxComponentVersion=5:24.0.9-1~ubuntu -dockerLinuxComponentName=[Docker v.5:24.0.9](https://docs.docker.com/engine/release-notes/24.0) +dockerLinuxComponentVersion=5:27.3.1-1~ubuntu +dockerLinuxComponentName=[Docker v.27.3.1](https://docs.docker.com/engine/release-notes/27) containerdIoLinuxComponentName=[Containerd.io v1.6.28-2](https://github.com/containerd/containerd/releases/tag/v1.6.28) containerdIoLinuxComponentVersion=1.6.28-2 diff --git a/configs/linux/Agent/Ubuntu/22.04-sudo/Ubuntu-sudo.Dockerfile.config b/configs/linux/Agent/Ubuntu/22.04-sudo/Ubuntu-sudo.Dockerfile.config new file mode 100644 index 000000000..283243967 --- /dev/null +++ b/configs/linux/Agent/Ubuntu/22.04-sudo/Ubuntu-sudo.Dockerfile.config @@ -0,0 +1,3 @@ +linuxVersion= +repo=https://hub.docker.com/r/jetbrains/ +teamcityAgentImage=teamcity-agent:${versionTag}-linux \ No newline at end of file diff --git a/configs/linux/Agent/Ubuntu/22.04/Ubuntu.Dockerfile.config b/configs/linux/Agent/Ubuntu/22.04/Ubuntu.Dockerfile.config new file mode 100644 index 000000000..54f53a7f3 --- /dev/null +++ b/configs/linux/Agent/Ubuntu/22.04/Ubuntu.Dockerfile.config @@ -0,0 +1,4 @@ +linuxVersion= +repo=https://hub.docker.com/r/jetbrains/ +teamcityMinimalAgentImage=teamcity-minimal-agent:${versionTag}-linux +dotnetLibs=libc6 libgcc1 libgssapi-krb5-2 libicu70 libssl3 libstdc++6 zlib1g diff --git a/configs/linux/Agent/UbuntuARM/22.04-sudo/UbuntuARM-sudo.Dockerfile.config b/configs/linux/Agent/UbuntuARM/22.04-sudo/UbuntuARM-sudo.Dockerfile.config new file mode 100644 index 000000000..d932bf465 --- /dev/null +++ b/configs/linux/Agent/UbuntuARM/22.04-sudo/UbuntuARM-sudo.Dockerfile.config @@ -0,0 +1,3 @@ +linuxVersion=-arm64 +repo=https://hub.docker.com/r/jetbrains/ +teamcityAgentImage=teamcity-agent:${versionTag}-linux${linuxVersion} \ No newline at end of file diff --git a/configs/linux/Agent/UbuntuARM/22.04/UbuntuARM.Dockerfile.config b/configs/linux/Agent/UbuntuARM/22.04/UbuntuARM.Dockerfile.config new file mode 100644 index 000000000..4bfebeebd --- /dev/null +++ b/configs/linux/Agent/UbuntuARM/22.04/UbuntuARM.Dockerfile.config @@ -0,0 +1,4 @@ +linuxVersion=-arm64 +repo=https://hub.docker.com/r/jetbrains/ +teamcityMinimalAgentImage=teamcity-minimal-agent:${versionTag}-linux${linuxVersion} +dotnetLibs=libc6 libgcc1 libgssapi-krb5-2 libicu70 libssl3 libstdc++6 zlib1g diff --git a/configs/linux/MinimalAgent/Ubuntu/22.04/Ubuntu.Dockerfile.config b/configs/linux/MinimalAgent/Ubuntu/22.04/Ubuntu.Dockerfile.config new file mode 100644 index 000000000..3ecb88e3d --- /dev/null +++ b/configs/linux/MinimalAgent/Ubuntu/22.04/Ubuntu.Dockerfile.config @@ -0,0 +1,4 @@ +linuxVersion= +repo=https://hub.docker.com/r/jetbrains/ +# https://hub.docker.com/_/ubuntu/ +ubuntuImage=ubuntu:22.04 \ No newline at end of file diff --git a/configs/linux/MinimalAgent/UbuntuARM/22.04/UbuntuARM.Dockerfile.config b/configs/linux/MinimalAgent/UbuntuARM/22.04/UbuntuARM.Dockerfile.config new file mode 100644 index 000000000..bb15dddbf --- /dev/null +++ b/configs/linux/MinimalAgent/UbuntuARM/22.04/UbuntuARM.Dockerfile.config @@ -0,0 +1,4 @@ +linuxVersion=-arm64 +repo= +# https://hub.docker.com/_/ubuntu/ +ubuntuImage=ubuntu:22.04 diff --git a/configs/linux/Server/Ubuntu/22.04/Ubuntu.Dockerfile.config b/configs/linux/Server/Ubuntu/22.04/Ubuntu.Dockerfile.config new file mode 100644 index 000000000..3ecb88e3d --- /dev/null +++ b/configs/linux/Server/Ubuntu/22.04/Ubuntu.Dockerfile.config @@ -0,0 +1,4 @@ +linuxVersion= +repo=https://hub.docker.com/r/jetbrains/ +# https://hub.docker.com/_/ubuntu/ +ubuntuImage=ubuntu:22.04 \ No newline at end of file diff --git a/configs/linux/Server/UbuntuARM/22.04/UbuntuARM.Dockerfile.config b/configs/linux/Server/UbuntuARM/22.04/UbuntuARM.Dockerfile.config new file mode 100644 index 000000000..3afb80525 --- /dev/null +++ b/configs/linux/Server/UbuntuARM/22.04/UbuntuARM.Dockerfile.config @@ -0,0 +1,5 @@ +linuxVersion=-arm64 +repo= +# https://hub.docker.com/_/ubuntu/ +ubuntuImage=ubuntu:22.04 + diff --git a/context/generated/linux/Agent/Ubuntu/18.04/Dockerfile b/context/generated/linux/Agent/Ubuntu/18.04/Dockerfile index a978f6e7b..415ac937e 100644 --- a/context/generated/linux/Agent/Ubuntu/18.04/Dockerfile +++ b/context/generated/linux/Agent/Ubuntu/18.04/Dockerfile @@ -1,6 +1,6 @@ # Default arguments ARG containerdIoLinuxComponentVersion='1.6.28-2' -ARG dockerLinuxComponentVersion='5:24.0.9-1~ubuntu' +ARG dockerLinuxComponentVersion='5:27.3.1-1~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.413/dotnet-sdk-6.0.413-linux-x64.tar.gz' ARG dotnetLinuxComponentSHA512='ee0a77d54e6d4917be7310ff0abb3bad5525bfb4beb1db0c215e65f64eb46511f5f12d6c7ff465a1d4ab38577e6a1950fde479ee94839c50e627020328a702de' diff --git a/context/generated/linux/Agent/Ubuntu/20.04/Dockerfile b/context/generated/linux/Agent/Ubuntu/20.04/Dockerfile index 4655c774d..da776c0be 100644 --- a/context/generated/linux/Agent/Ubuntu/20.04/Dockerfile +++ b/context/generated/linux/Agent/Ubuntu/20.04/Dockerfile @@ -1,11 +1,11 @@ # Default arguments ARG containerdIoLinuxComponentVersion='1.6.28-2' -ARG dockerLinuxComponentVersion='5:24.0.9-1~ubuntu' +ARG dockerLinuxComponentVersion='5:27.3.1-1~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.413/dotnet-sdk-6.0.413-linux-x64.tar.gz' ARG dotnetLinuxComponentSHA512='ee0a77d54e6d4917be7310ff0abb3bad5525bfb4beb1db0c215e65f64eb46511f5f12d6c7ff465a1d4ab38577e6a1950fde479ee94839c50e627020328a702de' -ARG gitLFSLinuxComponentVersion='2.9.2-1' -ARG gitLinuxComponentVersion='1:2.47.0-0ppa2~ubuntu20.04.1' +ARG gitLFSLinuxComponentVersion='3.0.2-1' +ARG gitLinuxComponentVersion='1:2.47.0-0ppa2~ubuntu22.04.1' ARG p4Version='2022.2-2637361' ARG repo='https://hub.docker.com/r/jetbrains/' ARG teamcityMinimalAgentImage='teamcity-minimal-agent:EAP-linux' diff --git a/context/generated/linux/Agent/Ubuntu/22.04-sudo/Dockerfile b/context/generated/linux/Agent/Ubuntu/22.04-sudo/Dockerfile new file mode 100644 index 000000000..368ade583 --- /dev/null +++ b/context/generated/linux/Agent/Ubuntu/22.04-sudo/Dockerfile @@ -0,0 +1,21 @@ +# Default arguments +ARG teamcityAgentImage='teamcity-agent:EAP-linux' + +# The list of required arguments +# ARG teamcityAgentImage + + + + +FROM ${teamcityAgentImage} + +USER root + +RUN apt-get update && \ + apt-get install -y --no-install-recommends sudo && \ + # https://github.com/goodwithtech/dockle/blob/master/CHECKPOINT.md#dkl-di-0005 + apt-get clean && rm -rf /var/lib/apt/lists/* && \ + echo 'buildagent ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers && \ + rm -rf /var/lib/apt/lists/* + +USER buildagent diff --git a/context/generated/linux/Agent/Ubuntu/22.04/Dockerfile b/context/generated/linux/Agent/Ubuntu/22.04/Dockerfile new file mode 100644 index 000000000..cb3689a08 --- /dev/null +++ b/context/generated/linux/Agent/Ubuntu/22.04/Dockerfile @@ -0,0 +1,112 @@ +# Default arguments +ARG containerdIoLinuxComponentVersion='1.6.28-2' +ARG dockerLinuxComponentVersion='5:27.3.1-1~ubuntu' +ARG dotnetLibs='libc6 libgcc1 libgssapi-krb5-2 libicu70 libssl3 libstdc++6 zlib1g' +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='3.0.2-1' +ARG gitLinuxComponentVersion='1:2.47.0-0ppa2~ubuntu22.04.1' +ARG p4Version='2022.2-2637361' +ARG repo='https://hub.docker.com/r/jetbrains/' +ARG teamcityMinimalAgentImage='teamcity-minimal-agent:EAP-linux' + +# The list of required arguments +# ARG dotnetLinuxComponent +# ARG dotnetLinuxComponentSHA512 +# ARG teamcityMinimalAgentImage +# ARG dotnetLibs +# ARG gitLinuxComponentVersion +# ARG gitLFSLinuxComponentVersion +# ARG dockerLinuxComponentVersion + + + + + + +FROM ${teamcityMinimalAgentImage} + +USER root + +COPY run-docker.sh /services/run-docker.sh + +ARG dotnetCoreLinuxComponentVersion + + # Opt out of the telemetry feature +ENV 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 \ + GIT_SSH_VARIANT=ssh \ + DOTNET_SDK_VERSION=${dotnetCoreLinuxComponentVersion} + +ARG dotnetLinuxComponent +ARG dotnetLinuxComponentSHA512 +ARG dotnetLibs +ARG gitLinuxComponentVersion +ARG gitLFSLinuxComponentVersion +ARG dockerLinuxComponentVersion +ARG containerdIoLinuxComponentVersion +ARG p4Version + +RUN apt-get update && \ + apt-get install -y mercurial apt-transport-https software-properties-common && \ + add-apt-repository ppa:git-core/ppa -y && \ + apt-get install -y git=${gitLinuxComponentVersion} git-lfs=${gitLFSLinuxComponentVersion} && \ + git lfs install --system && \ + # https://github.com/goodwithtech/dockle/blob/master/CHECKPOINT.md#dkl-di-0005 + apt-get clean && rm -rf /var/lib/apt/lists/* && \ +# Perforce (p4 CLI) + apt-key adv --fetch-keys https://package.perforce.com/perforce.pubkey && \ + (. /etc/os-release && \ + echo "deb http://package.perforce.com/apt/$ID $VERSION_CODENAME release" > \ + /etc/apt/sources.list.d/perforce.list ) && \ + apt-get update && \ + (. /etc/os-release && apt-get install -y helix-cli-base="${p4Version}~$VERSION_CODENAME" helix-cli="${p4Version}~$VERSION_CODENAME" ) && \ + # https://github.com/goodwithtech/dockle/blob/master/CHECKPOINT.md#dkl-di-0005 + apt-get clean && rm -rf /var/lib/apt/lists/* && \ + # Docker & ContainerD + curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - && \ + add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" && \ + apt-cache policy docker-ce && \ + apt-get update && \ + # docker-ce, docker-ce-cli package name format: "25.0.5-1~ubuntu.20.04~focal" + apt-get install -y docker-ce=${dockerLinuxComponentVersion}.$(lsb_release -rs)~$(lsb_release -cs) \ + docker-ce-cli=${dockerLinuxComponentVersion}.$(lsb_release -rs)~$(lsb_release -cs) \ + containerd.io:amd64=${containerdIoLinuxComponentVersion} \ + systemd && \ + systemctl disable docker && \ + sed -i -e 's/\r$//' /services/run-docker.sh && \ +# Dotnet + apt-get install -y --no-install-recommends ${dotnetLibs} && \ + # https://github.com/goodwithtech/dockle/blob/master/CHECKPOINT.md#dkl-di-0005 + apt-get clean && rm -rf /var/lib/apt/lists/* && \ + mkdir -p /usr/share/dotnet && \ +# .NET 6.0 + curl -SL ${dotnetLinuxComponent} --output /tmp/dotnet.tar.gz && \ + echo "Downloaded .NET 6.0 (Linux AMD64) checksum: $(sha512sum tmp/dotnet.tar.gz)" && \ + echo "${dotnetLinuxComponentSHA512} */tmp/dotnet.tar.gz" | sha512sum -c -; \ + tar -zxf /tmp/dotnet.tar.gz -C /usr/share/dotnet && \ + rm /tmp/dotnet.tar.gz && \ + find /usr/share/dotnet -name "*.lzma" -type f -delete && \ + ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet && \ +# Trigger .NET CLI first run experience by running arbitrary cmd to populate local package cache + dotnet help && \ + dotnet --info && \ +# Other + apt-get clean && rm -rf /var/lib/apt/lists/* && \ + chown -R buildagent:buildagent /services && \ + usermod -aG docker buildagent + +# A better fix for TW-52939 Dockerfile build fails because of aufs +VOLUME /var/lib/docker + +USER buildagent + diff --git a/context/generated/linux/Agent/UbuntuARM/18.04/Dockerfile b/context/generated/linux/Agent/UbuntuARM/18.04/Dockerfile index 22de136b2..8afccea4c 100644 --- a/context/generated/linux/Agent/UbuntuARM/18.04/Dockerfile +++ b/context/generated/linux/Agent/UbuntuARM/18.04/Dockerfile @@ -1,6 +1,6 @@ # Default arguments ARG containerdIoLinuxComponentVersion='1.6.28-2' -ARG dockerLinuxComponentVersion='5:24.0.9-1~ubuntu' +ARG dockerLinuxComponentVersion='5:27.3.1-1~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.413/dotnet-sdk-6.0.413-linux-arm64.tar.gz' ARG dotnetLinuxARM64ComponentSHA512='7f05a9774d79e694da5a6115d9916abf87a65e40bd6bdaa5dca1f705795436bc8e764242f7045207386a86732ef5519f60bdb516a3860e4860bca7ee91a21759' diff --git a/context/generated/linux/Agent/UbuntuARM/20.04/Dockerfile b/context/generated/linux/Agent/UbuntuARM/20.04/Dockerfile index a2624f14a..4f56dfeb6 100644 --- a/context/generated/linux/Agent/UbuntuARM/20.04/Dockerfile +++ b/context/generated/linux/Agent/UbuntuARM/20.04/Dockerfile @@ -1,11 +1,11 @@ # Default arguments ARG containerdIoLinuxComponentVersion='1.6.28-2' -ARG dockerLinuxComponentVersion='5:24.0.9-1~ubuntu' +ARG dockerLinuxComponentVersion='5:27.3.1-1~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.413/dotnet-sdk-6.0.413-linux-arm64.tar.gz' ARG dotnetLinuxARM64ComponentSHA512='7f05a9774d79e694da5a6115d9916abf87a65e40bd6bdaa5dca1f705795436bc8e764242f7045207386a86732ef5519f60bdb516a3860e4860bca7ee91a21759' -ARG gitLFSLinuxComponentVersion='2.9.2-1' -ARG gitLinuxComponentVersion='1:2.47.0-0ppa2~ubuntu20.04.1' +ARG gitLFSLinuxComponentVersion='3.0.2-1' +ARG gitLinuxComponentVersion='1:2.47.0-0ppa2~ubuntu22.04.1' ARG repo='https://hub.docker.com/r/jetbrains/' ARG teamcityMinimalAgentImage='teamcity-minimal-agent:EAP-linux-arm64' diff --git a/context/generated/linux/Agent/UbuntuARM/22.04-sudo/Dockerfile b/context/generated/linux/Agent/UbuntuARM/22.04-sudo/Dockerfile new file mode 100644 index 000000000..238e10505 --- /dev/null +++ b/context/generated/linux/Agent/UbuntuARM/22.04-sudo/Dockerfile @@ -0,0 +1,22 @@ +# Default arguments +ARG teamcityAgentImage='teamcity-agent:EAP-linux-arm64' + +# The list of required arguments +# ARG teamcityAgentImage + + + + + +FROM ${teamcityAgentImage} + +USER root + +RUN apt-get update && \ + apt-get install -y --no-install-recommends sudo && \ + # https://github.com/goodwithtech/dockle/blob/master/CHECKPOINT.md#dkl-di-0005 + apt-get clean && rm -rf /var/lib/apt/lists/* && \ + echo 'buildagent ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers && \ + rm -rf /var/lib/apt/lists/* + +USER buildagent diff --git a/context/generated/linux/Agent/UbuntuARM/22.04/Dockerfile b/context/generated/linux/Agent/UbuntuARM/22.04/Dockerfile new file mode 100644 index 000000000..43ee7a210 --- /dev/null +++ b/context/generated/linux/Agent/UbuntuARM/22.04/Dockerfile @@ -0,0 +1,101 @@ +# Default arguments +ARG containerdIoLinuxComponentVersion='1.6.28-2' +ARG dockerLinuxComponentVersion='5:27.3.1-1~ubuntu' +ARG dotnetLibs='libc6 libgcc1 libgssapi-krb5-2 libicu70 libssl3 libstdc++6 zlib1g' +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='3.0.2-1' +ARG gitLinuxComponentVersion='1:2.47.0-0ppa2~ubuntu22.04.1' +ARG repo='https://hub.docker.com/r/jetbrains/' +ARG teamcityMinimalAgentImage='teamcity-minimal-agent:EAP-linux-arm64' + +# The list of required arguments +# ARG dotnetLinuxARM64Component +# ARG dotnetLinuxARM64ComponentSHA512 +# ARG teamcityMinimalAgentImage +# ARG dotnetLibs +# ARG gitLinuxComponentVersion +# ARG gitLFSLinuxComponentVersion +# ARG dockerLinuxComponentVersion + + + + + + +FROM ${teamcityMinimalAgentImage} + +USER root + +COPY run-docker.sh /services/run-docker.sh + +ARG dotnetCoreLinuxComponentVersion + + # Opt out of the telemetry feature +ENV 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 \ + GIT_SSH_VARIANT=ssh \ + DOTNET_SDK_VERSION=${dotnetCoreLinuxComponentVersion} + +ARG dotnetLinuxARM64Component +ARG dotnetLinuxARM64ComponentSHA512 +ARG dotnetLibs +ARG gitLinuxComponentVersion +ARG gitLFSLinuxComponentVersion +ARG dockerLinuxComponentVersion +ARG containerdIoLinuxComponentVersion + +RUN apt-get update && \ + apt-get install -y mercurial apt-transport-https software-properties-common && \ + add-apt-repository ppa:git-core/ppa -y && \ + apt-get install -y git=${gitLinuxComponentVersion} git-lfs=${gitLFSLinuxComponentVersion} && \ + git lfs install --system && \ + # https://github.com/goodwithtech/dockle/blob/master/CHECKPOINT.md#dkl-di-0005 + apt-get clean && rm -rf /var/lib/apt/lists/* && \ +# Docker + curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - && \ + add-apt-repository "deb [arch=arm64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" && \ + apt-cache policy docker-ce && \ + apt-get update && \ + # docker-ce, docker-ce-cli package name format: "26.0.0-1~ubuntu.20.04~focal" + apt-get install -y docker-ce=${dockerLinuxComponentVersion}.$(lsb_release -rs)~$(lsb_release -cs) \ + docker-ce-cli=${dockerLinuxComponentVersion}.$(lsb_release -rs)~$(lsb_release -cs) \ + containerd.io:arm64=${containerdIoLinuxComponentVersion} \ + systemd && \ + systemctl disable docker && \ + sed -i -e 's/\r$//' /services/run-docker.sh && \ +# .NET Libraries + apt-get install -y --no-install-recommends ${dotnetLibs} && \ + # https://github.com/goodwithtech/dockle/blob/master/CHECKPOINT.md#dkl-di-0005 + apt-get clean && rm -rf /var/lib/apt/lists/* && \ + mkdir -p /usr/share/dotnet && \ +# .NET 6.0 + curl -SL ${dotnetLinuxARM64Component} --output /tmp/dotnet.tar.gz && \ + echo "Downloaded .NET 6.0 (Linux ARM64) checksum: $(sha512sum tmp/dotnet.tar.gz)" && \ + echo "${dotnetLinuxARM64ComponentSHA512} */tmp/dotnet.tar.gz" | sha512sum -c -; \ + tar -zxf /tmp/dotnet.tar.gz -C /usr/share/dotnet && \ + rm /tmp/dotnet.tar.gz && \ + find /usr/share/dotnet -name "*.lzma" -type f -delete && \ +# Trigger .NET CLI first run experience by running arbitrary cmd to populate local package cache \ + ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet && \ + dotnet help && \ + dotnet --info && \ +# Other + apt-get clean && rm -rf /var/lib/apt/lists/* && \ + chown -R buildagent:buildagent /services && \ + usermod -aG docker buildagent + +# A better fix for TW-52939 Dockerfile build fails because of aufs +VOLUME /var/lib/docker + +USER buildagent + diff --git a/context/generated/linux/MinimalAgent/Ubuntu/22.04/Dockerfile b/context/generated/linux/MinimalAgent/Ubuntu/22.04/Dockerfile new file mode 100644 index 000000000..e6e8f047c --- /dev/null +++ b/context/generated/linux/MinimalAgent/Ubuntu/22.04/Dockerfile @@ -0,0 +1,87 @@ +# Default arguments +ARG jdkLinuxComponent='https://corretto.aws/downloads/resources/17.0.7.7.1/amazon-corretto-17.0.7.7.1-linux-x64.tar.gz' +ARG jdkLinuxComponentMD5SUM='443750a02c28ff2807c80032ee2e8ebc' +ARG ubuntuImage='ubuntu:22.04' + +# The list of required arguments +# ARG jdkLinuxComponent +# ARG jdkLinuxComponentMD5SUM +# ARG ubuntuImage + + + + +FROM ${ubuntuImage} + +ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' DEBIAN_FRONTEND=noninteractive TZ="Europe/London" + +RUN apt-get update && \ + apt-get install -y --no-install-recommends curl ca-certificates fontconfig locales unzip && \ +# Python + apt-get install -y python3-venv && \ + # https://github.com/goodwithtech/dockle/blob/master/CHECKPOINT.md#dkl-di-0005 + apt-get clean && rm -rf /var/lib/apt/lists/* && \ + echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen && \ + locale-gen en_US.UTF-8 && \ + rm -rf /var/lib/apt/lists/* && \ + useradd -m buildagent + +# JDK +ARG jdkLinuxComponent +ARG jdkLinuxComponentMD5SUM + +RUN set -eux; \ + curl -LfsSo /tmp/openjdk.tar.gz ${jdkLinuxComponent}; \ + echo "${jdkLinuxComponentMD5SUM} */tmp/openjdk.tar.gz" | md5sum -c -; \ + mkdir -p /opt/java/openjdk; \ + cd /opt/java/openjdk; \ + tar -xf /tmp/openjdk.tar.gz --strip-components=1; \ + chown -R root:root /opt/java; \ + rm -rf /tmp/openjdk.tar.gz; + +ENV JAVA_HOME=/opt/java/openjdk \ + JDK_HOME=/opt/java/openjdk \ + PATH="/opt/java/openjdk/bin:$PATH" + +RUN update-alternatives --install /usr/bin/java java ${JDK_HOME}/bin/java 1 && \ + update-alternatives --set java ${JDK_HOME}/bin/java && \ + update-alternatives --install /usr/bin/javac javac ${JDK_HOME}/bin/javac 1 && \ + update-alternatives --set javac ${JDK_HOME}/bin/javac + +# JDK preparation end +ENV CONFIG_FILE=/data/teamcity_agent/conf/buildAgent.properties \ + LANG=C.UTF-8 + +COPY --chown=buildagent:buildagent run-agent.sh /run-agent.sh +COPY --chown=buildagent:buildagent run-agent-services.sh /run-services.sh +COPY --chown=buildagent:buildagent TeamCity/buildAgent /opt/buildagent + +RUN chmod +x /opt/buildagent/bin/*.sh && \ + chmod +x /run-agent.sh /run-services.sh && sync && \ + mkdir -p /data/teamcity_agent/conf && \ + chown -R buildagent:buildagent /data/teamcity_agent && \ + sed -i -e 's/\r$//' /run-agent.sh && \ + sed -i -e 's/\r$//' /run-services.sh + +USER buildagent + +RUN mkdir -p /opt/buildagent/work && \ + mkdir -p /opt/buildagent/system/.teamcity-agent && \ + mkdir -p /opt/buildagent/temp && \ + mkdir -p /opt/buildagent/plugins && \ + mkdir -p /opt/buildagent/logs && \ + mkdir -p /opt/buildagent/tools && \ + echo >> /opt/buildagent/system/.teamcity-agent/teamcity-agent.xml && \ + sed -i -e 's/\r$//' /opt/buildagent/system/.teamcity-agent/teamcity-agent.xml && \ + echo >> /opt/buildagent/system/.teamcity-agent/unpacked-plugins.xml && \ + sed -i -e 's/\r$//' /opt/buildagent/system/.teamcity-agent/unpacked-plugins.xml + +VOLUME /data/teamcity_agent/conf +VOLUME /opt/buildagent/work +VOLUME /opt/buildagent/system +VOLUME /opt/buildagent/temp +VOLUME /opt/buildagent/logs +VOLUME /opt/buildagent/tools +VOLUME /opt/buildagent/plugins + +CMD ["/run-services.sh"] diff --git a/context/generated/linux/MinimalAgent/UbuntuARM/22.04/Dockerfile b/context/generated/linux/MinimalAgent/UbuntuARM/22.04/Dockerfile new file mode 100644 index 000000000..fa0596910 --- /dev/null +++ b/context/generated/linux/MinimalAgent/UbuntuARM/22.04/Dockerfile @@ -0,0 +1,87 @@ +# Default arguments +ARG jdkLinuxARM64Component='https://corretto.aws/downloads/resources/17.0.7.7.1/amazon-corretto-17.0.7.7.1-linux-aarch64.tar.gz' +ARG jdkLinuxARM64ComponentMD5SUM='c55e3d0615fac07f948ac3adaed818e9' +ARG ubuntuImage='ubuntu:22.04' + +# The list of required arguments +# ARG jdkLinuxARM64Component +# ARG jdkLinuxARM64ComponentMD5SUM +# ARG ubuntuImage + + + + +FROM ${ubuntuImage} + +ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' DEBIAN_FRONTEND=noninteractive TZ="Europe/London" + +RUN apt-get update && \ + apt-get install -y --no-install-recommends curl ca-certificates fontconfig locales unzip && \ + # https://github.com/goodwithtech/dockle/blob/master/CHECKPOINT.md#dkl-di-0005 +# Python + apt-get install -y python3-venv && \ + apt-get clean && rm -rf /var/lib/apt/lists/* && \ + echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen && \ + locale-gen en_US.UTF-8 && \ + rm -rf /var/lib/apt/lists/* && \ + useradd -m buildagent + +# JDK +ARG jdkLinuxARM64Component +ARG jdkLinuxARM64ComponentMD5SUM + +RUN set -eux; \ + curl -LfsSo /tmp/openjdk.tar.gz ${jdkLinuxARM64Component}; \ + echo "${jdkLinuxARM64ComponentMD5SUM} */tmp/openjdk.tar.gz" | md5sum -c -; \ + mkdir -p /opt/java/openjdk; \ + cd /opt/java/openjdk; \ + tar -xf /tmp/openjdk.tar.gz --strip-components=1; \ + chown -R root:root /opt/java; \ + rm -rf /tmp/openjdk.tar.gz; + +ENV JAVA_HOME=/opt/java/openjdk \ + JDK_HOME=/opt/java/openjdk \ + PATH="/opt/java/openjdk/bin:$PATH" + +RUN update-alternatives --install /usr/bin/java java ${JDK_HOME}/bin/java 1 && \ + update-alternatives --set java ${JDK_HOME}/bin/java && \ + update-alternatives --install /usr/bin/javac javac ${JDK_HOME}/bin/javac 1 && \ + update-alternatives --set javac ${JDK_HOME}/bin/javac + +# JDK preparation end +ENV CONFIG_FILE=/data/teamcity_agent/conf/buildAgent.properties \ + LANG=C.UTF-8 + +COPY --chown=buildagent:buildagent run-agent.sh /run-agent.sh +COPY --chown=buildagent:buildagent run-agent-services.sh /run-services.sh +COPY --chown=buildagent:buildagent TeamCity/buildAgent /opt/buildagent + +RUN chmod +x /opt/buildagent/bin/*.sh && \ + chmod +x /run-agent.sh /run-services.sh && sync && \ + mkdir -p /data/teamcity_agent/conf && \ + chown -R buildagent:buildagent /data/teamcity_agent && \ + sed -i -e 's/\r$//' /run-agent.sh && \ + sed -i -e 's/\r$//' /run-services.sh + +USER buildagent + +RUN mkdir -p /opt/buildagent/work && \ + mkdir -p /opt/buildagent/system/.teamcity-agent && \ + mkdir -p /opt/buildagent/temp && \ + mkdir -p /opt/buildagent/plugins && \ + mkdir -p /opt/buildagent/logs && \ + mkdir -p /opt/buildagent/tools && \ + echo >> /opt/buildagent/system/.teamcity-agent/teamcity-agent.xml && \ + sed -i -e 's/\r$//' /opt/buildagent/system/.teamcity-agent/teamcity-agent.xml && \ + echo >> /opt/buildagent/system/.teamcity-agent/unpacked-plugins.xml && \ + sed -i -e 's/\r$//' /opt/buildagent/system/.teamcity-agent/unpacked-plugins.xml + +VOLUME /data/teamcity_agent/conf +VOLUME /opt/buildagent/work +VOLUME /opt/buildagent/system +VOLUME /opt/buildagent/temp +VOLUME /opt/buildagent/logs +VOLUME /opt/buildagent/tools +VOLUME /opt/buildagent/plugins + +CMD ["/run-services.sh"] diff --git a/context/generated/linux/Server/Ubuntu/20.04/Dockerfile b/context/generated/linux/Server/Ubuntu/20.04/Dockerfile index f2bd7d5fd..0844eafe7 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.47.0-0ppa2~ubuntu20.04.1' +ARG gitLFSLinuxComponentVersion='3.0.2-1' +ARG gitLinuxComponentVersion='1:2.47.0-0ppa2~ubuntu22.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-2637361' diff --git a/context/generated/linux/Server/Ubuntu/22.04/Dockerfile b/context/generated/linux/Server/Ubuntu/22.04/Dockerfile new file mode 100644 index 000000000..f01cf3408 --- /dev/null +++ b/context/generated/linux/Server/Ubuntu/22.04/Dockerfile @@ -0,0 +1,111 @@ +# Default arguments +ARG gitLFSLinuxComponentVersion='3.0.2-1' +ARG gitLinuxComponentVersion='1:2.47.0-0ppa2~ubuntu22.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-2637361' +ARG repo='https://hub.docker.com/r/jetbrains/' +ARG ubuntuImage='ubuntu:22.04' + +# The list of required arguments +# ARG jdkServerLinuxComponent +# ARG jdkServerLinuxComponentMD5SUM +# ARG ubuntuImage +# ARG gitLinuxComponentVersion +# ARG gitLFSLinuxComponentVersion + + + + +FROM ${ubuntuImage} + +ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' + +RUN apt-get update && \ + apt-get install -y --no-install-recommends curl ca-certificates fontconfig locales unzip && \ + # https://github.com/goodwithtech/dockle/blob/master/CHECKPOINT.md#dkl-di-0005 + apt-get clean && rm -rf /var/lib/apt/lists/* && \ + echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen && \ + locale-gen en_US.UTF-8 && \ + rm -rf /var/lib/apt/lists/* + +# JDK preparation start +ARG jdkServerLinuxComponent +ARG jdkServerLinuxComponentMD5SUM + +RUN set -eux; \ + curl -LfsSo /tmp/openjdk.tar.gz ${jdkServerLinuxComponent}; \ + echo "${jdkServerLinuxComponentMD5SUM} */tmp/openjdk.tar.gz" | md5sum -c -; \ + mkdir -p /opt/java/openjdk; \ + cd /opt/java/openjdk; \ + tar -xf /tmp/openjdk.tar.gz --strip-components=1; \ + chown -R root:root /opt/java; \ + rm -rf /tmp/openjdk.tar.gz; + +ENV JAVA_HOME=/opt/java/openjdk \ + PATH="/opt/java/openjdk/bin:$PATH" + +RUN update-alternatives --install /usr/bin/java java ${JAVA_HOME}/bin/java 1 && \ + update-alternatives --set java ${JAVA_HOME}/bin/java && \ + update-alternatives --install /usr/bin/javac javac ${JAVA_HOME}/bin/javac 1 && \ + update-alternatives --set javac ${JAVA_HOME}/bin/javac + +ENV TEAMCITY_DATA_PATH=/data/teamcity_server/datadir \ + TEAMCITY_DIST=/opt/teamcity \ + TEAMCITY_LOGS=/opt/teamcity/logs \ + TEAMCITY_ENV=container \ + CATALINA_TMPDIR=/opt/teamcity/temp \ + TEAMCITY_SERVER_MEM_OPTS="-Xmx2g -XX:ReservedCodeCacheSize=640m" \ + LANG=C.UTF-8 + +EXPOSE 8111 + +# Git +ARG gitLinuxComponentVersion + +# Git LFS +ARG gitLFSLinuxComponentVersion + +# Perforce +ARG p4Version + +RUN apt-get update && \ + apt-get install -y mercurial gnupg software-properties-common && \ + add-apt-repository ppa:git-core/ppa -y && \ + apt-get install -y git=${gitLinuxComponentVersion} git-lfs=${gitLFSLinuxComponentVersion} && \ + git lfs install --system && \ + apt-key adv --fetch-keys https://package.perforce.com/perforce.pubkey && \ + (. /etc/os-release && \ + echo "deb http://package.perforce.com/apt/$ID $VERSION_CODENAME release" > \ + /etc/apt/sources.list.d/perforce.list ) && \ + apt-get update && \ + (. /etc/os-release && apt-get install -y helix-cli-base="${p4Version}~$VERSION_CODENAME" helix-cli="${p4Version}~$VERSION_CODENAME" ) && \ + # https://github.com/goodwithtech/dockle/blob/master/CHECKPOINT.md#dkl-di-0005 + apt-get clean && rm -rf /var/lib/apt/lists/* + +COPY welcome.sh /welcome.sh +COPY run-server.sh /run-server.sh +COPY check-server-volumes.sh /services/check-server-volumes.sh +COPY run-server-services.sh /run-services.sh + +RUN chmod +x /welcome.sh /run-server.sh /run-services.sh && sync && \ + groupadd -g 1000 tcuser && \ + useradd -r -u 1000 -g tcuser -d $TEAMCITY_DIST tcuser && \ + echo '[ ! -z "$TERM" -a -x /welcome.sh -a -x /welcome.sh ] && /welcome.sh' >> /etc/bash.bashrc && \ + sed -i -e 's/\r$//' /welcome.sh && \ + sed -i -e 's/\r$//' /run-server.sh && \ + sed -i -e 's/\r$//' /run-services.sh && \ + sed -i -e 's/\r$//' /services/check-server-volumes.sh && \ + mkdir -p $TEAMCITY_DATA_PATH $TEAMCITY_LOGS $CATALINA_TMPDIR && \ + chown -R tcuser:tcuser /services $TEAMCITY_DIST $TEAMCITY_DATA_PATH $TEAMCITY_LOGS $CATALINA_TMPDIR + +COPY --chown=tcuser:tcuser TeamCity $TEAMCITY_DIST +RUN echo "docker-ubuntu" > $TEAMCITY_DIST/webapps/ROOT/WEB-INF/DistributionType.txt + +USER tcuser:tcuser + +VOLUME $TEAMCITY_DATA_PATH \ + $TEAMCITY_LOGS \ + $CATALINA_TMPDIR + +CMD ["/run-services.sh"] diff --git a/context/generated/linux/Server/UbuntuARM/20.04/Dockerfile b/context/generated/linux/Server/UbuntuARM/20.04/Dockerfile index a6f65a59b..ff29bf54d 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.47.0-0ppa2~ubuntu20.04.1' +ARG gitLFSLinuxComponentVersion='3.0.2-1' +ARG gitLinuxComponentVersion='1:2.47.0-0ppa2~ubuntu22.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/linux/Server/UbuntuARM/22.04/Dockerfile b/context/generated/linux/Server/UbuntuARM/22.04/Dockerfile new file mode 100644 index 000000000..2ad70b26c --- /dev/null +++ b/context/generated/linux/Server/UbuntuARM/22.04/Dockerfile @@ -0,0 +1,101 @@ +# Default arguments +ARG gitLFSLinuxComponentVersion='3.0.2-1' +ARG gitLinuxComponentVersion='1:2.47.0-0ppa2~ubuntu22.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='' +ARG ubuntuImage='ubuntu:22.04' + +# The list of required arguments +# ARG jdkServerLinuxARM64Component +# ARG jdkServerLinuxARM64ComponentMD5SUM +# ARG ubuntuImage +# ARG gitLinuxComponentVersion +# ARG gitLFSLinuxComponentVersion + + + + +FROM ${ubuntuImage} + +ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' + +RUN apt-get update && \ + apt-get install -y --no-install-recommends curl ca-certificates fontconfig locales unzip && \ + # https://github.com/goodwithtech/dockle/blob/master/CHECKPOINT.md#dkl-di-0005 + apt-get clean && rm -rf /var/lib/apt/lists/* && \ + echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen && \ + locale-gen en_US.UTF-8 && \ + rm -rf /var/lib/apt/lists/* + +# JDK preparation start +ARG jdkServerLinuxARM64Component +ARG jdkServerLinuxARM64ComponentMD5SUM + +RUN set -eux; \ + curl -LfsSo /tmp/openjdk.tar.gz ${jdkServerLinuxARM64Component}; \ + echo "${jdkServerLinuxARM64ComponentMD5SUM} */tmp/openjdk.tar.gz" | md5sum -c -; \ + mkdir -p /opt/java/openjdk; \ + cd /opt/java/openjdk; \ + tar -xf /tmp/openjdk.tar.gz --strip-components=1; \ + chown -R root:root /opt/java; \ + rm -rf /tmp/openjdk.tar.gz; + +ENV JAVA_HOME=/opt/java/openjdk \ + PATH="/opt/java/openjdk/bin:$PATH" + +RUN update-alternatives --install /usr/bin/java java ${JAVA_HOME}/bin/java 1 && \ + update-alternatives --set java ${JAVA_HOME}/bin/java && \ + update-alternatives --install /usr/bin/javac javac ${JAVA_HOME}/bin/javac 1 && \ + update-alternatives --set javac ${JAVA_HOME}/bin/javac + +ENV TEAMCITY_DATA_PATH=/data/teamcity_server/datadir \ + TEAMCITY_DIST=/opt/teamcity \ + TEAMCITY_LOGS=/opt/teamcity/logs \ + TEAMCITY_ENV=container \ + CATALINA_TMPDIR=/opt/teamcity/temp \ + TEAMCITY_SERVER_MEM_OPTS="-Xmx2g -XX:ReservedCodeCacheSize=640m" \ + LANG=C.UTF-8 + +EXPOSE 8111 + +# Git +ARG gitLinuxComponentVersion + +# Git LFS +ARG gitLFSLinuxComponentVersion + +RUN apt-get update && \ + apt-get install -y mercurial software-properties-common && \ + add-apt-repository ppa:git-core/ppa -y && \ + apt-get install -y git=${gitLinuxComponentVersion} git-lfs=${gitLFSLinuxComponentVersion} && \ + git lfs install --system && \ + # https://github.com/goodwithtech/dockle/blob/master/CHECKPOINT.md#dkl-di-0005 + apt-get clean && rm -rf /var/lib/apt/lists/* + +COPY welcome.sh /welcome.sh +COPY run-server.sh /run-server.sh +COPY check-server-volumes.sh /services/check-server-volumes.sh +COPY run-server-services.sh /run-services.sh + +RUN chmod +x /welcome.sh /run-server.sh /run-services.sh && sync && \ + groupadd -g 1000 tcuser && \ + useradd -r -u 1000 -g tcuser tcuser && \ + echo '[ ! -z "$TERM" -a -x /welcome.sh -a -x /welcome.sh ] && /welcome.sh' >> /etc/bash.bashrc && \ + sed -i -e 's/\r$//' /welcome.sh && \ + sed -i -e 's/\r$//' /run-server.sh && \ + sed -i -e 's/\r$//' /run-services.sh && \ + sed -i -e 's/\r$//' /services/check-server-volumes.sh && \ + mkdir -p $TEAMCITY_DATA_PATH $TEAMCITY_LOGS $CATALINA_TMPDIR && \ + chown -R tcuser:tcuser /services $TEAMCITY_DIST $TEAMCITY_DATA_PATH $TEAMCITY_LOGS $CATALINA_TMPDIR + +COPY --chown=tcuser:tcuser TeamCity $TEAMCITY_DIST +RUN echo "docker-ubuntu" > $TEAMCITY_DIST/webapps/ROOT/WEB-INF/DistributionType.txt + +USER tcuser:tcuser + +VOLUME $TEAMCITY_DATA_PATH \ + $TEAMCITY_LOGS \ + $CATALINA_TMPDIR + +CMD ["/run-services.sh"] diff --git a/context/generated/teamcity-agent-EAP-linux-arm64-sudo.cmd b/context/generated/teamcity-agent-EAP-linux-arm64-sudo.cmd index 462328664..bee7318b2 100644 --- a/context/generated/teamcity-agent-EAP-linux-arm64-sudo.cmd +++ b/context/generated/teamcity-agent-EAP-linux-arm64-sudo.cmd @@ -1,10 +1,10 @@ cd ../.. -docker pull ubuntu:20.04 +docker pull ubuntu:22.04 echo TeamCity/webapps > context/.dockerignore echo TeamCity/devPackage >> context/.dockerignore echo TeamCity/lib >> context/.dockerignore -docker build -f "context/generated/linux/MinimalAgent/UbuntuARM/20.04/Dockerfile" -t teamcity-minimal-agent:EAP-linux-arm64 "context" +docker build -f "context/generated/linux/MinimalAgent/UbuntuARM/22.04/Dockerfile" -t teamcity-minimal-agent:EAP-linux-arm64 "context" echo 2> context/.dockerignore echo TeamCity >> context/.dockerignore -docker build -f "context/generated/linux/Agent/UbuntuARM/20.04/Dockerfile" -t teamcity-agent:EAP-linux-arm64 "context" -docker build -f "context/generated/linux/Agent/UbuntuARM/20.04-sudo/Dockerfile" -t teamcity-agent:EAP-linux-arm64-sudo "context" +docker build -f "context/generated/linux/Agent/UbuntuARM/22.04/Dockerfile" -t teamcity-agent:EAP-linux-arm64 "context" +docker build -f "context/generated/linux/Agent/UbuntuARM/22.04-sudo/Dockerfile" -t teamcity-agent:EAP-linux-arm64-sudo "context" diff --git a/context/generated/teamcity-agent-EAP-linux-arm64-sudo.sh b/context/generated/teamcity-agent-EAP-linux-arm64-sudo.sh index 1e1ae245d..05a435977 100644 --- a/context/generated/teamcity-agent-EAP-linux-arm64-sudo.sh +++ b/context/generated/teamcity-agent-EAP-linux-arm64-sudo.sh @@ -1,11 +1,11 @@ #!/bin/bash cd ../.. -docker pull ubuntu:20.04 +docker pull ubuntu:22.04 echo TeamCity/webapps > context/.dockerignore echo TeamCity/devPackage >> context/.dockerignore echo TeamCity/lib >> context/.dockerignore -docker build -f "context/generated/linux/MinimalAgent/UbuntuARM/20.04/Dockerfile" -t teamcity-minimal-agent:EAP-linux-arm64 "context" +docker build -f "context/generated/linux/MinimalAgent/UbuntuARM/22.04/Dockerfile" -t teamcity-minimal-agent:EAP-linux-arm64 "context" echo 2> context/.dockerignore echo TeamCity >> context/.dockerignore -docker build -f "context/generated/linux/Agent/UbuntuARM/20.04/Dockerfile" -t teamcity-agent:EAP-linux-arm64 "context" -docker build -f "context/generated/linux/Agent/UbuntuARM/20.04-sudo/Dockerfile" -t teamcity-agent:EAP-linux-arm64-sudo "context" +docker build -f "context/generated/linux/Agent/UbuntuARM/22.04/Dockerfile" -t teamcity-agent:EAP-linux-arm64 "context" +docker build -f "context/generated/linux/Agent/UbuntuARM/22.04-sudo/Dockerfile" -t teamcity-agent:EAP-linux-arm64-sudo "context" diff --git a/context/generated/teamcity-agent-EAP-linux-arm64.cmd b/context/generated/teamcity-agent-EAP-linux-arm64.cmd index d5712305e..3a5bbba53 100644 --- a/context/generated/teamcity-agent-EAP-linux-arm64.cmd +++ b/context/generated/teamcity-agent-EAP-linux-arm64.cmd @@ -1,9 +1,9 @@ cd ../.. -docker pull ubuntu:20.04 +docker pull ubuntu:22.04 echo TeamCity/webapps > context/.dockerignore echo TeamCity/devPackage >> context/.dockerignore echo TeamCity/lib >> context/.dockerignore -docker build -f "context/generated/linux/MinimalAgent/UbuntuARM/20.04/Dockerfile" -t teamcity-minimal-agent:EAP-linux-arm64 "context" +docker build -f "context/generated/linux/MinimalAgent/UbuntuARM/22.04/Dockerfile" -t teamcity-minimal-agent:EAP-linux-arm64 "context" echo 2> context/.dockerignore echo TeamCity >> context/.dockerignore -docker build -f "context/generated/linux/Agent/UbuntuARM/20.04/Dockerfile" -t teamcity-agent:EAP-linux-arm64 "context" +docker build -f "context/generated/linux/Agent/UbuntuARM/22.04/Dockerfile" -t teamcity-agent:EAP-linux-arm64 "context" diff --git a/context/generated/teamcity-agent-EAP-linux-arm64.sh b/context/generated/teamcity-agent-EAP-linux-arm64.sh index b5e1cf1ff..426442100 100644 --- a/context/generated/teamcity-agent-EAP-linux-arm64.sh +++ b/context/generated/teamcity-agent-EAP-linux-arm64.sh @@ -1,10 +1,10 @@ #!/bin/bash cd ../.. -docker pull ubuntu:20.04 +docker pull ubuntu:22.04 echo TeamCity/webapps > context/.dockerignore echo TeamCity/devPackage >> context/.dockerignore echo TeamCity/lib >> context/.dockerignore -docker build -f "context/generated/linux/MinimalAgent/UbuntuARM/20.04/Dockerfile" -t teamcity-minimal-agent:EAP-linux-arm64 "context" +docker build -f "context/generated/linux/MinimalAgent/UbuntuARM/22.04/Dockerfile" -t teamcity-minimal-agent:EAP-linux-arm64 "context" echo 2> context/.dockerignore echo TeamCity >> context/.dockerignore -docker build -f "context/generated/linux/Agent/UbuntuARM/20.04/Dockerfile" -t teamcity-agent:EAP-linux-arm64 "context" +docker build -f "context/generated/linux/Agent/UbuntuARM/22.04/Dockerfile" -t teamcity-agent:EAP-linux-arm64 "context" diff --git a/context/generated/teamcity-agent-EAP-linux-sudo.cmd b/context/generated/teamcity-agent-EAP-linux-sudo.cmd index a281659e6..5a70c80d6 100644 --- a/context/generated/teamcity-agent-EAP-linux-sudo.cmd +++ b/context/generated/teamcity-agent-EAP-linux-sudo.cmd @@ -1,10 +1,10 @@ cd ../.. -docker pull ubuntu:20.04 +docker pull ubuntu:22.04 echo TeamCity/webapps > context/.dockerignore echo TeamCity/devPackage >> context/.dockerignore echo TeamCity/lib >> context/.dockerignore -docker build -f "context/generated/linux/MinimalAgent/Ubuntu/20.04/Dockerfile" -t teamcity-minimal-agent:EAP-linux "context" +docker build -f "context/generated/linux/MinimalAgent/Ubuntu/22.04/Dockerfile" -t teamcity-minimal-agent:EAP-linux "context" echo 2> context/.dockerignore echo TeamCity >> context/.dockerignore -docker build -f "context/generated/linux/Agent/Ubuntu/20.04/Dockerfile" -t teamcity-agent:EAP-linux "context" -docker build -f "context/generated/linux/Agent/Ubuntu/20.04-sudo/Dockerfile" -t teamcity-agent:EAP-linux-sudo "context" +docker build -f "context/generated/linux/Agent/Ubuntu/22.04/Dockerfile" -t teamcity-agent:EAP-linux "context" +docker build -f "context/generated/linux/Agent/Ubuntu/22.04-sudo/Dockerfile" -t teamcity-agent:EAP-linux-sudo "context" diff --git a/context/generated/teamcity-agent-EAP-linux-sudo.sh b/context/generated/teamcity-agent-EAP-linux-sudo.sh index 4a6b87879..8b2302d3c 100644 --- a/context/generated/teamcity-agent-EAP-linux-sudo.sh +++ b/context/generated/teamcity-agent-EAP-linux-sudo.sh @@ -1,11 +1,11 @@ #!/bin/bash cd ../.. -docker pull ubuntu:20.04 +docker pull ubuntu:22.04 echo TeamCity/webapps > context/.dockerignore echo TeamCity/devPackage >> context/.dockerignore echo TeamCity/lib >> context/.dockerignore -docker build -f "context/generated/linux/MinimalAgent/Ubuntu/20.04/Dockerfile" -t teamcity-minimal-agent:EAP-linux "context" +docker build -f "context/generated/linux/MinimalAgent/Ubuntu/22.04/Dockerfile" -t teamcity-minimal-agent:EAP-linux "context" echo 2> context/.dockerignore echo TeamCity >> context/.dockerignore -docker build -f "context/generated/linux/Agent/Ubuntu/20.04/Dockerfile" -t teamcity-agent:EAP-linux "context" -docker build -f "context/generated/linux/Agent/Ubuntu/20.04-sudo/Dockerfile" -t teamcity-agent:EAP-linux-sudo "context" +docker build -f "context/generated/linux/Agent/Ubuntu/22.04/Dockerfile" -t teamcity-agent:EAP-linux "context" +docker build -f "context/generated/linux/Agent/Ubuntu/22.04-sudo/Dockerfile" -t teamcity-agent:EAP-linux-sudo "context" diff --git a/context/generated/teamcity-agent-EAP-linux.cmd b/context/generated/teamcity-agent-EAP-linux.cmd index b45b90c6c..5ea39007f 100644 --- a/context/generated/teamcity-agent-EAP-linux.cmd +++ b/context/generated/teamcity-agent-EAP-linux.cmd @@ -1,9 +1,9 @@ cd ../.. -docker pull ubuntu:20.04 +docker pull ubuntu:22.04 echo TeamCity/webapps > context/.dockerignore echo TeamCity/devPackage >> context/.dockerignore echo TeamCity/lib >> context/.dockerignore -docker build -f "context/generated/linux/MinimalAgent/Ubuntu/20.04/Dockerfile" -t teamcity-minimal-agent:EAP-linux "context" +docker build -f "context/generated/linux/MinimalAgent/Ubuntu/22.04/Dockerfile" -t teamcity-minimal-agent:EAP-linux "context" echo 2> context/.dockerignore echo TeamCity >> context/.dockerignore -docker build -f "context/generated/linux/Agent/Ubuntu/20.04/Dockerfile" -t teamcity-agent:EAP-linux "context" +docker build -f "context/generated/linux/Agent/Ubuntu/22.04/Dockerfile" -t teamcity-agent:EAP-linux "context" diff --git a/context/generated/teamcity-agent-EAP-linux.sh b/context/generated/teamcity-agent-EAP-linux.sh index a5fe765b2..9935b8890 100644 --- a/context/generated/teamcity-agent-EAP-linux.sh +++ b/context/generated/teamcity-agent-EAP-linux.sh @@ -1,10 +1,10 @@ #!/bin/bash cd ../.. -docker pull ubuntu:20.04 +docker pull ubuntu:22.04 echo TeamCity/webapps > context/.dockerignore echo TeamCity/devPackage >> context/.dockerignore echo TeamCity/lib >> context/.dockerignore -docker build -f "context/generated/linux/MinimalAgent/Ubuntu/20.04/Dockerfile" -t teamcity-minimal-agent:EAP-linux "context" +docker build -f "context/generated/linux/MinimalAgent/Ubuntu/22.04/Dockerfile" -t teamcity-minimal-agent:EAP-linux "context" echo 2> context/.dockerignore echo TeamCity >> context/.dockerignore -docker build -f "context/generated/linux/Agent/Ubuntu/20.04/Dockerfile" -t teamcity-agent:EAP-linux "context" +docker build -f "context/generated/linux/Agent/Ubuntu/22.04/Dockerfile" -t teamcity-agent:EAP-linux "context" diff --git a/context/generated/teamcity-agent.md b/context/generated/teamcity-agent.md index 8a63b0f5f..809eb6b4e 100644 --- a/context/generated/teamcity-agent.md +++ b/context/generated/teamcity-agent.md @@ -14,6 +14,12 @@ When running an image with multi-architecture support, docker will automatically #### linux +- 22.04-sudo + - [EAP-linux-arm64-sudo](#EAP-linux-arm64-sudo) + - [EAP-linux-sudo](#EAP-linux-sudo) +- 22.04 + - [EAP-linux](#EAP-linux) + - [EAP-linux-arm64](#EAP-linux-arm64) - 20.04-sudo - [EAP-linux-arm64-sudo](#EAP-linux-arm64-sudo) - [EAP-linux-sudo](#EAP-linux-sudo) @@ -48,12 +54,14 @@ When running an image with multi-architecture support, docker will automatically ### EAP -Supported platforms: linux 20.04, windows 1809, windows 2022 +Supported platforms: linux 20.04, linux 22.04, windows 1809, windows 2022 #### Content +- [EAP-linux](#EAP-linux) - [EAP-linux](#EAP-linux) - [EAP-linux-arm64](#EAP-linux-arm64) +- [EAP-linux-arm64](#EAP-linux-arm64) - [EAP-nanoserver-1809](#EAP-nanoserver-1809) - [EAP-nanoserver-2022](#EAP-nanoserver-2022) @@ -69,7 +77,7 @@ Supported platforms: windows 1809, windows 2022 # Dockerfile links -* **Linux**. [teamcity-agent:EAP-linux,EAP](https://github.com/JetBrains/teamcity-docker-images/tree/master/context/generated/linux/Agent/Ubuntu/20.04/Dockerfile), [teamcity-agent:EAP-linux-arm64,EAP](https://github.com/JetBrains/teamcity-docker-images/tree/master/context/generated/linux/Agent/UbuntuARM/20.04/Dockerfile), [teamcity-agent:EAP-linux-arm64-sudo](https://github.com/JetBrains/teamcity-docker-images/tree/master/context/generated/linux/Agent/UbuntuARM/20.04-sudo/Dockerfile), [teamcity-agent:EAP-linux-sudo](https://github.com/JetBrains/teamcity-docker-images/tree/master/context/generated/linux/Agent/Ubuntu/20.04-sudo/Dockerfile), [teamcity-agent:EAP-linux-18.04,EAP](https://github.com/JetBrains/teamcity-docker-images/tree/master/context/generated/linux/Agent/Ubuntu/18.04/Dockerfile), [teamcity-agent:EAP-linux-18.04-sudo](https://github.com/JetBrains/teamcity-docker-images/tree/master/context/generated/linux/Agent/Ubuntu/18.04-sudo/Dockerfile), [teamcity-agent:EAP-linux-arm64-18.04,EAP](https://github.com/JetBrains/teamcity-docker-images/tree/master/context/generated/linux/Agent/UbuntuARM/18.04/Dockerfile), [teamcity-agent:EAP-linux-arm64-18.04-sudo](https://github.com/JetBrains/teamcity-docker-images/tree/master/context/generated/linux/Agent/UbuntuARM/18.04-sudo/Dockerfile) +* **Linux**. [teamcity-agent:EAP-linux,EAP](https://github.com/JetBrains/teamcity-docker-images/tree/master/context/generated/linux/Agent/Ubuntu/20.04/Dockerfile), [teamcity-agent:EAP-linux,EAP](https://github.com/JetBrains/teamcity-docker-images/tree/master/context/generated/linux/Agent/Ubuntu/22.04/Dockerfile), [teamcity-agent:EAP-linux-arm64,EAP](https://github.com/JetBrains/teamcity-docker-images/tree/master/context/generated/linux/Agent/UbuntuARM/20.04/Dockerfile), [teamcity-agent:EAP-linux-arm64,EAP](https://github.com/JetBrains/teamcity-docker-images/tree/master/context/generated/linux/Agent/UbuntuARM/22.04/Dockerfile), [teamcity-agent:EAP-linux-arm64-sudo](https://github.com/JetBrains/teamcity-docker-images/tree/master/context/generated/linux/Agent/UbuntuARM/22.04-sudo/Dockerfile), [teamcity-agent:EAP-linux-arm64-sudo](https://github.com/JetBrains/teamcity-docker-images/tree/master/context/generated/linux/Agent/UbuntuARM/20.04-sudo/Dockerfile), [teamcity-agent:EAP-linux-sudo](https://github.com/JetBrains/teamcity-docker-images/tree/master/context/generated/linux/Agent/Ubuntu/22.04-sudo/Dockerfile), [teamcity-agent:EAP-linux-sudo](https://github.com/JetBrains/teamcity-docker-images/tree/master/context/generated/linux/Agent/Ubuntu/20.04-sudo/Dockerfile), [teamcity-agent:EAP-linux-18.04,EAP](https://github.com/JetBrains/teamcity-docker-images/tree/master/context/generated/linux/Agent/Ubuntu/18.04/Dockerfile), [teamcity-agent:EAP-linux-18.04-sudo](https://github.com/JetBrains/teamcity-docker-images/tree/master/context/generated/linux/Agent/Ubuntu/18.04-sudo/Dockerfile), [teamcity-agent:EAP-linux-arm64-18.04,EAP](https://github.com/JetBrains/teamcity-docker-images/tree/master/context/generated/linux/Agent/UbuntuARM/18.04/Dockerfile), [teamcity-agent:EAP-linux-arm64-18.04-sudo](https://github.com/JetBrains/teamcity-docker-images/tree/master/context/generated/linux/Agent/UbuntuARM/18.04-sudo/Dockerfile) * **Windows**. [teamcity-agent:EAP-nanoserver-1809,EAP](https://github.com/JetBrains/teamcity-docker-images/tree/master/context/generated/windows/Agent/nanoserver/1809/Dockerfile), [teamcity-agent:EAP-nanoserver-2022,EAP](https://github.com/JetBrains/teamcity-docker-images/tree/master/context/generated/windows/Agent/nanoserver/2022/Dockerfile), [teamcity-agent:EAP-windowsservercore-1809,EAP-windowsservercore,-windowsservercore](https://github.com/JetBrains/teamcity-docker-images/tree/master/context/generated/windows/Agent/windowsservercore/1809/Dockerfile), [teamcity-agent:EAP-windowsservercore-2022,EAP-windowsservercore,-windowsservercore](https://github.com/JetBrains/teamcity-docker-images/tree/master/context/generated/windows/Agent/windowsservercore/2022/Dockerfile), [teamcity-agent:EAP-nanoserver-1803,EAP](https://github.com/JetBrains/teamcity-docker-images/tree/master/context/generated/windows/Agent/nanoserver/1803/Dockerfile), [teamcity-agent:EAP-nanoserver-1903,EAP](https://github.com/JetBrains/teamcity-docker-images/tree/master/context/generated/windows/Agent/nanoserver/1903/Dockerfile), [teamcity-agent:EAP-nanoserver-1909,EAP](https://github.com/JetBrains/teamcity-docker-images/tree/master/context/generated/windows/Agent/nanoserver/1909/Dockerfile), [teamcity-agent:EAP-windowsservercore-1803,EAP-windowsservercore,-windowsservercore](https://github.com/JetBrains/teamcity-docker-images/tree/master/context/generated/windows/Agent/windowsservercore/1803/Dockerfile), [teamcity-agent:EAP-windowsservercore-1903,EAP-windowsservercore,-windowsservercore](https://github.com/JetBrains/teamcity-docker-images/tree/master/context/generated/windows/Agent/windowsservercore/1903/Dockerfile), [teamcity-agent:EAP-windowsservercore-1909,EAP-windowsservercore,-windowsservercore](https://github.com/JetBrains/teamcity-docker-images/tree/master/context/generated/windows/Agent/windowsservercore/1909/Dockerfile) @@ -90,10 +98,10 @@ Installed components: - [Python venv](https://docs.python.org/3/library/venv.html#module-venv) - [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 LFS v.3.0.2-1 - Git v.2.47.0 - Mercurial -- [Docker v.5:24.0.9](https://docs.docker.com/engine/release-notes/24.0) +- [Docker v.27.3.1](https://docs.docker.com/engine/release-notes/27) - [Containerd.io v1.6.28-2](https://github.com/containerd/containerd/releases/tag/v1.6.28) - [.NET SDK v.6.0.413 (LTS) x86 Checksum (SHA512) ee0a77d54e6d4917be7310ff0abb3bad5525bfb4beb1db0c215e65f64eb46511f5f12d6c7ff465a1d4ab38577e6a1950fde479ee94839c50e627020328a702de](https://dotnetcli.blob.core.windows.net/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-linux-x64.tar.gz) - Perforce Helix Core client (p4) [2022.2-2637361](https://www.perforce.com/products/helix-core) @@ -103,11 +111,11 @@ Container platform: linux Docker build commands: ``` -docker pull ubuntu:20.04 +docker pull ubuntu:22.04 echo TeamCity/webapps > context/.dockerignore echo TeamCity/devPackage >> context/.dockerignore echo TeamCity/lib >> context/.dockerignore -docker build -f "context/generated/linux/MinimalAgent/Ubuntu/20.04/Dockerfile" -t teamcity-minimal-agent:EAP-linux "context" +docker build -f "context/generated/linux/MinimalAgent/Ubuntu/22.04/Dockerfile" -t teamcity-minimal-agent:EAP-linux "context" echo 2> context/.dockerignore echo TeamCity >> context/.dockerignore docker build -f "context/generated/linux/Agent/Ubuntu/20.04/Dockerfile" -t teamcity-agent:EAP-linux "context" @@ -115,6 +123,47 @@ docker build -f "context/generated/linux/Agent/Ubuntu/20.04/Dockerfile" -t teamc _The required free space to generate image(s) is about **2 GB**._ +### EAP-linux + +[Dockerfile](linux/Agent/Ubuntu/22.04/Dockerfile) + +This is an official [JetBrains TeamCity](https://www.jetbrains.com/teamcity/) build agent image. + +The docker image is available on: + +- [https://hub.docker.com/r/jetbrains/teamcity-agent](https://hub.docker.com/r/jetbrains/teamcity-agent) + +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) +- [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.3.0.2-1 +- Git v.2.47.0 +- Mercurial +- [Docker v.27.3.1](https://docs.docker.com/engine/release-notes/27) +- [Containerd.io v1.6.28-2](https://github.com/containerd/containerd/releases/tag/v1.6.28) +- [.NET SDK v.6.0.413 (LTS) x86 Checksum (SHA512) ee0a77d54e6d4917be7310ff0abb3bad5525bfb4beb1db0c215e65f64eb46511f5f12d6c7ff465a1d4ab38577e6a1950fde479ee94839c50e627020328a702de](https://dotnetcli.blob.core.windows.net/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-linux-x64.tar.gz) +- Perforce Helix Core client (p4) [2022.2-2637361](https://www.perforce.com/products/helix-core) + +Container platform: linux + +Docker build commands: + +``` +docker pull ubuntu:22.04 +echo TeamCity/webapps > context/.dockerignore +echo TeamCity/devPackage >> context/.dockerignore +echo TeamCity/lib >> context/.dockerignore +docker build -f "context/generated/linux/MinimalAgent/Ubuntu/22.04/Dockerfile" -t teamcity-minimal-agent:EAP-linux "context" +echo 2> context/.dockerignore +echo TeamCity >> context/.dockerignore +docker build -f "context/generated/linux/Agent/Ubuntu/22.04/Dockerfile" -t teamcity-agent:EAP-linux "context" +``` + +_The required free space to generate image(s) is about **2 GB**._ + ### EAP-linux-arm64 [Dockerfile](linux/Agent/UbuntuARM/20.04/Dockerfile) @@ -130,9 +179,9 @@ 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.47.0 -- Git LFS v.2.9.2 +- Git LFS v.3.0.2-1 - Mercurial -- [Docker v.5:24.0.9](https://docs.docker.com/engine/release-notes/24.0) +- [Docker v.27.3.1](https://docs.docker.com/engine/release-notes/27) - [Containerd.io v1.6.28-2](https://github.com/containerd/containerd/releases/tag/v1.6.28) - [.NET SDK v.6.0.413 (LTS) ARM64 Checksum (SHA512) 7f05a9774d79e694da5a6115d9916abf87a65e40bd6bdaa5dca1f705795436bc8e764242f7045207386a86732ef5519f60bdb516a3860e4860bca7ee91a21759](https://dotnetcli.blob.core.windows.net/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-linux-arm64.tar.gz) @@ -141,11 +190,11 @@ Container platform: linux Docker build commands: ``` -docker pull ubuntu:20.04 +docker pull ubuntu:22.04 echo TeamCity/webapps > context/.dockerignore echo TeamCity/devPackage >> context/.dockerignore echo TeamCity/lib >> context/.dockerignore -docker build -f "context/generated/linux/MinimalAgent/UbuntuARM/20.04/Dockerfile" -t teamcity-minimal-agent:EAP-linux-arm64 "context" +docker build -f "context/generated/linux/MinimalAgent/UbuntuARM/22.04/Dockerfile" -t teamcity-minimal-agent:EAP-linux-arm64 "context" echo 2> context/.dockerignore echo TeamCity >> context/.dockerignore docker build -f "context/generated/linux/Agent/UbuntuARM/20.04/Dockerfile" -t teamcity-agent:EAP-linux-arm64 "context" @@ -153,6 +202,84 @@ docker build -f "context/generated/linux/Agent/UbuntuARM/20.04/Dockerfile" -t te _The required free space to generate image(s) is about **2 GB**._ +### EAP-linux-arm64 + +[Dockerfile](linux/Agent/UbuntuARM/22.04/Dockerfile) + +This is an official [JetBrains TeamCity](https://www.jetbrains.com/teamcity/) build agent image. + +The docker image is available on: + +- [https://hub.docker.com/r/jetbrains/teamcity-agent](https://hub.docker.com/r/jetbrains/teamcity-agent) + +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.47.0 +- Git LFS v.3.0.2-1 +- Mercurial +- [Docker v.27.3.1](https://docs.docker.com/engine/release-notes/27) +- [Containerd.io v1.6.28-2](https://github.com/containerd/containerd/releases/tag/v1.6.28) +- [.NET SDK v.6.0.413 (LTS) ARM64 Checksum (SHA512) 7f05a9774d79e694da5a6115d9916abf87a65e40bd6bdaa5dca1f705795436bc8e764242f7045207386a86732ef5519f60bdb516a3860e4860bca7ee91a21759](https://dotnetcli.blob.core.windows.net/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-linux-arm64.tar.gz) + +Container platform: linux + +Docker build commands: + +``` +docker pull ubuntu:22.04 +echo TeamCity/webapps > context/.dockerignore +echo TeamCity/devPackage >> context/.dockerignore +echo TeamCity/lib >> context/.dockerignore +docker build -f "context/generated/linux/MinimalAgent/UbuntuARM/22.04/Dockerfile" -t teamcity-minimal-agent:EAP-linux-arm64 "context" +echo 2> context/.dockerignore +echo TeamCity >> context/.dockerignore +docker build -f "context/generated/linux/Agent/UbuntuARM/22.04/Dockerfile" -t teamcity-agent:EAP-linux-arm64 "context" +``` + +_The required free space to generate image(s) is about **2 GB**._ + +### EAP-linux-arm64-sudo + +[Dockerfile](linux/Agent/UbuntuARM/22.04-sudo/Dockerfile) + +This is an official [JetBrains TeamCity](https://www.jetbrains.com/teamcity/) build agent image. +This image allows to do *__sudo__* without a password for the *__buildagent__* user. ## To enable Docker, please add the following arguments: ```--privileged -e DOCKER_IN_DOCKER=start```. + +The docker image is available on: + +- [https://hub.docker.com/r/jetbrains/teamcity-agent](https://hub.docker.com/r/jetbrains/teamcity-agent) + +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.47.0 +- Git LFS v.3.0.2-1 +- Mercurial +- [Docker v.27.3.1](https://docs.docker.com/engine/release-notes/27) +- [Containerd.io v1.6.28-2](https://github.com/containerd/containerd/releases/tag/v1.6.28) +- [.NET SDK v.6.0.413 (LTS) ARM64 Checksum (SHA512) 7f05a9774d79e694da5a6115d9916abf87a65e40bd6bdaa5dca1f705795436bc8e764242f7045207386a86732ef5519f60bdb516a3860e4860bca7ee91a21759](https://dotnetcli.blob.core.windows.net/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-linux-arm64.tar.gz) + +Container platform: linux + +Docker build commands: + +``` +docker pull ubuntu:22.04 +echo TeamCity/webapps > context/.dockerignore +echo TeamCity/devPackage >> context/.dockerignore +echo TeamCity/lib >> context/.dockerignore +docker build -f "context/generated/linux/MinimalAgent/UbuntuARM/22.04/Dockerfile" -t teamcity-minimal-agent:EAP-linux-arm64 "context" +echo 2> context/.dockerignore +echo TeamCity >> context/.dockerignore +docker build -f "context/generated/linux/Agent/UbuntuARM/22.04/Dockerfile" -t teamcity-agent:EAP-linux-arm64 "context" +docker build -f "context/generated/linux/Agent/UbuntuARM/22.04-sudo/Dockerfile" -t teamcity-agent:EAP-linux-arm64-sudo "context" +``` + +_The required free space to generate image(s) is about **3 GB**._ + ### EAP-linux-arm64-sudo [Dockerfile](linux/Agent/UbuntuARM/20.04-sudo/Dockerfile) @@ -169,9 +296,9 @@ 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.47.0 -- Git LFS v.2.9.2 +- Git LFS v.3.0.2-1 - Mercurial -- [Docker v.5:24.0.9](https://docs.docker.com/engine/release-notes/24.0) +- [Docker v.27.3.1](https://docs.docker.com/engine/release-notes/27) - [Containerd.io v1.6.28-2](https://github.com/containerd/containerd/releases/tag/v1.6.28) - [.NET SDK v.6.0.413 (LTS) ARM64 Checksum (SHA512) 7f05a9774d79e694da5a6115d9916abf87a65e40bd6bdaa5dca1f705795436bc8e764242f7045207386a86732ef5519f60bdb516a3860e4860bca7ee91a21759](https://dotnetcli.blob.core.windows.net/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-linux-arm64.tar.gz) @@ -180,14 +307,14 @@ Container platform: linux Docker build commands: ``` -docker pull ubuntu:20.04 +docker pull ubuntu:22.04 echo TeamCity/webapps > context/.dockerignore echo TeamCity/devPackage >> context/.dockerignore echo TeamCity/lib >> context/.dockerignore -docker build -f "context/generated/linux/MinimalAgent/UbuntuARM/20.04/Dockerfile" -t teamcity-minimal-agent:EAP-linux-arm64 "context" +docker build -f "context/generated/linux/MinimalAgent/UbuntuARM/22.04/Dockerfile" -t teamcity-minimal-agent:EAP-linux-arm64 "context" echo 2> context/.dockerignore echo TeamCity >> context/.dockerignore -docker build -f "context/generated/linux/Agent/UbuntuARM/20.04/Dockerfile" -t teamcity-agent:EAP-linux-arm64 "context" +docker build -f "context/generated/linux/Agent/UbuntuARM/22.04/Dockerfile" -t teamcity-agent:EAP-linux-arm64 "context" docker build -f "context/generated/linux/Agent/UbuntuARM/20.04-sudo/Dockerfile" -t teamcity-agent:EAP-linux-arm64-sudo "context" ``` @@ -195,6 +322,47 @@ _The required free space to generate image(s) is about **3 GB**._ ### EAP-linux-sudo +[Dockerfile](linux/Agent/Ubuntu/22.04-sudo/Dockerfile) + +This is an official [JetBrains TeamCity](https://www.jetbrains.com/teamcity/) build agent image. +This image allows to do *__sudo__* without a password for the *__buildagent__* user. ## To enable Docker, please add the following arguments: ```--privileged -e DOCKER_IN_DOCKER=start```. + +The docker image is available on: + +- [https://hub.docker.com/r/jetbrains/teamcity-agent](https://hub.docker.com/r/jetbrains/teamcity-agent) + +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.3.0.2-1 +- Git v.2.47.0 +- Mercurial +- [Docker v.27.3.1](https://docs.docker.com/engine/release-notes/27) +- [Containerd.io v1.6.28-2](https://github.com/containerd/containerd/releases/tag/v1.6.28) +- [.NET SDK v.6.0.413 (LTS) x86 Checksum (SHA512) ee0a77d54e6d4917be7310ff0abb3bad5525bfb4beb1db0c215e65f64eb46511f5f12d6c7ff465a1d4ab38577e6a1950fde479ee94839c50e627020328a702de](https://dotnetcli.blob.core.windows.net/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-linux-x64.tar.gz) +- Perforce Helix Core client (p4) [2022.2-2637361](https://www.perforce.com/products/helix-core) + +Container platform: linux + +Docker build commands: + +``` +docker pull ubuntu:22.04 +echo TeamCity/webapps > context/.dockerignore +echo TeamCity/devPackage >> context/.dockerignore +echo TeamCity/lib >> context/.dockerignore +docker build -f "context/generated/linux/MinimalAgent/Ubuntu/22.04/Dockerfile" -t teamcity-minimal-agent:EAP-linux "context" +echo 2> context/.dockerignore +echo TeamCity >> context/.dockerignore +docker build -f "context/generated/linux/Agent/Ubuntu/22.04/Dockerfile" -t teamcity-agent:EAP-linux "context" +docker build -f "context/generated/linux/Agent/Ubuntu/22.04-sudo/Dockerfile" -t teamcity-agent:EAP-linux-sudo "context" +``` + +_The required free space to generate image(s) is about **3 GB**._ + +### EAP-linux-sudo + [Dockerfile](linux/Agent/Ubuntu/20.04-sudo/Dockerfile) This is an official [JetBrains TeamCity](https://www.jetbrains.com/teamcity/) build agent image. @@ -208,10 +376,10 @@ 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 LFS v.3.0.2-1 - Git v.2.47.0 - Mercurial -- [Docker v.5:24.0.9](https://docs.docker.com/engine/release-notes/24.0) +- [Docker v.27.3.1](https://docs.docker.com/engine/release-notes/27) - [Containerd.io v1.6.28-2](https://github.com/containerd/containerd/releases/tag/v1.6.28) - [.NET SDK v.6.0.413 (LTS) x86 Checksum (SHA512) ee0a77d54e6d4917be7310ff0abb3bad5525bfb4beb1db0c215e65f64eb46511f5f12d6c7ff465a1d4ab38577e6a1950fde479ee94839c50e627020328a702de](https://dotnetcli.blob.core.windows.net/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-linux-x64.tar.gz) - Perforce Helix Core client (p4) [2022.2-2637361](https://www.perforce.com/products/helix-core) @@ -221,14 +389,14 @@ Container platform: linux Docker build commands: ``` -docker pull ubuntu:20.04 +docker pull ubuntu:22.04 echo TeamCity/webapps > context/.dockerignore echo TeamCity/devPackage >> context/.dockerignore echo TeamCity/lib >> context/.dockerignore -docker build -f "context/generated/linux/MinimalAgent/Ubuntu/20.04/Dockerfile" -t teamcity-minimal-agent:EAP-linux "context" +docker build -f "context/generated/linux/MinimalAgent/Ubuntu/22.04/Dockerfile" -t teamcity-minimal-agent:EAP-linux "context" echo 2> context/.dockerignore echo TeamCity >> context/.dockerignore -docker build -f "context/generated/linux/Agent/Ubuntu/20.04/Dockerfile" -t teamcity-agent:EAP-linux "context" +docker build -f "context/generated/linux/Agent/Ubuntu/22.04/Dockerfile" -t teamcity-agent:EAP-linux "context" docker build -f "context/generated/linux/Agent/Ubuntu/20.04-sudo/Dockerfile" -t teamcity-agent:EAP-linux-sudo "context" ``` @@ -390,7 +558,7 @@ Installed components: - Git LFS v.2.3.4 - Git v.2.41.0 - Mercurial -- [Docker v.5:24.0.9](https://docs.docker.com/engine/release-notes/24.0) +- [Docker v.27.3.1](https://docs.docker.com/engine/release-notes/27) - [Containerd.io v1.6.28-2](https://github.com/containerd/containerd/releases/tag/v1.6.28) - [.NET SDK v.6.0.413 (LTS) x86 Checksum (SHA512) ee0a77d54e6d4917be7310ff0abb3bad5525bfb4beb1db0c215e65f64eb46511f5f12d6c7ff465a1d4ab38577e6a1950fde479ee94839c50e627020328a702de](https://dotnetcli.blob.core.windows.net/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-linux-x64.tar.gz) - Perforce Helix Core client (p4) [2022.2-2637361](https://www.perforce.com/products/helix-core) @@ -424,10 +592,10 @@ 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 LFS v.3.0.2-1 - Git v.2.47.0 - Mercurial -- [Docker v.5:24.0.9](https://docs.docker.com/engine/release-notes/24.0) +- [Docker v.27.3.1](https://docs.docker.com/engine/release-notes/27) - [Containerd.io v1.6.28-2](https://github.com/containerd/containerd/releases/tag/v1.6.28) - [.NET SDK v.6.0.413 (LTS) x86 Checksum (SHA512) ee0a77d54e6d4917be7310ff0abb3bad5525bfb4beb1db0c215e65f64eb46511f5f12d6c7ff465a1d4ab38577e6a1950fde479ee94839c50e627020328a702de](https://dotnetcli.blob.core.windows.net/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-linux-x64.tar.gz) - Perforce Helix Core client (p4) [2022.2-2637361](https://www.perforce.com/products/helix-core) @@ -464,7 +632,7 @@ Installed components: - Git v.2.41.0 - Git LFS v.2.3.4 - Mercurial -- [Docker v.5:24.0.9](https://docs.docker.com/engine/release-notes/24.0) +- [Docker v.27.3.1](https://docs.docker.com/engine/release-notes/27) - [Containerd.io v1.6.28-2](https://github.com/containerd/containerd/releases/tag/v1.6.28) - [.NET SDK v.6.0.413 (LTS) ARM64 Checksum (SHA512) 7f05a9774d79e694da5a6115d9916abf87a65e40bd6bdaa5dca1f705795436bc8e764242f7045207386a86732ef5519f60bdb516a3860e4860bca7ee91a21759](https://dotnetcli.blob.core.windows.net/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-linux-arm64.tar.gz) @@ -498,9 +666,9 @@ 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.47.0 -- Git LFS v.2.9.2 +- Git LFS v.3.0.2-1 - Mercurial -- [Docker v.5:24.0.9](https://docs.docker.com/engine/release-notes/24.0) +- [Docker v.27.3.1](https://docs.docker.com/engine/release-notes/27) - [Containerd.io v1.6.28-2](https://github.com/containerd/containerd/releases/tag/v1.6.28) - [.NET SDK v.6.0.413 (LTS) ARM64 Checksum (SHA512) 7f05a9774d79e694da5a6115d9916abf87a65e40bd6bdaa5dca1f705795436bc8e764242f7045207386a86732ef5519f60bdb516a3860e4860bca7ee91a21759](https://dotnetcli.blob.core.windows.net/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-linux-arm64.tar.gz) diff --git a/context/generated/teamcity-minimal-agent-EAP-linux-arm64.cmd b/context/generated/teamcity-minimal-agent-EAP-linux-arm64.cmd index c3ef0b97b..732fe129f 100644 --- a/context/generated/teamcity-minimal-agent-EAP-linux-arm64.cmd +++ b/context/generated/teamcity-minimal-agent-EAP-linux-arm64.cmd @@ -1,6 +1,6 @@ cd ../.. -docker pull ubuntu:20.04 +docker pull ubuntu:22.04 echo TeamCity/webapps > context/.dockerignore echo TeamCity/devPackage >> context/.dockerignore echo TeamCity/lib >> context/.dockerignore -docker build -f "context/generated/linux/MinimalAgent/UbuntuARM/20.04/Dockerfile" -t teamcity-minimal-agent:EAP-linux-arm64 "context" +docker build -f "context/generated/linux/MinimalAgent/UbuntuARM/22.04/Dockerfile" -t teamcity-minimal-agent:EAP-linux-arm64 "context" diff --git a/context/generated/teamcity-minimal-agent-EAP-linux-arm64.sh b/context/generated/teamcity-minimal-agent-EAP-linux-arm64.sh index d5220d3ee..829d0230b 100644 --- a/context/generated/teamcity-minimal-agent-EAP-linux-arm64.sh +++ b/context/generated/teamcity-minimal-agent-EAP-linux-arm64.sh @@ -1,7 +1,7 @@ #!/bin/bash cd ../.. -docker pull ubuntu:20.04 +docker pull ubuntu:22.04 echo TeamCity/webapps > context/.dockerignore echo TeamCity/devPackage >> context/.dockerignore echo TeamCity/lib >> context/.dockerignore -docker build -f "context/generated/linux/MinimalAgent/UbuntuARM/20.04/Dockerfile" -t teamcity-minimal-agent:EAP-linux-arm64 "context" +docker build -f "context/generated/linux/MinimalAgent/UbuntuARM/22.04/Dockerfile" -t teamcity-minimal-agent:EAP-linux-arm64 "context" diff --git a/context/generated/teamcity-minimal-agent-EAP-linux.cmd b/context/generated/teamcity-minimal-agent-EAP-linux.cmd index fae8c3f40..2f1910e51 100644 --- a/context/generated/teamcity-minimal-agent-EAP-linux.cmd +++ b/context/generated/teamcity-minimal-agent-EAP-linux.cmd @@ -1,6 +1,6 @@ cd ../.. -docker pull ubuntu:20.04 +docker pull ubuntu:22.04 echo TeamCity/webapps > context/.dockerignore echo TeamCity/devPackage >> context/.dockerignore echo TeamCity/lib >> context/.dockerignore -docker build -f "context/generated/linux/MinimalAgent/Ubuntu/20.04/Dockerfile" -t teamcity-minimal-agent:EAP-linux "context" +docker build -f "context/generated/linux/MinimalAgent/Ubuntu/22.04/Dockerfile" -t teamcity-minimal-agent:EAP-linux "context" diff --git a/context/generated/teamcity-minimal-agent-EAP-linux.sh b/context/generated/teamcity-minimal-agent-EAP-linux.sh index 6940fc96a..49ece9413 100644 --- a/context/generated/teamcity-minimal-agent-EAP-linux.sh +++ b/context/generated/teamcity-minimal-agent-EAP-linux.sh @@ -1,7 +1,7 @@ #!/bin/bash cd ../.. -docker pull ubuntu:20.04 +docker pull ubuntu:22.04 echo TeamCity/webapps > context/.dockerignore echo TeamCity/devPackage >> context/.dockerignore echo TeamCity/lib >> context/.dockerignore -docker build -f "context/generated/linux/MinimalAgent/Ubuntu/20.04/Dockerfile" -t teamcity-minimal-agent:EAP-linux "context" +docker build -f "context/generated/linux/MinimalAgent/Ubuntu/22.04/Dockerfile" -t teamcity-minimal-agent:EAP-linux "context" diff --git a/context/generated/teamcity-minimal-agent.md b/context/generated/teamcity-minimal-agent.md index 1a18dffe0..ba6f185e7 100644 --- a/context/generated/teamcity-minimal-agent.md +++ b/context/generated/teamcity-minimal-agent.md @@ -13,6 +13,9 @@ When running an image with multi-architecture support, docker will automatically #### linux +- 22.04 + - [EAP-linux](#EAP-linux) + - [EAP-linux-arm64](#EAP-linux-arm64) - 20.04 - [EAP-linux](#EAP-linux) - [EAP-linux-arm64](#EAP-linux-arm64) @@ -36,10 +39,11 @@ When running an image with multi-architecture support, docker will automatically ### EAP -Supported platforms: linux 20.04, windows 1809, windows 2022 +Supported platforms: linux 20.04, linux 22.04, windows 1809, windows 2022 #### Content +- [EAP-linux](#EAP-linux) - [EAP-linux](#EAP-linux) - [EAP-nanoserver-1809](#EAP-nanoserver-1809) - [EAP-nanoserver-2022](#EAP-nanoserver-2022) @@ -47,7 +51,7 @@ Supported platforms: linux 20.04, windows 1809, windows 2022 # Dockerfile links -* **Linux**. [teamcity-minimal-agent:EAP-linux,EAP](https://github.com/JetBrains/teamcity-docker-images/tree/master/context/generated/linux/MinimalAgent/Ubuntu/20.04/Dockerfile), [teamcity-minimal-agent:EAP-linux-18.04,EAP](https://github.com/JetBrains/teamcity-docker-images/tree/master/context/generated/linux/MinimalAgent/Ubuntu/18.04/Dockerfile), [teamcity-minimal-agent:EAP-linux-arm64,EAP](https://github.com/JetBrains/teamcity-docker-images/tree/master/context/generated/linux/MinimalAgent/UbuntuARM/20.04/Dockerfile), [teamcity-minimal-agent:EAP-linux-arm64-18.04,EAP](https://github.com/JetBrains/teamcity-docker-images/tree/master/context/generated/linux/MinimalAgent/UbuntuARM/18.04/Dockerfile) +* **Linux**. [teamcity-minimal-agent:EAP-linux,EAP](https://github.com/JetBrains/teamcity-docker-images/tree/master/context/generated/linux/MinimalAgent/Ubuntu/20.04/Dockerfile), [teamcity-minimal-agent:EAP-linux,EAP](https://github.com/JetBrains/teamcity-docker-images/tree/master/context/generated/linux/MinimalAgent/Ubuntu/22.04/Dockerfile), [teamcity-minimal-agent:EAP-linux-18.04,EAP](https://github.com/JetBrains/teamcity-docker-images/tree/master/context/generated/linux/MinimalAgent/Ubuntu/18.04/Dockerfile), [teamcity-minimal-agent:EAP-linux-arm64,EAP](https://github.com/JetBrains/teamcity-docker-images/tree/master/context/generated/linux/MinimalAgent/UbuntuARM/20.04/Dockerfile), [teamcity-minimal-agent:EAP-linux-arm64,EAP](https://github.com/JetBrains/teamcity-docker-images/tree/master/context/generated/linux/MinimalAgent/UbuntuARM/22.04/Dockerfile), [teamcity-minimal-agent:EAP-linux-arm64-18.04,EAP](https://github.com/JetBrains/teamcity-docker-images/tree/master/context/generated/linux/MinimalAgent/UbuntuARM/18.04/Dockerfile) * **Windows**. [teamcity-minimal-agent:EAP-nanoserver-1809,EAP](https://github.com/JetBrains/teamcity-docker-images/tree/master/context/generated/windows/MinimalAgent/nanoserver/1809/Dockerfile), [teamcity-minimal-agent:EAP-nanoserver-2022,EAP](https://github.com/JetBrains/teamcity-docker-images/tree/master/context/generated/windows/MinimalAgent/nanoserver/2022/Dockerfile), [teamcity-minimal-agent:EAP-nanoserver-1803,EAP](https://github.com/JetBrains/teamcity-docker-images/tree/master/context/generated/windows/MinimalAgent/nanoserver/1803/Dockerfile), [teamcity-minimal-agent:EAP-nanoserver-1903,EAP](https://github.com/JetBrains/teamcity-docker-images/tree/master/context/generated/windows/MinimalAgent/nanoserver/1903/Dockerfile), [teamcity-minimal-agent:EAP-nanoserver-1909,EAP](https://github.com/JetBrains/teamcity-docker-images/tree/master/context/generated/windows/MinimalAgent/nanoserver/1909/Dockerfile) @@ -81,6 +85,35 @@ docker build -f "context/generated/linux/MinimalAgent/Ubuntu/20.04/Dockerfile" - _The required free space to generate image(s) is about **1 GB**._ +### EAP-linux + +[Dockerfile](linux/MinimalAgent/Ubuntu/22.04/Dockerfile) + +This is an official [JetBrains TeamCity](https://www.jetbrains.com/teamcity/) build agent image. + +The docker image is available on: + +- [https://hub.docker.com/r/jetbrains/teamcity-minimal-agent](https://hub.docker.com/r/jetbrains/teamcity-minimal-agent) + +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) + +Container platform: linux + +Docker build commands: + +``` +docker pull ubuntu:22.04 +echo TeamCity/webapps > context/.dockerignore +echo TeamCity/devPackage >> context/.dockerignore +echo TeamCity/lib >> context/.dockerignore +docker build -f "context/generated/linux/MinimalAgent/Ubuntu/22.04/Dockerfile" -t teamcity-minimal-agent:EAP-linux "context" +``` + +_The required free space to generate image(s) is about **1 GB**._ + ### EAP-nanoserver-1809 [Dockerfile](windows/MinimalAgent/nanoserver/1809/Dockerfile) @@ -193,6 +226,32 @@ docker build -f "context/generated/linux/MinimalAgent/UbuntuARM/20.04/Dockerfile _The required free space to generate image(s) is about **1 GB**._ +### EAP-linux-arm64 + +[Dockerfile](linux/MinimalAgent/UbuntuARM/22.04/Dockerfile) + +This is an official [JetBrains TeamCity](https://www.jetbrains.com/teamcity/) build agent image. +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) +- [Python venv](https://docs.python.org/3/library/venv.html#module-venv) + +Container platform: linux + +Docker build commands: + +``` +docker pull ubuntu:22.04 +echo TeamCity/webapps > context/.dockerignore +echo TeamCity/devPackage >> context/.dockerignore +echo TeamCity/lib >> context/.dockerignore +docker build -f "context/generated/linux/MinimalAgent/UbuntuARM/22.04/Dockerfile" -t teamcity-minimal-agent:EAP-linux-arm64 "context" +``` + +_The required free space to generate image(s) is about **1 GB**._ + ### EAP-linux-arm64-18.04 [Dockerfile](linux/MinimalAgent/UbuntuARM/18.04/Dockerfile) diff --git a/context/generated/teamcity-server-EAP-linux-arm64.cmd b/context/generated/teamcity-server-EAP-linux-arm64.cmd index e7bd83f17..3a3fc1080 100644 --- a/context/generated/teamcity-server-EAP-linux-arm64.cmd +++ b/context/generated/teamcity-server-EAP-linux-arm64.cmd @@ -1,5 +1,5 @@ cd ../.. -docker pull ubuntu:20.04 +docker pull ubuntu:22.04 echo TeamCity/buildAgent > context/.dockerignore echo TeamCity/temp >> context/.dockerignore -docker build -f "context/generated/linux/Server/UbuntuARM/20.04/Dockerfile" -t teamcity-server:EAP-linux-arm64 "context" +docker build -f "context/generated/linux/Server/UbuntuARM/22.04/Dockerfile" -t teamcity-server:EAP-linux-arm64 "context" diff --git a/context/generated/teamcity-server-EAP-linux-arm64.sh b/context/generated/teamcity-server-EAP-linux-arm64.sh index 2f083006e..3ebd50acb 100644 --- a/context/generated/teamcity-server-EAP-linux-arm64.sh +++ b/context/generated/teamcity-server-EAP-linux-arm64.sh @@ -1,6 +1,6 @@ #!/bin/bash cd ../.. -docker pull ubuntu:20.04 +docker pull ubuntu:22.04 echo TeamCity/buildAgent > context/.dockerignore echo TeamCity/temp >> context/.dockerignore -docker build -f "context/generated/linux/Server/UbuntuARM/20.04/Dockerfile" -t teamcity-server:EAP-linux-arm64 "context" +docker build -f "context/generated/linux/Server/UbuntuARM/22.04/Dockerfile" -t teamcity-server:EAP-linux-arm64 "context" diff --git a/context/generated/teamcity-server-EAP-linux.cmd b/context/generated/teamcity-server-EAP-linux.cmd index 1ac2ff257..028077017 100644 --- a/context/generated/teamcity-server-EAP-linux.cmd +++ b/context/generated/teamcity-server-EAP-linux.cmd @@ -1,5 +1,5 @@ cd ../.. -docker pull ubuntu:20.04 +docker pull ubuntu:22.04 echo TeamCity/buildAgent > context/.dockerignore echo TeamCity/temp >> context/.dockerignore -docker build -f "context/generated/linux/Server/Ubuntu/20.04/Dockerfile" -t teamcity-server:EAP-linux "context" +docker build -f "context/generated/linux/Server/Ubuntu/22.04/Dockerfile" -t teamcity-server:EAP-linux "context" diff --git a/context/generated/teamcity-server-EAP-linux.sh b/context/generated/teamcity-server-EAP-linux.sh index d0247af83..a3609e04a 100644 --- a/context/generated/teamcity-server-EAP-linux.sh +++ b/context/generated/teamcity-server-EAP-linux.sh @@ -1,6 +1,6 @@ #!/bin/bash cd ../.. -docker pull ubuntu:20.04 +docker pull ubuntu:22.04 echo TeamCity/buildAgent > context/.dockerignore echo TeamCity/temp >> context/.dockerignore -docker build -f "context/generated/linux/Server/Ubuntu/20.04/Dockerfile" -t teamcity-server:EAP-linux "context" +docker build -f "context/generated/linux/Server/Ubuntu/22.04/Dockerfile" -t teamcity-server:EAP-linux "context" diff --git a/context/generated/teamcity-server.md b/context/generated/teamcity-server.md index ae2198233..87ba942f0 100644 --- a/context/generated/teamcity-server.md +++ b/context/generated/teamcity-server.md @@ -13,6 +13,9 @@ When running an image with multi-architecture support, docker will automatically #### linux +- 22.04 + - [EAP-linux](#EAP-linux) + - [EAP-linux-arm64](#EAP-linux-arm64) - 20.04 - [EAP-linux](#EAP-linux) - [EAP-linux-arm64](#EAP-linux-arm64) @@ -36,10 +39,11 @@ When running an image with multi-architecture support, docker will automatically ### EAP -Supported platforms: linux 20.04, windows 1809, windows 2022 +Supported platforms: linux 20.04, linux 22.04, windows 1809, windows 2022 #### Content +- [EAP-linux](#EAP-linux) - [EAP-linux](#EAP-linux) - [EAP-nanoserver-1809](#EAP-nanoserver-1809) - [EAP-nanoserver-2022](#EAP-nanoserver-2022) @@ -47,7 +51,7 @@ Supported platforms: linux 20.04, windows 1809, windows 2022 # Dockerfile links -* **Linux**. [teamcity-server:EAP-linux,EAP](https://github.com/JetBrains/teamcity-docker-images/tree/master/context/generated/linux/Server/Ubuntu/20.04/Dockerfile), [teamcity-server:EAP-linux-18.04,EAP](https://github.com/JetBrains/teamcity-docker-images/tree/master/context/generated/linux/Server/Ubuntu/18.04/Dockerfile), [teamcity-server:EAP-linux-arm64,EAP](https://github.com/JetBrains/teamcity-docker-images/tree/master/context/generated/linux/Server/UbuntuARM/20.04/Dockerfile), [teamcity-server:EAP-linux-arm64-18.04,EAP](https://github.com/JetBrains/teamcity-docker-images/tree/master/context/generated/linux/Server/UbuntuARM/18.04/Dockerfile) +* **Linux**. [teamcity-server:EAP-linux,EAP](https://github.com/JetBrains/teamcity-docker-images/tree/master/context/generated/linux/Server/Ubuntu/20.04/Dockerfile), [teamcity-server:EAP-linux,EAP](https://github.com/JetBrains/teamcity-docker-images/tree/master/context/generated/linux/Server/Ubuntu/22.04/Dockerfile), [teamcity-server:EAP-linux-18.04,EAP](https://github.com/JetBrains/teamcity-docker-images/tree/master/context/generated/linux/Server/Ubuntu/18.04/Dockerfile), [teamcity-server:EAP-linux-arm64,EAP](https://github.com/JetBrains/teamcity-docker-images/tree/master/context/generated/linux/Server/UbuntuARM/20.04/Dockerfile), [teamcity-server:EAP-linux-arm64,EAP](https://github.com/JetBrains/teamcity-docker-images/tree/master/context/generated/linux/Server/UbuntuARM/22.04/Dockerfile), [teamcity-server:EAP-linux-arm64-18.04,EAP](https://github.com/JetBrains/teamcity-docker-images/tree/master/context/generated/linux/Server/UbuntuARM/18.04/Dockerfile) * **Windows**. [teamcity-server:EAP-nanoserver-1809,EAP](https://github.com/JetBrains/teamcity-docker-images/tree/master/context/generated/windows/Server/nanoserver/1809/Dockerfile), [teamcity-server:EAP-nanoserver-2022,EAP](https://github.com/JetBrains/teamcity-docker-images/tree/master/context/generated/windows/Server/nanoserver/2022/Dockerfile), [teamcity-server:EAP-nanoserver-1803,EAP](https://github.com/JetBrains/teamcity-docker-images/tree/master/context/generated/windows/Server/nanoserver/1803/Dockerfile), [teamcity-server:EAP-nanoserver-1903,EAP](https://github.com/JetBrains/teamcity-docker-images/tree/master/context/generated/windows/Server/nanoserver/1903/Dockerfile), [teamcity-server:EAP-nanoserver-1909,EAP](https://github.com/JetBrains/teamcity-docker-images/tree/master/context/generated/windows/Server/nanoserver/1909/Dockerfile) @@ -66,7 +70,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) - Git v.2.47.0 -- Git LFS v.2.9.2 +- Git LFS v.3.0.2-1 - Perforce Helix Core client (p4) [2022.2-2637361](https://www.perforce.com/products/helix-core) Container platform: linux @@ -82,6 +86,36 @@ docker build -f "context/generated/linux/Server/Ubuntu/20.04/Dockerfile" -t team _The required free space to generate image(s) is about **1 GB**._ +### EAP-linux + +[Dockerfile](linux/Server/Ubuntu/22.04/Dockerfile) + +This is an official [JetBrains TeamCity](https://www.jetbrains.com/teamcity/) server image. The image is suitable for production use and evaluation purposes. + +The docker image is available on: + +- [https://hub.docker.com/r/jetbrains/teamcity-server](https://hub.docker.com/r/jetbrains/teamcity-server) + +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.47.0 +- Git LFS v.3.0.2-1 +- Perforce Helix Core client (p4) [2022.2-2637361](https://www.perforce.com/products/helix-core) + +Container platform: linux + +Docker build commands: + +``` +docker pull ubuntu:22.04 +echo TeamCity/buildAgent > context/.dockerignore +echo TeamCity/temp >> context/.dockerignore +docker build -f "context/generated/linux/Server/Ubuntu/22.04/Dockerfile" -t teamcity-server:EAP-linux "context" +``` + +_The required free space to generate image(s) is about **1 GB**._ + ### EAP-nanoserver-1809 [Dockerfile](windows/Server/nanoserver/1809/Dockerfile) @@ -178,7 +212,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) - Git v.2.47.0 -- Git LFS v.2.9.2 +- Git LFS v.3.0.2-1 Container platform: linux @@ -193,6 +227,32 @@ docker build -f "context/generated/linux/Server/UbuntuARM/20.04/Dockerfile" -t t _The required free space to generate image(s) is about **1 GB**._ +### EAP-linux-arm64 + +[Dockerfile](linux/Server/UbuntuARM/22.04/Dockerfile) + +This is an official [JetBrains TeamCity](https://www.jetbrains.com/teamcity/) server image. The image is suitable for production use and evaluation purposes. +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.47.0 +- Git LFS v.3.0.2-1 + +Container platform: linux + +Docker build commands: + +``` +docker pull ubuntu:22.04 +echo TeamCity/buildAgent > context/.dockerignore +echo TeamCity/temp >> context/.dockerignore +docker build -f "context/generated/linux/Server/UbuntuARM/22.04/Dockerfile" -t teamcity-server:EAP-linux-arm64 "context" +``` + +_The required free space to generate image(s) is about **1 GB**._ + ### EAP-linux-arm64-18.04 [Dockerfile](linux/Server/UbuntuARM/18.04/Dockerfile)