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

build(Makefile): fix serve-backend; rename uniworxdb-target

Browse Source
This commit is contained in:
Sarah Vaupel 2024-10-01 09:56:40 +02:00
parent bb57451cbc
commit 50d58108ed
1 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
Makefile
View File

@ -1,8 +1,9 @@
SHELL=bash SHELL=bash
# MAKE=make -d
export CONTAINER_COMMAND ?= podman export CONTAINER_COMMAND ?= podman
export CONTAINER_INTERACTIVE export CONTAINER_INTERACTIVE
export CONTAINER_PORTS export CONTAINER_PORTS ?= --network=host
export IN_CONTAINER ?= false export IN_CONTAINER ?= false
export IN_CI ?= false export IN_CI ?= false
export WATCH export WATCH
@ -52,8 +53,8 @@ release:
./.gitlab-ci/version.pl -changelog CHANGELOG.md ./.gitlab-ci/version.pl -changelog CHANGELOG.md
git add CHANGELOG.md git add CHANGELOG.md
VERSION=`.gitlab-ci/version.pl` VERSION=`.gitlab-ci/version.pl`
git tag ${VERSION} git tag $${VERSION}
git commit -m "chore(release): ${VERSION}" git commit -m "chore(release): $${VERSION}"
git push git push
.PHONY: %-shell .PHONY: %-shell
@ -203,19 +204,11 @@ serve-backend:
--test-backend: --test-backend:
stack build --test --coverage --fast --flag uniworx:library-only $(stackopts) stack build --test --coverage --fast --flag uniworx:library-only $(stackopts)
.PHONY: serve-database .PHONY: --db-%-backend
# HELP: serve database --db-%-dev-backend: .stack
serve-database: CONTAINER_INTERACTIVE=-it
serve-database: --containerized-database
.PHONY: %-database
%-database:
$(MAKE) -- --containerized---$*-database-backend
.PHONY: --%-database
--%-database: .stack
SERVER_SESSION_ACID_FALLBACK=${SERVER_SESSION_ACID_FALLBACK:-true} ; \ SERVER_SESSION_ACID_FALLBACK=${SERVER_SESSION_ACID_FALLBACK:-true} ; \
AVSPASS=${AVSPASS:-nopasswordset} ; \ AVSPASS=${AVSPASS:-nopasswordset} ; \
stack exec uniworxdb -- $* stack exec uniworxdb -- -$*
.stack: stack.yaml stack.yaml.lock .stack: stack.yaml stack.yaml.lock
.stack: .stack:
@ -232,18 +225,30 @@ serve-database: --containerized-database
########################### ###########################
############################# ############################
##### CONTAINER TARGETS ##### ##### DATABASE TARGETS #####
.PHONY: serve-database
# HELP: serve database
serve-database: CONTAINER_INTERACTIVE=-it
serve-database: --containerized-database;
.PHONY: --containerized-database .PHONY: --containerized-database
--containerized-database: FRADRIVE_SERVICE=database --containerized-database: FRADRIVE_SERVICE=database
# port forwarding is disabled in --network=host mode; nevertheless it is stated here for documentation reasons # port forwarding is disabled in --network=host mode; nevertheless it is stated here for documentation reasons
--containerized-database: CONTAINER_PORTS=-p 5432:5432/tcp # --containerized-database: CONTAINER_PORTS=--network=host -p 5432:5432/tcp
--containerized-database: --image-build --containerized-database: docker/database/initdb.sh docker/database/pg_hba.conf docker/database/postgresql.conf docker/database/schema.sql --image-build
if [ "$(IN_CONTAINER)" == "false" ] ; then \ if [ "$(IN_CONTAINER)" == "false" ] ; then \
$(CONTAINER_COMMAND) run -it $(CONTAINER_PORTS) --name fradrive.$(FRADRIVE_SERVICE).$$(date +'%Y-%m-%dT%H-%M-%S') fradrive/$(FRADRIVE_SERVICE) ; \ $(CONTAINER_COMMAND) run -it $(CONTAINER_PORTS) --name fradrive.$(FRADRIVE_SERVICE).$$(date +'%Y-%m-%dT%H-%M-%S') fradrive/$(FRADRIVE_SERVICE) ; \
fi fi
##### DATABASE TARGETS #####
############################
#############################
##### CONTAINER TARGETS #####
.PHONY: --containerized-%-frontend .PHONY: --containerized-%-frontend
--containerized-%-frontend: FRADRIVE_SERVICE=frontend --containerized-%-frontend: FRADRIVE_SERVICE=frontend
#--containerized-%-frontend: --image-build --image-run-%-frontend; #--containerized-%-frontend: --image-build --image-run-%-frontend;
@ -253,7 +258,7 @@ serve-database: --containerized-database
.PHONY: --containerized-%-backend .PHONY: --containerized-%-backend
--containerized-%-backend: FRADRIVE_SERVICE=backend --containerized-%-backend: FRADRIVE_SERVICE=backend
#--containerized-%-backend: --image-build --image-run-%-backend; #--containerized-%-backend: --image-build --image-run-%-backend;
--containerized-%-backend: CONTAINER_PORTS=-p 127.0.0.1:$(DEV_PORT_HTTP):3000/tcp -p 127.0.0.1:$(DEV_PORT_HTTPS):3443/tcp # --containerized-%-backend: CONTAINER_PORTS=--network=host -p $(DEV_PORT_HTTP):3000 -p $(DEV_PORT_HTTPS):3443
--containerized-%-backend: --image-build --containerized-%-backend: --image-build
$(MAKE) -- --image-run-$*-backend $(MAKE) -- --image-run-$*-backend
@ -280,7 +285,7 @@ image-rebuild-%:
if [ "$(IN_CONTAINER)" == "true" ] ; then \ if [ "$(IN_CONTAINER)" == "true" ] ; then \
$(MAKE) -- $* ; \ $(MAKE) -- $* ; \
else \ else \
$(CONTAINER_COMMAND) run $(CONTAINER_INTERACTIVE) -v $(PWD):$${MOUNT_DIR} $(CONTAINER_PORTS) --env IN_CONTAINER=true --env FRADRIVE_MAKE_TARGET=$* --env WATCH=$(WATCH) --name fradrive.$(FRADRIVE_SERVICE).$$(date +'%Y-%m-%dT%H-%M-%S') fradrive/$(FRADRIVE_SERVICE) ; \ $(CONTAINER_COMMAND) run $(CONTAINER_INTERACTIVE) -v $(PWD):$${MOUNT_DIR} $(CONTAINER_PORTS) --env IN_CONTAINER=true --env FRADRIVE_MAKE_TARGET=$* --env WATCH=$(WATCH) --name fradrive.$(FRADRIVE_SERVICE).$$(date +'%Y-%m-%dT%H-%M-%S') localhost/fradrive/$(FRADRIVE_SERVICE) ; \
fi fi
##### CONTAINER TARGETS ##### ##### CONTAINER TARGETS #####