diff --git a/Makefile b/Makefile index c06367a7c..c1a670d1c 100644 --- a/Makefile +++ b/Makefile @@ -22,10 +22,10 @@ dev-certs: cat dev/certs/fake.{key,crt} > dev/certs/fake.pem dev: .env dev-certs - DOCKER_BUILDKIT=1 docker-compose build - docker-compose run --rm legacy make build - docker-compose run --rm api libretime-api migrate - docker-compose up -d + DOCKER_BUILDKIT=1 docker compose build + docker compose run --rm legacy make build + docker compose run --rm api libretime-api migrate + docker compose up -d .PHONY: VERSION VERSION: diff --git a/docs/contributor-manual/development-environment.md b/docs/contributor-manual/development-environment.md index 301cb4fa3..e9889fb15 100644 --- a/docs/contributor-manual/development-environment.md +++ b/docs/contributor-manual/development-environment.md @@ -14,16 +14,16 @@ To setup a docker-compose development environment, run the following commands: # Clean and build make clean cp .env.dev .env -DOCKER_BUILDKIT=1 docker-compose build +DOCKER_BUILDKIT=1 docker compose build # Setup make dev-certs -docker-compose run --rm legacy make build -docker-compose run --rm api libretime-api migrate +docker compose run --rm legacy make build +docker compose run --rm api libretime-api migrate # Run -docker-compose up -d -docker-compose logs -f +docker compose up -d +docker compose logs -f ``` :::info @@ -33,7 +33,7 @@ You may also use the following `make clean dev` shortcut: ```bash make clean dev -docker-compose logs -f +docker compose logs -f ``` :::