From 87c22b8a841e8b9d19c2f57c710ea13083a8afec Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Mon, 19 Aug 2024 01:20:01 +0200 Subject: [PATCH] chore(Makefile): use docker compose in dockerized targets --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 297852829..af5887be1 100644 --- a/Makefile +++ b/Makefile @@ -23,12 +23,12 @@ build: frontend-build backend-build dockerized-build: dockerized-frontend-build dockerized-backend-build .PHONY: dockerized-frontend-% -dockerized-frontend-%: FRADRIVE_DOCKERFILE=frontend +dockerized-frontend-%: FRADRIVE_SERVICE=frontend dockerized-frontend-%: --docker-build-frontend-% --docker-run-frontend-%; .PHONY: dockerized-backend-% -dockerized-backend-%: FRADRIVE_DOCKERFILE=backend -dockerized-backend-%: dockerized-backend-dependencies --docker-build-backend-% --docker-run-backend-%; +dockerized-backend-%: FRADRIVE_SERVICE=backend +dockerized-backend-%: --docker-build-backend-% --docker-run-backend-%; #.PHONY: start #start: frontend-build @@ -167,6 +167,6 @@ well-known/.well-known: # run-s frontend:build --parallel "frontend:build:watch" "yesod:start" --docker-build-%: - docker build --rm -t $(FRADRIVE_DOCKERFILE) ./docker/$(FRADRIVE_DOCKERFILE) + docker compose build $(FRADRIVE_SERVICE) --docker-run-%: - docker run --rm -it -v .:/fradrive --user `id -u`:`id -g` --env FRADRIVE_MAKE_TARGET=$* $(FRADRIVE_DOCKERFILE) \ No newline at end of file + docker compose run -u `id -u`:`id -g` --env FRADRIVE_MAKE_TARGET=$* $(FRADRIVE_SERVICE) \ No newline at end of file