From 4c625099f922933b47a37b58d219502f63642b42 Mon Sep 17 00:00:00 2001 From: briskt <3172830+briskt@users.noreply.github.com> Date: Wed, 31 Jul 2024 21:39:57 +0800 Subject: [PATCH] update docker compose --- .github/workflows/ci.yml | 4 ++-- Makefile | 10 +++++----- action-services.yml | 2 -- docker-compose.yml | 2 -- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b9eecce..ffc47b2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,8 +19,8 @@ jobs: - uses: actions/checkout@v4 - name: Unit tests - run: docker-compose -f "action-services.yml" run app bash -c "./scripts/test.sh" + run: docker compose -f "action-services.yml" run app bash -c "./scripts/test.sh" - name: Deploy lambda if: github.ref_name == 'main' - run: docker-compose -f "action-services.yml" run app + run: docker compose -f "action-services.yml" run app diff --git a/Makefile b/Makefile index 9a126ad..a39337d 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,12 @@ build: - docker-compose up -d app + docker compose up -d app bash: - docker-compose run --rm app bash + docker compose run --rm app bash test: - docker-compose run --rm app ./scripts/test.sh + docker compose run --rm app ./scripts/test.sh clean: - docker-compose kill - docker-compose rm -f + docker compose kill + docker compose rm -f diff --git a/action-services.yml b/action-services.yml index b5745e9..df85500 100644 --- a/action-services.yml +++ b/action-services.yml @@ -1,5 +1,3 @@ -version: "3" - services: app: build: . diff --git a/docker-compose.yml b/docker-compose.yml index aa98d8d..f8de227 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,3 @@ -version: "3" - services: app: build: .