From 0c8a526c52244819429fff3d9b854e711595da43 Mon Sep 17 00:00:00 2001
From: Pavol Juhas <juhas@google.com>
Date: Wed, 3 Apr 2024 11:07:36 -0700
Subject: [PATCH] CI - migrate to docker compose v2

Recent GHA runner images require docker-compose v2.

Refs:
https://github.com/actions/runner-images/blob/ubuntu20/20240401.4/images/ubuntu/Ubuntu2004-Readme.md
https://docs.docker.com/compose/migrate/

Fixes #6546
---
 .github/workflows/ci-daily.yml        | 4 ++--
 .github/workflows/ci.yml              | 8 ++++----
 dev_tools/conf/apt-list-dev-tools.txt | 1 -
 docs/dev/development.md               | 6 +++---
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci-daily.yml b/.github/workflows/ci-daily.yml
index 3be6c5c950a..d1f7606a5ed 100644
--- a/.github/workflows/ci-daily.yml
+++ b/.github/workflows/ci-daily.yml
@@ -35,11 +35,11 @@ jobs:
             -r dev_tools/requirements/deps/pytest.txt \
             -r dev_tools/requirements/deps/notebook.txt
       - name: Run Quil dependencies
-        run: docker-compose -f cirq-rigetti/docker-compose.test.yaml up -d
+        run: docker compose -f cirq-rigetti/docker-compose.test.yaml up -d
       - name: Pytest check
         run: check/pytest -n auto --ignore=cirq-core/cirq/contrib --rigetti-integration --enable-slow-tests
       - name: Stop Quil dependencies
-        run: docker-compose -f cirq-rigetti/docker-compose.test.yaml down
+        run: docker compose -f cirq-rigetti/docker-compose.test.yaml down
   windows:
     name: Pytest Windows
     strategy:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9a1ecc74746..13c7e397487 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -166,11 +166,11 @@ jobs:
           pip install wheel
           pip install --upgrade --upgrade-strategy eager -r dev_tools/requirements/dev.env.txt
       - name: Run Quil dependencies
-        run: docker-compose -f cirq-rigetti/docker-compose.test.yaml up -d
+        run: docker compose -f cirq-rigetti/docker-compose.test.yaml up -d
       - name: Pytest check
         run: check/pytest -n auto --durations=20 --ignore=cirq-core/cirq/contrib --rigetti-integration
       - name: Stop Quil dependencies
-        run: docker-compose -f cirq-rigetti/docker-compose.test.yaml down
+        run: docker compose -f cirq-rigetti/docker-compose.test.yaml down
   pip-compile:
     name: Check consistency of requirements
     runs-on: ubuntu-20.04
@@ -221,7 +221,7 @@ jobs:
           pip install wheel
           pip install --upgrade --upgrade-strategy eager -r dev_tools/requirements/dev.env.txt
       - name: Run Quil dependencies
-        run: docker-compose -f cirq-rigetti/docker-compose.test.yaml up -d
+        run: docker compose -f cirq-rigetti/docker-compose.test.yaml up -d
       - name: Coverage check
         run: check/pytest-and-incremental-coverage -n auto --rigetti-integration
       - name: Upload coverage reports to Codecov
@@ -229,7 +229,7 @@ jobs:
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
       - name: Stop Quil dependencies
-        run: docker-compose -f cirq-rigetti/docker-compose.test.yaml down
+        run: docker compose -f cirq-rigetti/docker-compose.test.yaml down
   windows:
     name: Pytest Windows
     strategy:
diff --git a/dev_tools/conf/apt-list-dev-tools.txt b/dev_tools/conf/apt-list-dev-tools.txt
index 11994a9871c..4a53502c55a 100644
--- a/dev_tools/conf/apt-list-dev-tools.txt
+++ b/dev_tools/conf/apt-list-dev-tools.txt
@@ -1,4 +1,3 @@
 virtualenvwrapper
 pandoc
 docker-ce
-docker-compose
\ No newline at end of file
diff --git a/docs/dev/development.md b/docs/dev/development.md
index 740db5efdd2..94233045315 100644
--- a/docs/dev/development.md
+++ b/docs/dev/development.md
@@ -100,9 +100,9 @@ See the previous section for instructions.
     ```bash
     cat apt-system-requirements.txt dev_tools/conf/apt-list-dev-tools.txt | xargs sudo apt-get install --yes
     ```
-    
-    This installs docker and docker-compose among other things. You may need to restart
-    docker or configure permissions, see 
+
+    This installs docker among other things. You may need to restart
+    docker or configure permissions, see
     [docker install instructions](https://docs.docker.com/engine/install/ubuntu/).
     Note that docker is necessary only for cirq_rigetti.