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

build(Makefile): use SET_CONTAINER_CMD to splice CONTAINER_CMD inside podman run

Browse Source
This commit is contained in:
Sarah Vaupel 2024-11-07 02:25:58 +01:00
parent 191afbd2c8
commit 88e984d4e5
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile
View File

@ -27,6 +27,7 @@ export SERVICE_VARIANT ?= $(SERVICE)
export SERVICE_PARALLEL ?= false export SERVICE_PARALLEL ?= false
export JOB export JOB
export CONTAINER_CMD export CONTAINER_CMD
export SET_CONTAINER_CMD
export ENTRYPOINT export ENTRYPOINT
export EXEC_OPTS export EXEC_OPTS
@ -129,13 +130,13 @@ start:
.PHONY: %-memcached .PHONY: %-memcached
%-memcached: SERVICE=memcached %-memcached: SERVICE=memcached
%-memcached: SERVICE_VARIANT=memcached %-memcached: SERVICE_VARIANT=memcached
%-memcached: CONTAINER_CMD=$$(MEMCACHED_IMAGE) --port=`cat $$(CONTAINER_FILE) | grep 'MEMCACHED_PORT=' | sed 's/MEMCACHED_PORT=//'` %-memcached: SET_CONTAINER_CMD=$$(MEMCACHED_IMAGE) --port=`cat $$(CONTAINER_FILE) | grep 'MEMCACHED_PORT=' | sed 's/MEMCACHED_PORT=//'`
%-memcached: BASE_PORTS = "MEMCACHED_PORT=11211" %-memcached: BASE_PORTS = "MEMCACHED_PORT=11211"
.PHONY: %-minio .PHONY: %-minio
%-minio: SERVICE=minio %-minio: SERVICE=minio
%-minio: SERVICE_VARIANT=minio %-minio: SERVICE_VARIANT=minio
%-minio: CONTAINER_CMD=$$(MINIO_IMAGE) -- server `mktemp` --address=:`cat $$(CONTAINER_FILE) | grep 'UPLOAD_S3_PORT=' | sed 's/UPLOAD_S3_PORT=//'` %-minio: SET_CONTAINER_CMD=$$(MINIO_IMAGE) -- server `mktemp` --address=:`cat $$(CONTAINER_FILE) | grep 'UPLOAD_S3_PORT=' | sed 's/UPLOAD_S3_PORT=//'`
%-minio: BASE_PORTS = "UPLOAD_S3_PORT=9000" %-minio: BASE_PORTS = "UPLOAD_S3_PORT=9000"
.PHONY: start-% .PHONY: start-%
@ -212,6 +213,12 @@ endif
DEVELOP=`cat develop/.current` ; \ DEVELOP=`cat develop/.current` ; \
./utils/watchcontainerrun.sh "$(CONTAINER_COMMAND)" "$(CONTAINER_FILE)" & \ ./utils/watchcontainerrun.sh "$(CONTAINER_COMMAND)" "$(CONTAINER_FILE)" & \
CONTAINER_NAME=fradrive.$(CURR_DEV).$(CONTAINER_IDENT) ; \ CONTAINER_NAME=fradrive.$(CURR_DEV).$(CONTAINER_IDENT) ; \
if ! [ -z "$(SET_CONTAINER_CMD)" ] ; \
then \
CONTAINER_CMD="$(SET_CONTAINER_CMD)" ; \
else \
CONTAINER_CMD=$(CONTAINER_CMD) ; \
fi ; \
CONTAINER_ID=`$(CONTAINER_BGRUN) \ CONTAINER_ID=`$(CONTAINER_BGRUN) \
-v $(PWD):$(MOUNT_DIR) \ -v $(PWD):$(MOUNT_DIR) \
--env IN_CONTAINER=true \ --env IN_CONTAINER=true \
@ -219,7 +226,7 @@ endif
--env CONTAINER_FILE=$(CONTAINER_FILE) \ --env CONTAINER_FILE=$(CONTAINER_FILE) \
--env CONTAINER_NAME=$${CONTAINER_NAME} \ --env CONTAINER_NAME=$${CONTAINER_NAME} \
--name $${CONTAINER_NAME} \ --name $${CONTAINER_NAME} \
$(CONTAINER_CMD) \ $${CONTAINER_CMD} \
` ; \ ` ; \
printf "CONTAINER_ID=$${CONTAINER_ID}" >> "$(CONTAINER_FILE)" ; \ printf "CONTAINER_ID=$${CONTAINER_ID}" >> "$(CONTAINER_FILE)" ; \
if [[ "true" == "$(CONTAINER_ATTACHED)" ]] ; then \ if [[ "true" == "$(CONTAINER_ATTACHED)" ]] ; then \