From 4c5be357283131ff293b16f082cfdc533bb30be4 Mon Sep 17 00:00:00 2001 From: Curtis Wahlfeld Date: Sat, 17 Aug 2024 14:20:59 +1000 Subject: [PATCH] fix: switch docker-compose to docker compose Signed-off-by: Curtis Wahlfeld --- Dockerfile-pre-commit | 2 +- Makefile | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile-pre-commit b/Dockerfile-pre-commit index 3046851..7789f60 100644 --- a/Dockerfile-pre-commit +++ b/Dockerfile-pre-commit @@ -10,7 +10,7 @@ RUN apt-get update && \ apt-get install -y --no-install-recommends \ build-essential curl git shellcheck unzip && \ pip install --upgrade pip && \ - pip install checkov pre-commit==3.4.0 && \ + pip install checkov pre-commit && \ rm -rf /var/lib/apt/lists/* # Install terraform-switcher, terraform diff --git a/Makefile b/Makefile index 304b376..9615b21 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,12 @@ # Variables for common commands -DOCKER_COMPOSE_RUN := docker-compose run --rm +DOCKER_COMPOSE_RUN := docker compose run --rm .PHONY: .phony all: .phony validate test build: - docker-compose build + docker compose build validate: .phony clean build CMD='pre-commit run --all-files' $(DOCKER_COMPOSE_RUN) pre-commit @@ -17,7 +17,7 @@ test: clean_docker build clean: clean_docker clean_terraform clean_docker: - docker-compose down -v --remove-orphans + docker compose down -v --remove-orphans clean_terraform: .phony find . -type d -name '.terraform' -exec rm -rf {} +