From ba3732fa7d8cac56015bf704649a191c11216dad Mon Sep 17 00:00:00 2001
From: Brandt Keller <43887158+brandtkeller@users.noreply.github.com>
Date: Thu, 15 Aug 2024 14:32:12 -0700
Subject: [PATCH] fix(ci): update Makefile to docker compose v2 (#1347)

* fix(ci): update to docker compose v2

Signed-off-by: Brandt Keller <brandt.keller@defenseunicorns.com>

* fix(ci): test file to reproduce issue

Signed-off-by: Brandt Keller <brandt.keller@defenseunicorns.com>

* fix(ci): revert tested changes and remove obsolete version

Signed-off-by: Brandt Keller <brandt.keller@defenseunicorns.com>

* fix(ci): update checkout action and pin to checksum

Signed-off-by: Brandt Keller <brandt.keller@defenseunicorns.com>

---------

Signed-off-by: Brandt Keller <brandt.keller@defenseunicorns.com>
---
 .github/workflows/sig-sec-check.yml |  8 ++++----
 Makefile                            | 16 ++++++++--------
 docker-compose.yml                  |  1 -
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/sig-sec-check.yml b/.github/workflows/sig-sec-check.yml
index 415194275..c0cede4b2 100644
--- a/.github/workflows/sig-sec-check.yml
+++ b/.github/workflows/sig-sec-check.yml
@@ -11,27 +11,27 @@ jobs:
   Setup:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       - name: Setup
         run: make setup
   Lint:
     runs-on: ubuntu-latest
     needs: Setup
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       - name: Lint
         run: make lint
   Spelling:
     runs-on: ubuntu-latest
     needs: Setup
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       - name: Spelling
         run: make spelling
   Links:
     runs-on: ubuntu-latest
     needs: Setup
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       - name: Links
         run: make links
diff --git a/Makefile b/Makefile
index 702776dab..788d76203 100644
--- a/Makefile
+++ b/Makefile
@@ -4,24 +4,24 @@ all: setup lint spelling links
 .PHONY: setup
 setup:
 	@echo "Running $@...\n\n"
-	@docker-compose run $@ ci/$@.sh
-	@docker-compose down
+	@docker compose run $@ ci/$@.sh
+	@docker compose down
 
 .PHONY: lint
 lint:
 	@echo "Running $@...\n\n"
-	@docker-compose run $@ ci/$@.sh
-	@docker-compose down
+	@docker compose run $@ ci/$@.sh
+	@docker compose down
 
 .PHONY: spelling
 spelling:
 	@echo "Running $@...\n\n"
-	@docker-compose run $@ ci/$@.sh
-	@docker-compose down
+	@docker compose run $@ ci/$@.sh
+	@docker compose down
 
 .PHONY: links
 links:
 	@echo "Running $@...\n\n"
-	@docker-compose run $@ ci/$@.sh
-	@docker-compose down
+	@docker compose run $@ ci/$@.sh
+	@docker compose down
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 09a11250b..a35f2433a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,4 @@
 ---
-version: '2'
 services:
   setup:
     image: node:18