From 2ecd3700df04aad337a5449a6b54badc20734ed8 Mon Sep 17 00:00:00 2001
From: Aaron Gable <aaron@letsencrypt.org>
Date: Wed, 2 Aug 2023 13:24:50 -0700
Subject: [PATCH] Revert "Install v2.20.0 of docker-compose-plugin" (#7019)

Reverts https://github.com/letsencrypt/boulder/pull/6997, which manually
installed a specific version of the docker compose cli plugin to work
around a bug in the version installed by default. The images now ship
the fixed version by default
(https://github.com/actions/runner-images/issues/7916#issuecomment-1649361508),
so we can remove the workaround.

Fixes https://github.com/letsencrypt/boulder/issues/6998
---
 .github/workflows/boulder-ci.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.github/workflows/boulder-ci.yml b/.github/workflows/boulder-ci.yml
index a605116dd..6efcb784b 100644
--- a/.github/workflows/boulder-ci.yml
+++ b/.github/workflows/boulder-ci.yml
@@ -73,11 +73,6 @@ jobs:
       - uses: actions/checkout@v3
         with:
           persist-credentials: false
-      
-      # TODO(#6998): Remove this step when the ubuntu-20.04 image has v2.20.0+.
-      # Install instructions copied from https://docs.docker.com/compose/install/linux/#install-the-plugin-manually
-      - name: Update docker compose plugin
-        run: mkdir -p ${DOCKER_CONFIG:-$HOME/.docker}/cli-plugins && curl -SL https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-linux-x86_64 -o ${DOCKER_CONFIG:-$HOME/.docker}/cli-plugins/docker-compose && chmod +x ${DOCKER_CONFIG:-$HOME/.docker}/cli-plugins/docker-compose
 
       - name: Docker Login
         # You may pin to the exact commit or the version.