diff --git a/make-compose.mk b/make-compose.mk index e419e527..55fbac06 100644 --- a/make-compose.mk +++ b/make-compose.mk @@ -3,74 +3,74 @@ BUILD_ARGS:= --build-arg UID=$(shell id -u) --build-arg GID=$(shell id -u) compose: compose-clear compose-setup compose-start compose-start: - docker-compose up --abort-on-container-exit + docker compose up --abort-on-container-exit compose-start-database: - docker-compose up -d database + docker compose up -d database compose-stop: - docker-compose stop || true + docker compose stop || true compose-down: - docker-compose down --remove-orphans || true + docker compose down --remove-orphans || true compose-clear: - docker-compose down -v --remove-orphans || true + docker compose down -v --remove-orphans || true compose-logs: - docker-compose logs -f + docker compose logs -f compose-setup: compose-build - docker-compose run --rm application make setup + docker compose run --rm application make setup compose-bash: - docker-compose run --rm application bash + docker compose run --rm application bash compose-build: - docker-compose build + docker compose build compose-console: - docker-compose run --rm application make console + docker compose run --rm application make console compose-install: compose-app-install compose-frontend-install compose-app-install: - docker-compose run --rm application make install-app + docker compose run --rm application make install-app compose-frontend-install: - docker-compose run --rm frontend make install-frontend + docker compose run --rm frontend make install-frontend compose-database-start: - docker-compose up --build -d database + docker compose up --build -d database compose-database-stop: - docker-compose stop database + docker compose stop database compose-db-prepare: - docker-compose run --rm application make db-prepare + docker compose run --rm application make db-prepare compose-lint: - docker-compose run --rm application make lint + docker compose run --rm application make lint compose-lint-fix: - docker-compose run --rm application make lint-fix + docker compose run --rm application make lint-fix compose-test: - docker-compose run application make test + docker compose run application make test compose-test-coverage: - docker-compose run --rm application make test-coverage + docker compose run --rm application make test-coverage compose-check: - docker-compose run --rm application make check + docker compose run --rm application make check ci: - docker-compose -f docker-compose.ci.yml -p hexlet-sicp-ci build ${BUILD_ARGS} - docker-compose -f docker-compose.ci.yml -p hexlet-sicp-ci run --rm application make setup - docker-compose -f docker-compose.ci.yml -p hexlet-sicp-ci up --abort-on-container-exit - docker-compose -f docker-compose.ci.yml -p hexlet-sicp-ci down -v --remove-orphans + docker compose -f docker compose.ci.yml -p hexlet-sicp-ci build ${BUILD_ARGS} + docker compose -f docker compose.ci.yml -p hexlet-sicp-ci run --rm application make setup + docker compose -f docker compose.ci.yml -p hexlet-sicp-ci up --abort-on-container-exit + docker compose -f docker compose.ci.yml -p hexlet-sicp-ci down -v --remove-orphans ci-solutions: - docker-compose -f docker-compose.ci.yml -p hexlet-sicp-ci build ${BUILD_ARGS} - docker-compose -f docker-compose.ci.yml -p hexlet-sicp-ci run --rm application make install-app test-solutions - docker-compose -f docker-compose.ci.yml -p hexlet-sicp-ci down -v --remove-orphans + docker compose -f docker compose.ci.yml -p hexlet-sicp-ci build ${BUILD_ARGS} + docker compose -f docker compose.ci.yml -p hexlet-sicp-ci run --rm application make install-app test-solutions + docker compose -f docker compose.ci.yml -p hexlet-sicp-ci down -v --remove-orphans