From b2813f52c90ebf213fca3ce7175d45991b104d3e Mon Sep 17 00:00:00 2001
From: Samuel Larkin <Samuel.Larkin@cnrc-nrc.gc.ca>
Date: Tue, 19 Nov 2024 15:26:09 -0500
Subject: [PATCH] fix(CI): GitHub deprecated v1, and you need to change the
 command from, e.g., docker-compose build to docker compose build (remove the
 dash)

---
 .github/workflows/deploy-image.yaml       | 5 +++--
 .github/workflows/stage-deploy-image.yaml | 5 +++--
 docker-compose.override.yaml              | 2 --
 docker-compose.yaml                       | 1 -
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/deploy-image.yaml b/.github/workflows/deploy-image.yaml
index 9ca28b4b2..2311944f6 100644
--- a/.github/workflows/deploy-image.yaml
+++ b/.github/workflows/deploy-image.yaml
@@ -34,8 +34,9 @@ jobs:
           IMAGE_TAG: prod-${{ github.sha }}
         run: |
           echo "image_tag=$IMAGE_TAG" >> $GITHUB_OUTPUT
-          CURRENT_UID=$(id -u):$(id -g) docker-compose --project-name "common-voice" -f "docker-compose.yaml" build web
-          docker tag common-voice_web:latest $REGISTRY/$REPOSITORY:$IMAGE_TAG
+          CURRENT_UID=$(id -u):$(id -g) docker compose --project-name "common-voice" -f "docker-compose.yaml" build web
+          docker image ls
+          docker tag common-voice-web:latest $REGISTRY/$REPOSITORY:$IMAGE_TAG
           docker push $REGISTRY/$REPOSITORY:$IMAGE_TAG
 
       - name: Repository dispatch to trigger deployment
diff --git a/.github/workflows/stage-deploy-image.yaml b/.github/workflows/stage-deploy-image.yaml
index 47a430d5d..c86ca9b17 100644
--- a/.github/workflows/stage-deploy-image.yaml
+++ b/.github/workflows/stage-deploy-image.yaml
@@ -37,8 +37,9 @@ jobs:
           IMAGE_TAG: stage-${{ github.sha }}
         run: |
           echo "image_tag=$IMAGE_TAG" >> $GITHUB_OUTPUT
-          CURRENT_UID=$(id -u):$(id -g) docker-compose --project-name "common-voice" -f "docker-compose.yaml" build web
-          docker tag common-voice_web:latest $REGISTRY/$REPOSITORY:$IMAGE_TAG
+          CURRENT_UID=$(id -u):$(id -g) docker compose --project-name "common-voice" -f "docker-compose.yaml" build web
+          docker image ls
+          docker tag common-voice-web:latest $REGISTRY/$REPOSITORY:$IMAGE_TAG
           docker push $REGISTRY/$REPOSITORY:$IMAGE_TAG
 
       - name: Repository dispatch to trigger deployment
diff --git a/docker-compose.override.yaml b/docker-compose.override.yaml
index ab824f7eb..1e756d2dc 100644
--- a/docker-compose.override.yaml
+++ b/docker-compose.override.yaml
@@ -2,8 +2,6 @@
 # wget 'https://github.com/docker/compose-cli/releases/download/v1.0.29/docker-linux-amd64'
 # CURRENT_UID=$(id -u):$(id -g) ./docker-linux-amd64 --context ecs.common-voice compose --project-name common-voice up
 
-version: '3'
-
 services:
   web:
     ports:
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 7d0460c4b..11afb97be 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,4 +1,3 @@
-version: '3'
 services:
   db:
     image: mysql:5.7.28