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

build(docker/backend): properly pulish exposed backend ports on serve

Browse Source
This commit is contained in:
Sarah Vaupel 2024-09-15 02:55:59 +02:00
parent ef66ab1538
commit 5b5e33566a
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile
View File

@ -2,6 +2,7 @@ SHELL=bash
export CONTAINER_COMMAND ?= podman
export CONTAINER_INTERACTIVE
export CONTAINER_PORTS
export IN_CONTAINER ?= false
export IN_CI ?= false
export WATCH
@ -144,13 +145,13 @@ well-known/.well-known:
.PHONY: serve-backend
serve-backend: CONTAINER_INTERACTIVE=-it
serve-backend:
DEV_PORT_HTTP=`docker/backend/dev_port.pl 3000 | tee .dev-port-http` \
DEV_PORT_HTTPS=`docker/backend/dev_port.pl 3443 | tee .dev-port-https` \
DEV_PORT_HTTP=`docker/backend/dev_port.pl 3000 | tee .dev-port-http`; \
DEV_PORT_HTTPS=`docker/backend/dev_port.pl 3443 | tee .dev-port-https`; \
$(MAKE) -- --containerized---serve-dev-backend DEV_PORT_HTTP=$${DEV_PORT_HTTP} DEV_PORT_HTTPS=$${DEV_PORT_HTTPS}
.PHONY: --serve-dev-backend
--serve-dev-backend: start.sh
DEV_PORT_HTTP=`cat .dev-port-http` \
DEV_PORT_HTTPS=`cat .dev-port-https` \
DEV_PORT_HTTP=`cat .dev-port-http`; \
DEV_PORT_HTTPS=`cat .dev-port-https`; \
./start.sh
.PHONY: --compile-backend
@ -209,8 +210,9 @@ serve-database: --containerized-database
.PHONY: --containerized-%-backend
--containerized-%-backend: FRADRIVE_SERVICE=backend
#--containerized-%-backend: --image-build --image-run-%-backend;
--containerized-%-backend: CONTAINER_PORTS=-p $(DEV_PORT_HTTP):3000 -p $(DEV_PORT_HTTPS):3443
--containerized-%-backend: --image-build
$(MAKE) -- --image-run-$*-backend
$(MAKE) -- --image-run-$*-backend
.PHONY: image-rebuild
image-rebuild-%:
@ -234,7 +236,7 @@ image-rebuild-%:
if [ "$(IN_CONTAINER)" == "true" ] ; then \
$(MAKE) -- $* ; \
else \
$(CONTAINER_COMMAND) run $(CONTAINER_INTERACTIVE) -v $(PWD):$${MOUNT_DIR} --env IN_CONTAINER=true --env FRADRIVE_MAKE_TARGET=$* fradrive/$(FRADRIVE_SERVICE) ; \
$(CONTAINER_COMMAND) run $(CONTAINER_INTERACTIVE) -v $(PWD):$${MOUNT_DIR} $(CONTAINER_PORTS) --env IN_CONTAINER=true --env FRADRIVE_MAKE_TARGET=$* fradrive/$(FRADRIVE_SERVICE) ; \
fi
##### CONTAINER TARGETS #####