fix(ci): update Makefile to docker compose v2 (#1347)

* fix(ci): update to docker compose v2 Signed-off-by: Brandt Keller <[email protected]> * fix(ci): test file to reproduce issue Signed-off-by: Brandt Keller <[email protected]> * fix(ci): revert tested changes and remove obsolete version Signed-off-by: Brandt Keller <[email protected]> * fix(ci): update checkout action and pin to checksum Signed-off-by: Brandt Keller <[email protected]> --------- Signed-off-by: Brandt Keller <[email protected]>
cncf · Aug 15, 2024 · ba3732f · ba3732f
1 parent bd48bea
commit ba3732f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git 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
@@ -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
@@ -1,5 +1,4 @@
 ---
-version: '2'
 services:
   setup:
     image: node:18