From 241fb625a2959e01b02e7a881a1fefb4650f2942 Mon Sep 17 00:00:00 2001 From: Andrei Neagu <5694077+GitHK@users.noreply.github.com> Date: Mon, 2 Dec 2024 15:14:24 +0100 Subject: [PATCH] new version of docker compose --- .github/workflows/check-image.yml | 4 ++-- Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/check-image.yml b/.github/workflows/check-image.yml index dacb013..5e6a789 100644 --- a/.github/workflows/check-image.yml +++ b/.github/workflows/check-image.yml @@ -12,11 +12,11 @@ jobs: uses: docker://itisfoundation/ci-service-integration-library:v2.0.5 with: args: ooil --version - - name: Assemble docker-compose spec + - name: Assemble docker compose spec uses: docker://itisfoundation/ci-service-integration-library:v2.0.5 with: args: ooil compose - name: Build all images if multiple uses: docker://itisfoundation/ci-service-integration-library:v2.0.5 with: - args: docker-compose build + args: docker compose build diff --git a/Makefile b/Makefile index 2ef2636..ea41e92 100644 --- a/Makefile +++ b/Makefile @@ -54,12 +54,12 @@ compose-spec: ## runs ooil to assemble the docker-compose.yml file sh -c "cd /${DOCKER_IMAGE_NAME} && ooil compose" build: | compose-spec ## build docker image - docker-compose build + docker compose build # To test built service locally ------------------------------------------------------------------------- .PHONY: run-local run-local: ## runs image with local configuration - docker-compose --file docker-compose-local.yml up + docker compose --file docker-compose-local.yml up .PHONY: publish-local publish-local: ## push to local throw away registry to test integration