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

build(Makefile): work on start

Browse Source
This commit is contained in:
Sarah Vaupel 2024-10-13 00:49:27 +02:00
parent 376c74192e
commit f27da5dc11
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Makefile
View File

@ -2,7 +2,7 @@ SHELL=bash
# MAKE=make -d # MAKE=make -d
export CONTAINER_COMMAND ?= podman export CONTAINER_COMMAND ?= podman
export CONTAINER_RUN ?= $(CONTAINER_COMMAND) run -it -d --network=host export CONTAINER_RUN ?= $(CONTAINER_COMMAND) run -dit --network=host
export IN_CONTAINER ?= false export IN_CONTAINER ?= false
export IN_CI ?= false export IN_CI ?= false
@ -267,6 +267,10 @@ serve-database: --containerized-database;
--containerized-%-memcached: --image-build --containerized-%-memcached: --image-build
$(MAKE) -- --image-run-$*-memcached $(MAKE) -- --image-run-$*-memcached
--containerized-%-database: FRADRIVE_SERVICE=database
--containerized-%-database: --image-build
$(MAKE) -- --image-run-$*-database
.PHONY: image-rebuild .PHONY: image-rebuild
# HELP: rebuild the stated docker image (frontend, backend, database instead of %) # HELP: rebuild the stated docker image (frontend, backend, database instead of %)
image-rebuild-%: image-rebuild-%:
@ -283,7 +287,7 @@ image-rebuild-%:
$(CONTAINER_COMMAND) build $(NO_CACHE) -v $(PWD):$${MOUNT_DIR} --env IN_CONTAINER=true --build-arg MOUNT_DIR=$${MOUNT_DIR} --build-arg PROJECT_DIR=$${PROJECT_DIR} --tag fradrive/$(FRADRIVE_SERVICE) --file $(PWD)/.Dockerfile ; \ $(CONTAINER_COMMAND) build $(NO_CACHE) -v $(PWD):$${MOUNT_DIR} --env IN_CONTAINER=true --build-arg MOUNT_DIR=$${MOUNT_DIR} --build-arg PROJECT_DIR=$${PROJECT_DIR} --tag fradrive/$(FRADRIVE_SERVICE) --file $(PWD)/.Dockerfile ; \
fi fi
--image-run-%: --image-run-%: docker/$(FRADRIVE_SERVICE)/Dockerfile
MOUNT_DIR=/mnt/fradrive; \ MOUNT_DIR=/mnt/fradrive; \
if [ "$(IN_CONTAINER)" == "true" ] ; then \ if [ "$(IN_CONTAINER)" == "true" ] ; then \
$(MAKE) -- $* ; \ $(MAKE) -- $* ; \
@ -338,14 +342,18 @@ start: develop start-database start-memcached start-minio start-frontend start-b
start-database: BASE_PORTS = "PGPORT=5432" start-database: BASE_PORTS = "PGPORT=5432"
start-database: SINGLETON = true start-database: SINGLETON = true
start-memcached: BASE_PORTS = "MEMCACHED_PORT=11211" start-memcached: BASE_PORTS = "MEMCACHED_PORT=11211"
start-memcached: SINGLETON = true start-memcached: SINGLETON = true
start-minio: BASE_PORTS = "UPLOAD_S3_PORT=9000" start-minio: BASE_PORTS = "UPLOAD_S3_PORT=9000"
start-minio: SINGLETON = true start-minio: SINGLETON = true
start-backend: BASE_PORTS = "DEV_PORT_HTTP=3000" "DEV_PORT_HTTPS=3443" start-backend: BASE_PORTS = "DEV_PORT_HTTP=3000" "DEV_PORT_HTTPS=3443"
start-backend: SINGLETON = false start-backend: SINGLETON = false
start-hoogle: BASE_PORT = "HOOGLE_PORT=8081" start-hoogle: BASE_PORT = "HOOGLE_PORT=8081"
start-hoogle: SINGLETON=true
start-frontend: SINGLETON = false start-frontend: SINGLETON = false
start-frontend: WATCH = true start-frontend: WATCH = true
@ -375,12 +383,8 @@ start-%: --ensure-develop
HOOGLE_PORT=`cat $(CONTAINER_FILE) | grep 'HOOGLE_PORT=' | sed 's/HOOGLE_PORT=//'` ; \ HOOGLE_PORT=`cat $(CONTAINER_FILE) | grep 'HOOGLE_PORT=' | sed 's/HOOGLE_PORT=//'` ; \
./utils/watchrun.sh "$(CONTAINER_FILE)" ./hoogle.sh ./utils/watchrun.sh "$(CONTAINER_FILE)" ./hoogle.sh
--containerized---start-database: FRADRIVE_SERVICE=database # --start-database: docker/database/initdb.sh docker/database/pg_hba.conf docker/database/postgresql.conf docker/database/schema.sql;
# port forwarding is disabled in --network=host mode; nevertheless it is stated here for documentation reasons # ./utils/watchrun.sh "$(CONTAINER_FILE)"
--containerized---start-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 \
$(CONTAINER_RUN) --name fradrive.$(FRADRIVE_SERVICE).$$(date +'%Y-%m-%dT%H-%M-%S') fradrive/$(FRADRIVE_SERVICE) ; \
fi
# TODO: mkdir inside develop/$(DATE)/minio instead of mktemp # TODO: mkdir inside develop/$(DATE)/minio instead of mktemp
# TODO: remove dir in stop-minio # TODO: remove dir in stop-minio