Use docker compose, not docker-compose.

This commit is contained in:
Víðir Valberg Guðmundsson 2023-09-16 15:39:13 +02:00
parent 175f0438d4
commit 390954ebaf

View file

@ -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_RUN = ${DOCKER_COMPOSE} run -u `id -u`
DOCKER_BUILD = DOCKER_BUILDKIT=1 docker build DOCKER_BUILD = DOCKER_BUILDKIT=1 docker build
DOCKER_CONTAINER_NAME = backend DOCKER_CONTAINER_NAME = backend
@ -14,7 +14,7 @@ setup_venv:
rm -rf venv rm -rf venv
python3.11 -m venv venv; python3.11 -m venv venv;
venv/bin/python -m pip install wheel setuptools; 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: pre_commit_install:
venv/bin/pre-commit install venv/bin/pre-commit install