From 11e432d341a1e3c345e5983d1fd77d65dec124c2 Mon Sep 17 00:00:00 2001
From: Richard Ramos <info@richardramos.me>
Date: Thu, 15 Sep 2022 15:41:00 -0400
Subject: [PATCH] feat: allow passing variables to docker-compose and fix var
 name (#2821)

---
 _assets/compose/bootnode/Makefile    | 2 +-
 _assets/compose/bootnode/README.md   | 1 +
 _assets/compose/mailserver/Makefile  | 2 +-
 _assets/compose/mailserver/README.md | 1 +
 _assets/scripts/gen_config.sh        | 2 +-
 5 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/_assets/compose/bootnode/Makefile b/_assets/compose/bootnode/Makefile
index 0a5767006..00d5b27c8 100644
--- a/_assets/compose/bootnode/Makefile
+++ b/_assets/compose/bootnode/Makefile
@@ -72,7 +72,7 @@ keys:
 
 start: keys/nodekey keys/nodeaddr
 	@echo " * $(GRN)Starting '$(CONTAINER_NAME)' container...$(RST)"
-	docker-compose up -d
+	docker-compose $(COMPOSE_UP_FLAGS) up -d
 
 stop:
 	@echo " * $(YLW)Stopping '$(CONTAINER_NAME)' container...$(RST)"
diff --git a/_assets/compose/bootnode/README.md b/_assets/compose/bootnode/README.md
index 5d7cc7929..1445673ad 100644
--- a/_assets/compose/bootnode/README.md
+++ b/_assets/compose/bootnode/README.md
@@ -32,3 +32,4 @@ All settings are passed through environment variables:
 * `CONTAINER_TAG` - Tag of container image to use. (default: `v0.64.3`)
 * `CONTAINER_NAME` - Name of the container that will be created. (default: `status-go-bootnode`)
 * `LOG_LEVEL` - Set level of log messages to show. (valid: `1=ERROR`, `2=WARN`, `3=INFO`, `4=DEBUG`, `5=TRACE`)
+* `COMPOSE_UP_FLAGS` - Allows passing flags to `docker-compose up`
diff --git a/_assets/compose/mailserver/Makefile b/_assets/compose/mailserver/Makefile
index e025179ce..a2c4e087d 100644
--- a/_assets/compose/mailserver/Makefile
+++ b/_assets/compose/mailserver/Makefile
@@ -71,7 +71,7 @@ logs:
 
 start: config
 	@echo " * $(GRN)Starting '$(CONTAINER_NAME)' container...$(RST)"
-	docker-compose up -d
+	docker-compose $(COMPOSE_UP_FLAGS) up -d
 
 stop:
 	@echo " * $(YLW)Stopping '$(CONTAINER_NAME)' container...$(RST)"
diff --git a/_assets/compose/mailserver/README.md b/_assets/compose/mailserver/README.md
index 928d1c8ac..bf37ea2f5 100644
--- a/_assets/compose/mailserver/README.md
+++ b/_assets/compose/mailserver/README.md
@@ -37,6 +37,7 @@ All settings are passed through environment variables:
 * `REGISTER_TOPIC` - Mynamic mailserver discovery topic. (default: `whispermail`)
 * `MAIL_PASSWORD` - Basic HTTP auth password for mailserver. (default: `status-offline-inbox`)
 * `LOG_LEVEL` - Set level of log messages to show. (valid: `ERROR`, `WARN`, `INFO`, `DEBUG`, `TRACE`)
+* `COMPOSE_UP_FLAGS` - Allows passing flags to `docker-compose up`
 
 The generated configuration file end up under `${DATA_PATH}/config.json`.
 
diff --git a/_assets/scripts/gen_config.sh b/_assets/scripts/gen_config.sh
index 272d6b364..93965560d 100755
--- a/_assets/scripts/gen_config.sh
+++ b/_assets/scripts/gen_config.sh
@@ -6,7 +6,7 @@ GIT_ROOT=$(cd "${BASH_SOURCE%/*}" && git rev-parse --show-toplevel)
 # Settings & defaults
 RPC_HOST="${RPC_HOST:-localhost}"
 RPC_PORT="${RPC_PORT:-8545}"
-LISTEN_PORT="${LSTEN_PORT:-30303}"
+LISTEN_PORT="${LISTEN_PORT:-30303}"
 API_MODULES="${API_MODULES:-eth,web3,admin}"
 MAX_PEERS="${MAX_PEERS:-50}"
 DAYS_KEPT="${DAYS_KEPT-30}"