From 390954ebaf2431ea8c2b2d6bfed671896417f36c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Sat, 16 Sep 2023 15:39:13 +0200 Subject: [PATCH] Use docker compose, not docker-compose. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 2215ce7..7fc23eb 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -DOCKER_COMPOSE = COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 venv/bin/docker-compose +DOCKER_COMPOSE = COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker compose DOCKER_RUN = ${DOCKER_COMPOSE} run -u `id -u` DOCKER_BUILD = DOCKER_BUILDKIT=1 docker build DOCKER_CONTAINER_NAME = backend @@ -14,7 +14,7 @@ setup_venv: rm -rf venv python3.11 -m venv venv; venv/bin/python -m pip install wheel setuptools; - venv/bin/python -m pip install docker-compose pre-commit boto3 pip-tools; + venv/bin/python -m pip install pre-commit boto3 pip-tools; pre_commit_install: venv/bin/pre-commit install