fraport/fradrive-old
fraport/fradrive-old
Archived
3
1
Fork 0
Code Issues 65 Pull Requests 5 Actions Packages Projects Releases 197 Wiki Activity

chore(Makefile): use docker compose in dockerized targets

Browse Source
This commit is contained in:
Sarah Vaupel 2024-08-19 01:20:01 +02:00
parent e5ac596287
commit 87c22b8a84
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -23,12 +23,12 @@ build: frontend-build backend-build
dockerized-build: dockerized-frontend-build dockerized-backend-build dockerized-build: dockerized-frontend-build dockerized-backend-build
.PHONY: dockerized-frontend-% .PHONY: dockerized-frontend-%
dockerized-frontend-%: FRADRIVE_DOCKERFILE=frontend dockerized-frontend-%: FRADRIVE_SERVICE=frontend
dockerized-frontend-%: --docker-build-frontend-% --docker-run-frontend-%; dockerized-frontend-%: --docker-build-frontend-% --docker-run-frontend-%;
.PHONY: dockerized-backend-% .PHONY: dockerized-backend-%
dockerized-backend-%: FRADRIVE_DOCKERFILE=backend dockerized-backend-%: FRADRIVE_SERVICE=backend
dockerized-backend-%: dockerized-backend-dependencies --docker-build-backend-% --docker-run-backend-%; dockerized-backend-%: --docker-build-backend-% --docker-run-backend-%;
#.PHONY: start #.PHONY: start
#start: frontend-build #start: frontend-build
@ -167,6 +167,6 @@ well-known/.well-known:
# run-s frontend:build --parallel "frontend:build:watch" "yesod:start" # run-s frontend:build --parallel "frontend:build:watch" "yesod:start"
--docker-build-%: --docker-build-%:
docker build --rm -t $(FRADRIVE_DOCKERFILE) ./docker/$(FRADRIVE_DOCKERFILE) docker compose build $(FRADRIVE_SERVICE)
--docker-run-%: --docker-run-%:
docker run --rm -it -v .:/fradrive --user `id -u`:`id -g` --env FRADRIVE_MAKE_TARGET=$* $(FRADRIVE_DOCKERFILE) docker compose run -u `id -u`:`id -g` --env FRADRIVE_MAKE_TARGET=$* $(FRADRIVE_SERVICE)