From b089b7c53a4b9743acd32932c5554906aed498d6 Mon Sep 17 00:00:00 2001
From: Yaw Anokwa <yanokwa@gmail.com>
Date: Tue, 7 Mar 2023 09:20:30 -0800
Subject: [PATCH] Upgrade to Docker Compose v2

---
 .circleci/config.yml          |  6 +++---
 files/docker-compose@.service | 15 ---------------
 2 files changed, 3 insertions(+), 18 deletions(-)
 delete mode 100644 files/docker-compose@.service

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7b940f6f..4579abf0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -14,7 +14,7 @@ jobs:
           DOMAIN=local
           SYSADMIN_EMAIL=no-reply@getodk.org' > .env
 
-      - run: docker-compose build
+      - run: docker compose build
 
       - run:
           # we allow a long retry period for the first check because the first-run
@@ -22,8 +22,8 @@ jobs:
           name: Verify frontend and backend load
           command: |
             set -x
-            docker-compose up -d
-            CONTAINER_NAME=$(docker inspect -f '{{.Name}}' $(docker-compose ps -q nginx) | cut -c2-)
+            docker compose up -d
+            CONTAINER_NAME=$(docker inspect -f '{{.Name}}' $(docker compose ps -q nginx) | cut -c2-)
             docker run --network container:$CONTAINER_NAME \
               appropriate/curl -4 --insecure --retry 30 --retry-delay 10 --retry-connrefused https://localhost/ \
               | tee /dev/tty \
diff --git a/files/docker-compose@.service b/files/docker-compose@.service
deleted file mode 100644
index 3c187b17..00000000
--- a/files/docker-compose@.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=%i via docker-compose
-Requires=docker.service
-After=docker.service
-
-[Service]
-Restart=always
-WorkingDirectory=/root/%i
-
-ExecStart=/usr/local/bin/docker-compose up
-ExecStop=/usr/local/bin/docker-compose stop -v
-
-[Install]
-WantedBy=multi-user.target
-