Skip to content

Commit

Permalink
fix: switch docker-compose to docker compose
Browse files Browse the repository at this point in the history
Signed-off-by: Curtis Wahlfeld <cschwarzwahlfeld@gmail.com>
  • Loading branch information
wahlfeld committed Aug 17, 2024
1 parent 9df92ba commit 4c5be35
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Dockerfile-pre-commit
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 {} +
Expand Down

0 comments on commit 4c5be35

Please sign in to comment.