From 883ff049c2a47c0443c00b4c32425bd29efac01c Mon Sep 17 00:00:00 2001 From: Andrey Koltsov Date: Tue, 26 Mar 2024 21:12:55 +0300 Subject: [PATCH] [TCQA] Remove out-of-support docker-compose V1, replacing with compose plugin bundled into "docker-ce-cli" (#144) [TCQA] Remove out-of-support docker-compose V1, replacing with compose plugin bundled into "docker-ce-cli" (#144) * Remove 'docker-compose' as a separate utility --- configs/linux.config | 1 - configs/linux/Agent/Ubuntu/Ubuntu-sudo.Dockerfile | 1 - configs/linux/Agent/Ubuntu/Ubuntu.Dockerfile | 5 ----- configs/linux/Agent/UbuntuARM/UbuntuARM-sudo.Dockerfile | 1 - configs/linux/Agent/UbuntuARM/UbuntuARM.Dockerfile | 5 ----- context/generated/linux/Agent/Ubuntu/18.04/Dockerfile | 5 ----- context/generated/linux/Agent/Ubuntu/20.04/Dockerfile | 5 ----- context/generated/linux/Agent/UbuntuARM/18.04/Dockerfile | 5 ----- context/generated/linux/Agent/UbuntuARM/20.04/Dockerfile | 5 ----- context/generated/teamcity-agent.md | 8 -------- 10 files changed, 41 deletions(-) diff --git a/configs/linux.config b/configs/linux.config index 74c69de83..ae9ba1bba 100644 --- a/configs/linux.config +++ b/configs/linux.config @@ -25,7 +25,6 @@ gitLinuxComponentName=Git v.2.43.2 gitLFSLinuxComponentVersion=2.9.2-1 gitLFSLinuxComponentName=Git LFS v.2.9.2 -dockerComposeLinuxComponentVersion=1.28.5 dockerLinuxComponentVersion=5:24.0.9-1~ubuntu dockerLinuxComponentName=[Docker v.5:24.0.9](https://docs.docker.com/engine/release-notes/24.0) diff --git a/configs/linux/Agent/Ubuntu/Ubuntu-sudo.Dockerfile b/configs/linux/Agent/Ubuntu/Ubuntu-sudo.Dockerfile index ecdec8ff3..057630903 100644 --- a/configs/linux/Agent/Ubuntu/Ubuntu-sudo.Dockerfile +++ b/configs/linux/Agent/Ubuntu/Ubuntu-sudo.Dockerfile @@ -16,7 +16,6 @@ # @AddToolToDoc ${gitLinuxComponentName} # @AddToolToDoc Mercurial # @AddToolToDoc ${dockerLinuxComponentName} -# @AddToolToDoc [Docker Compose v.${dockerComposeLinuxComponentVersion}](https://github.com/docker/compose/releases/tag/${dockerComposeLinuxComponentVersion}) # @AddToolToDoc ${containerdIoLinuxComponentName} # @AddToolToDoc [${dotnetLinuxComponentName}](${dotnetLinuxComponent}) # @AddToolToDoc ${p4Name} diff --git a/configs/linux/Agent/Ubuntu/Ubuntu.Dockerfile b/configs/linux/Agent/Ubuntu/Ubuntu.Dockerfile index 2f35be403..cd65cdb31 100644 --- a/configs/linux/Agent/Ubuntu/Ubuntu.Dockerfile +++ b/configs/linux/Agent/Ubuntu/Ubuntu.Dockerfile @@ -5,7 +5,6 @@ # ARG dotnetLibs # ARG gitLinuxComponentVersion # ARG gitLFSLinuxComponentVersion -# ARG dockerComposeLinuxComponentVersion # ARG dockerLinuxComponentVersion # Id teamcity-agent @@ -27,7 +26,6 @@ # @AddToolToDoc ${gitLinuxComponentName} # @AddToolToDoc Mercurial # @AddToolToDoc ${dockerLinuxComponentName} -# @AddToolToDoc [Docker Compose v.${dockerComposeLinuxComponentVersion}](https://github.com/docker/compose/releases/tag/${dockerComposeLinuxComponentVersion}) # @AddToolToDoc ${containerdIoLinuxComponentName} # @AddToolToDoc [${dotnetLinuxComponentName}](${dotnetLinuxComponent}) # @AddToolToDoc ${p4Name} @@ -62,7 +60,6 @@ ARG dotnetLinuxComponentSHA512 ARG dotnetLibs ARG gitLinuxComponentVersion ARG gitLFSLinuxComponentVersion -ARG dockerComposeLinuxComponentVersion ARG dockerLinuxComponentVersion ARG containerdIoLinuxComponentVersion ARG p4Version @@ -95,8 +92,6 @@ RUN apt-get update && \ systemd && \ systemctl disable docker && \ sed -i -e 's/\r$//' /services/run-docker.sh && \ -# Docker Compose - curl -SL "https://github.com/docker/compose/releases/download/${dockerComposeLinuxComponentVersion}/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose && chmod +x /usr/local/bin/docker-compose && \ # Dotnet apt-get install -y --no-install-recommends ${dotnetLibs} && \ # https://github.com/goodwithtech/dockle/blob/master/CHECKPOINT.md#dkl-di-0005 diff --git a/configs/linux/Agent/UbuntuARM/UbuntuARM-sudo.Dockerfile b/configs/linux/Agent/UbuntuARM/UbuntuARM-sudo.Dockerfile index a7ad494a4..71ee31c20 100644 --- a/configs/linux/Agent/UbuntuARM/UbuntuARM-sudo.Dockerfile +++ b/configs/linux/Agent/UbuntuARM/UbuntuARM-sudo.Dockerfile @@ -17,7 +17,6 @@ # @AddToolToDoc Mercurial # @AddToolToDoc ${dockerLinuxComponentName} # @AddToolToDoc ${containerdIoLinuxComponentName} -# @AddToolToDoc [Docker Compose v.${dockerComposeLinuxComponentVersion}](https://github.com/docker/compose/releases/tag/${dockerComposeLinuxComponentVersion}) # @AddToolToDoc [${dotnetLinuxARM64ComponentName}](${dotnetLinuxARM64Component}) diff --git a/configs/linux/Agent/UbuntuARM/UbuntuARM.Dockerfile b/configs/linux/Agent/UbuntuARM/UbuntuARM.Dockerfile index df85d727b..d3e24fa9a 100644 --- a/configs/linux/Agent/UbuntuARM/UbuntuARM.Dockerfile +++ b/configs/linux/Agent/UbuntuARM/UbuntuARM.Dockerfile @@ -5,7 +5,6 @@ # ARG dotnetLibs # ARG gitLinuxComponentVersion # ARG gitLFSLinuxComponentVersion -# ARG dockerComposeLinuxComponentVersion # ARG dockerLinuxComponentVersion # Id teamcity-agent @@ -26,7 +25,6 @@ # @AddToolToDoc Mercurial # @AddToolToDoc ${dockerLinuxComponentName} # @AddToolToDoc ${containerdIoLinuxComponentName} -# @AddToolToDoc [Docker Compose v.${dockerComposeLinuxComponentVersion}](https://github.com/docker/compose/releases/tag/${dockerComposeLinuxComponentVersion}) # @AddToolToDoc [${dotnetLinuxARM64ComponentName}](${dotnetLinuxARM64Component}) @@ -59,7 +57,6 @@ ARG dotnetLinuxARM64ComponentSHA512 ARG dotnetLibs ARG gitLinuxComponentVersion ARG gitLFSLinuxComponentVersion -ARG dockerComposeLinuxComponentVersion ARG dockerLinuxComponentVersion ARG containerdIoLinuxComponentVersion @@ -82,8 +79,6 @@ RUN apt-get update && \ systemd && \ systemctl disable docker && \ sed -i -e 's/\r$//' /services/run-docker.sh && \ -# Docker-Compose - curl -SL "https://github.com/docker/compose/releases/download/${dockerComposeLinuxComponentVersion}/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose && chmod +x /usr/local/bin/docker-compose && \ # .NET Libraries apt-get install -y --no-install-recommends ${dotnetLibs} && \ # https://github.com/goodwithtech/dockle/blob/master/CHECKPOINT.md#dkl-di-0005 diff --git a/context/generated/linux/Agent/Ubuntu/18.04/Dockerfile b/context/generated/linux/Agent/Ubuntu/18.04/Dockerfile index d1efb0411..d10901270 100644 --- a/context/generated/linux/Agent/Ubuntu/18.04/Dockerfile +++ b/context/generated/linux/Agent/Ubuntu/18.04/Dockerfile @@ -1,6 +1,5 @@ # Default arguments ARG containerdIoLinuxComponentVersion='1.6.28-2' -ARG dockerComposeLinuxComponentVersion='1.28.5' ARG dockerLinuxComponentVersion='5:24.0.9-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' @@ -18,7 +17,6 @@ ARG teamcityMinimalAgentImage='teamcity-minimal-agent:EAP-linux-18.04' # ARG dotnetLibs # ARG gitLinuxComponentVersion # ARG gitLFSLinuxComponentVersion -# ARG dockerComposeLinuxComponentVersion # ARG dockerLinuxComponentVersion @@ -54,7 +52,6 @@ ARG dotnetLinuxComponentSHA512 ARG dotnetLibs ARG gitLinuxComponentVersion ARG gitLFSLinuxComponentVersion -ARG dockerComposeLinuxComponentVersion ARG dockerLinuxComponentVersion ARG containerdIoLinuxComponentVersion ARG p4Version @@ -87,8 +84,6 @@ RUN apt-get update && \ systemd && \ systemctl disable docker && \ sed -i -e 's/\r$//' /services/run-docker.sh && \ -# Docker Compose - curl -SL "https://github.com/docker/compose/releases/download/${dockerComposeLinuxComponentVersion}/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose && chmod +x /usr/local/bin/docker-compose && \ # Dotnet apt-get install -y --no-install-recommends ${dotnetLibs} && \ # https://github.com/goodwithtech/dockle/blob/master/CHECKPOINT.md#dkl-di-0005 diff --git a/context/generated/linux/Agent/Ubuntu/20.04/Dockerfile b/context/generated/linux/Agent/Ubuntu/20.04/Dockerfile index 24e175f30..ad9fc3f05 100644 --- a/context/generated/linux/Agent/Ubuntu/20.04/Dockerfile +++ b/context/generated/linux/Agent/Ubuntu/20.04/Dockerfile @@ -1,6 +1,5 @@ # Default arguments ARG containerdIoLinuxComponentVersion='1.6.28-2' -ARG dockerComposeLinuxComponentVersion='1.28.5' ARG dockerLinuxComponentVersion='5:24.0.9-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' @@ -18,7 +17,6 @@ ARG teamcityMinimalAgentImage='teamcity-minimal-agent:EAP-linux' # ARG dotnetLibs # ARG gitLinuxComponentVersion # ARG gitLFSLinuxComponentVersion -# ARG dockerComposeLinuxComponentVersion # ARG dockerLinuxComponentVersion @@ -54,7 +52,6 @@ ARG dotnetLinuxComponentSHA512 ARG dotnetLibs ARG gitLinuxComponentVersion ARG gitLFSLinuxComponentVersion -ARG dockerComposeLinuxComponentVersion ARG dockerLinuxComponentVersion ARG containerdIoLinuxComponentVersion ARG p4Version @@ -87,8 +84,6 @@ RUN apt-get update && \ systemd && \ systemctl disable docker && \ sed -i -e 's/\r$//' /services/run-docker.sh && \ -# Docker Compose - curl -SL "https://github.com/docker/compose/releases/download/${dockerComposeLinuxComponentVersion}/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose && chmod +x /usr/local/bin/docker-compose && \ # Dotnet apt-get install -y --no-install-recommends ${dotnetLibs} && \ # https://github.com/goodwithtech/dockle/blob/master/CHECKPOINT.md#dkl-di-0005 diff --git a/context/generated/linux/Agent/UbuntuARM/18.04/Dockerfile b/context/generated/linux/Agent/UbuntuARM/18.04/Dockerfile index f1c21141d..22de136b2 100644 --- a/context/generated/linux/Agent/UbuntuARM/18.04/Dockerfile +++ b/context/generated/linux/Agent/UbuntuARM/18.04/Dockerfile @@ -1,6 +1,5 @@ # Default arguments ARG containerdIoLinuxComponentVersion='1.6.28-2' -ARG dockerComposeLinuxComponentVersion='1.28.5' ARG dockerLinuxComponentVersion='5:24.0.9-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' @@ -17,7 +16,6 @@ ARG teamcityMinimalAgentImage='teamcity-minimal-agent:EAP-linux-arm64-18.04' # ARG dotnetLibs # ARG gitLinuxComponentVersion # ARG gitLFSLinuxComponentVersion -# ARG dockerComposeLinuxComponentVersion # ARG dockerLinuxComponentVersion @@ -53,7 +51,6 @@ ARG dotnetLinuxARM64ComponentSHA512 ARG dotnetLibs ARG gitLinuxComponentVersion ARG gitLFSLinuxComponentVersion -ARG dockerComposeLinuxComponentVersion ARG dockerLinuxComponentVersion ARG containerdIoLinuxComponentVersion @@ -76,8 +73,6 @@ RUN apt-get update && \ systemd && \ systemctl disable docker && \ sed -i -e 's/\r$//' /services/run-docker.sh && \ -# Docker-Compose - curl -SL "https://github.com/docker/compose/releases/download/${dockerComposeLinuxComponentVersion}/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose && chmod +x /usr/local/bin/docker-compose && \ # .NET Libraries apt-get install -y --no-install-recommends ${dotnetLibs} && \ # https://github.com/goodwithtech/dockle/blob/master/CHECKPOINT.md#dkl-di-0005 diff --git a/context/generated/linux/Agent/UbuntuARM/20.04/Dockerfile b/context/generated/linux/Agent/UbuntuARM/20.04/Dockerfile index 78f40c6c1..b5da7503e 100644 --- a/context/generated/linux/Agent/UbuntuARM/20.04/Dockerfile +++ b/context/generated/linux/Agent/UbuntuARM/20.04/Dockerfile @@ -1,6 +1,5 @@ # Default arguments ARG containerdIoLinuxComponentVersion='1.6.28-2' -ARG dockerComposeLinuxComponentVersion='1.28.5' ARG dockerLinuxComponentVersion='5:24.0.9-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' @@ -17,7 +16,6 @@ ARG teamcityMinimalAgentImage='teamcity-minimal-agent:EAP-linux-arm64' # ARG dotnetLibs # ARG gitLinuxComponentVersion # ARG gitLFSLinuxComponentVersion -# ARG dockerComposeLinuxComponentVersion # ARG dockerLinuxComponentVersion @@ -53,7 +51,6 @@ ARG dotnetLinuxARM64ComponentSHA512 ARG dotnetLibs ARG gitLinuxComponentVersion ARG gitLFSLinuxComponentVersion -ARG dockerComposeLinuxComponentVersion ARG dockerLinuxComponentVersion ARG containerdIoLinuxComponentVersion @@ -76,8 +73,6 @@ RUN apt-get update && \ systemd && \ systemctl disable docker && \ sed -i -e 's/\r$//' /services/run-docker.sh && \ -# Docker-Compose - curl -SL "https://github.com/docker/compose/releases/download/${dockerComposeLinuxComponentVersion}/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose && chmod +x /usr/local/bin/docker-compose && \ # .NET Libraries apt-get install -y --no-install-recommends ${dotnetLibs} && \ # https://github.com/goodwithtech/dockle/blob/master/CHECKPOINT.md#dkl-di-0005 diff --git a/context/generated/teamcity-agent.md b/context/generated/teamcity-agent.md index b15e2f53d..b9cb215fd 100644 --- a/context/generated/teamcity-agent.md +++ b/context/generated/teamcity-agent.md @@ -94,7 +94,6 @@ Installed components: - Git v.2.43.2 - Mercurial - [Docker v.5:24.0.9](https://docs.docker.com/engine/release-notes/24.0) -- [Docker Compose v.1.28.5](https://github.com/docker/compose/releases/tag/1.28.5) - [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-2531894](https://www.perforce.com/products/helix-core) @@ -135,7 +134,6 @@ Installed components: - Mercurial - [Docker v.5:24.0.9](https://docs.docker.com/engine/release-notes/24.0) - [Containerd.io v1.6.28-2](https://github.com/containerd/containerd/releases/tag/v1.6.28) -- [Docker Compose v.1.28.5](https://github.com/docker/compose/releases/tag/1.28.5) - [.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 @@ -175,7 +173,6 @@ Installed components: - Mercurial - [Docker v.5:24.0.9](https://docs.docker.com/engine/release-notes/24.0) - [Containerd.io v1.6.28-2](https://github.com/containerd/containerd/releases/tag/v1.6.28) -- [Docker Compose v.1.28.5](https://github.com/docker/compose/releases/tag/1.28.5) - [.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 @@ -215,7 +212,6 @@ Installed components: - Git v.2.43.2 - Mercurial - [Docker v.5:24.0.9](https://docs.docker.com/engine/release-notes/24.0) -- [Docker Compose v.1.28.5](https://github.com/docker/compose/releases/tag/1.28.5) - [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-2531894](https://www.perforce.com/products/helix-core) @@ -395,7 +391,6 @@ Installed components: - Git v.2.41.0 - Mercurial - [Docker v.5:24.0.9](https://docs.docker.com/engine/release-notes/24.0) -- [Docker Compose v.1.28.5](https://github.com/docker/compose/releases/tag/1.28.5) - [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-2531894](https://www.perforce.com/products/helix-core) @@ -433,7 +428,6 @@ Installed components: - Git v.2.43.2 - Mercurial - [Docker v.5:24.0.9](https://docs.docker.com/engine/release-notes/24.0) -- [Docker Compose v.1.28.5](https://github.com/docker/compose/releases/tag/1.28.5) - [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-2531894](https://www.perforce.com/products/helix-core) @@ -472,7 +466,6 @@ Installed components: - Mercurial - [Docker v.5:24.0.9](https://docs.docker.com/engine/release-notes/24.0) - [Containerd.io v1.6.28-2](https://github.com/containerd/containerd/releases/tag/v1.6.28) -- [Docker Compose v.1.28.5](https://github.com/docker/compose/releases/tag/1.28.5) - [.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 @@ -509,7 +502,6 @@ Installed components: - Mercurial - [Docker v.5:24.0.9](https://docs.docker.com/engine/release-notes/24.0) - [Containerd.io v1.6.28-2](https://github.com/containerd/containerd/releases/tag/v1.6.28) -- [Docker Compose v.1.28.5](https://github.com/docker/compose/releases/tag/1.28.5) - [.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