dev: do not use deprecated docker-compose cmd

putdotio · Jan 27, 2025 · 0c5a088 · 0c5a088
1 parent 21d49ad
commit 0c5a088
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 8 deletions.
diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml
@@ -16,9 +16,6 @@ jobs:
         with:
           go-version: '1.23'
 
-      - name: Set up Docker Compose
-        uses: docker/setup-compose-action@v1
-
       - name: Run linter
         uses: golangci/golangci-lint-action@v6
         with:

diff --git a/Docker/docker-compose-test.yml b/Docker/docker-compose-test.yml
@@ -1,4 +1,3 @@
-version: '3.9'
 services:
   mysql:
     image: efes/mysql

diff --git a/Docker/docker-compose.yml b/Docker/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '3.9'
 services:
   mysql:
     image: efes/mysql

diff --git a/Makefile b/Makefile
@@ -5,21 +5,21 @@ NAME := efes
 build:
 	GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -o $(NAME)
 
-MAIN_COMPOSE := docker-compose -f ./Docker/docker-compose.yml
+MAIN_COMPOSE := docker compose -f ./Docker/docker-compose.yml
 build-docker:
 	$(MAIN_COMPOSE) build efes-base
 	mkdir -p ./bin
 	docker create --name efes-builder efes/base
 	docker cp efes-builder:/usr/local/bin/efes - > ./bin/efes
 	docker rm -v efes-builder
 
-MAIN_COMPOSE := docker-compose -f ./Docker/docker-compose.yml
+MAIN_COMPOSE := docker compose -f ./Docker/docker-compose.yml
 up:
 	$(MAIN_COMPOSE) build efes-base
 	$(MAIN_COMPOSE) rm -fsv
 	$(MAIN_COMPOSE) up efes-tracker efes-server --build --abort-on-container-exit
 
-TEST_COMPOSE := docker-compose -f ./Docker/docker-compose-test.yml
+TEST_COMPOSE := docker compose -f ./Docker/docker-compose-test.yml
 test:
 	$(TEST_COMPOSE) rm -fsv
 	mkdir -p ./coverage