From 0cee6f01e8068815215a04bdc3bf0555b184335c Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Tue, 18 Mar 2025 14:02:09 +0100 Subject: [PATCH 1/2] build(Makefile): fortify PROD var --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index ba298ca21..47513f295 100644 --- a/Makefile +++ b/Makefile @@ -43,8 +43,10 @@ export UNIWORXDB_OPTS ?= -cf export PROD ?= false export SRC -ifneq ($(PROD),true) - export --DEVELOPMENT=--flag uniworx:dev +ifeq ($(PROD),true) +export --DEVELOPMENT=--flag uniworx:-dev +else +export --DEVELOPMENT=--flag uniworx:dev endif export DATE := $(shell date +'%Y-%m-%dT%H-%M-%S') From babee7afa24d842ad7f4eb5c76bb7c33688ff495 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Tue, 18 Mar 2025 14:02:46 +0100 Subject: [PATCH 2/2] build(Makefile): use static port and dir settings for memcached, minio and maildev --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 47513f295..90e3300ec 100644 --- a/Makefile +++ b/Makefile @@ -159,14 +159,14 @@ start: .PHONY: %-memcached %-memcached: SERVICE=memcached %-memcached: SERVICE_VARIANT=memcached -%-memcached: IMAGE=$$(MEMCACHED_IMAGE) --port=`cat $$(CONTAINER_FILE) | grep 'MEMCACHED_PORT=' | sed 's/MEMCACHED_PORT=//'` +%-memcached: IMAGE=$$(MEMCACHED_IMAGE) --port=11211 %-memcached: LOCAL_CONTAINERFILE=false %-memcached: BASE_PORTS = "MEMCACHED_PORT=11211" .PHONY: %-maildev %-maildev: SERVICE=maildev %-maildev: SERVICE_VARIANT=maildev -%-maildev: IMAGE=$$(MAILDEV_IMAGE) --port=`cat $$(CONTAINER_FILE) | grep 'MAILDEV_PORT=' | sed 's/MAILDEV_PORT=//'` +%-maildev: IMAGE=$$(MAILDEV_IMAGE) --port=1025 %-maildev: LOCAL_CONTAINERFILE=false %-maildev: BASE_PORTS = "MAILDEV_PORT=1025" @@ -180,7 +180,7 @@ start: .PHONY: %-minio %-minio: SERVICE=minio %-minio: SERVICE_VARIANT=minio -%-minio: IMAGE=$$(MINIO_IMAGE) -- server `mktemp` --address=:`cat $$(CONTAINER_FILE) | grep 'UPLOAD_S3_PORT=' | sed 's/UPLOAD_S3_PORT=//'` +%-minio: IMAGE=$$(MINIO_IMAGE) -- server /tmp/minio %-minio: LOCAL_CONTAINERFILE=false %-minio: BASE_PORTS = "UPLOAD_S3_PORT=9000"