From 4ae8c77e3edd0497f1bb0b612132ffa1179db5f0 Mon Sep 17 00:00:00 2001 From: david-scarratt-lrn Date: Tue, 14 May 2024 16:12:13 +1000 Subject: [PATCH 1/3] Pass stdin to the bootstrap container. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6c2d841..381a61d 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,7 @@ TARGETS = all build devbuild prodbuild \ ifneq (,$(DOCKER)) # Re-run the make command in a container -DKR = docker container run -t --rm \ +DKR = docker container run -it --rm \ -v $(CURDIR):/srv/sdk/php:z,delegated \ -v lrn-sdk-php_cache:/root/.composer \ -w /srv/sdk/php \ From 743310d6805761b8c1c453d7c3f06a8e3c05daeb Mon Sep 17 00:00:00 2001 From: david-scarratt-lrn Date: Tue, 14 May 2024 16:32:34 +1000 Subject: [PATCH 2/3] Detect TTY before assigning stdin --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 381a61d..309b611 100644 --- a/Makefile +++ b/Makefile @@ -27,8 +27,9 @@ TARGETS = all build devbuild prodbuild \ .default: all ifneq (,$(DOCKER)) +TTYFLAGS := $(shell if [ -t 0 ] ; then echo "-it"; else echo "-t"; fi) # Re-run the make command in a container -DKR = docker container run -it --rm \ +DKR = docker container run $(TTYFLAGS) --rm \ -v $(CURDIR):/srv/sdk/php:z,delegated \ -v lrn-sdk-php_cache:/root/.composer \ -w /srv/sdk/php \ From d1f72045f664aa5cb4aebb8803df6fd9dce47ae5 Mon Sep 17 00:00:00 2001 From: david-scarratt-lrn Date: Fri, 21 Jun 2024 12:24:24 +1000 Subject: [PATCH 3/3] Set a default value for LOCALHOST --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index 309b611..5ea6542 100644 --- a/Makefile +++ b/Makefile @@ -56,6 +56,8 @@ DIST_PREFIX = learnosity_sdk- SRC_VERSION := $(shell git describe | sed s/^v//) DIST = $(DIST_PREFIX)$(SRC_VERSION) +LOCALHOST = localhost + COMPOSER = composer COMPOSER_INSTALL_FLAGS = --no-interaction --optimize-autoloader --classmap-authoritative