From 770aafa5ca94d47b7237a18828c79226c3026369 Mon Sep 17 00:00:00 2001 From: Arnie Date: Thu, 4 Jan 2018 06:58:01 +0100 Subject: [PATCH] Allow overriding individual service configuration --- .gitignore | 2 +- adminer/run.sh | 3 +++ elastic-search/run.sh | 2 ++ mailhog/run.sh | 2 ++ maria-db/run.sh | 3 +++ nginx/run.sh | 3 +++ pgsql-db/run.sh | 3 +++ 7 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 6f02ada..03129a0 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -env.shinc +**/env.shinc diff --git a/adminer/run.sh b/adminer/run.sh index b6a48e9..b53ddc8 100755 --- a/adminer/run.sh +++ b/adminer/run.sh @@ -16,6 +16,9 @@ source ${SCRIPT_PATH}/../common.shinc DOMAIN_NAME="adminer.loc" +source ${SCRIPT_PATH}/env.shinc 2> /dev/null + + init() { __init diff --git a/elastic-search/run.sh b/elastic-search/run.sh index e00aee0..8432585 100755 --- a/elastic-search/run.sh +++ b/elastic-search/run.sh @@ -16,6 +16,8 @@ source ${SCRIPT_PATH}/../common.shinc DOMAIN_NAME="elastic.loc" +source ${SCRIPT_PATH}/env.shinc 2> /dev/null + init() { __init diff --git a/mailhog/run.sh b/mailhog/run.sh index 74b64fd..57dd4f0 100755 --- a/mailhog/run.sh +++ b/mailhog/run.sh @@ -18,6 +18,8 @@ SMTP_PORT=1025 WEB_PORT=8025 DOMAIN_NAME="mailhog.loc" +source ${SCRIPT_PATH}/env.shinc 2> /dev/null + init() { __init diff --git a/maria-db/run.sh b/maria-db/run.sh index 882e845..bfc1819 100755 --- a/maria-db/run.sh +++ b/maria-db/run.sh @@ -17,6 +17,9 @@ source ${SCRIPT_PATH}/../common.shinc DB_VOLUME=mariadb_shared BACKUP_DIR=${SCRIPT_PATH}/backup +source ${SCRIPT_PATH}/env.shinc 2> /dev/null + + init() { __init diff --git a/nginx/run.sh b/nginx/run.sh index 3bf2604..04a1f68 100755 --- a/nginx/run.sh +++ b/nginx/run.sh @@ -14,6 +14,9 @@ source ${SCRIPT_PATH}/../common.shinc # Project specific variables # +source ${SCRIPT_PATH}/env.shinc 2> /dev/null + + init() { __init diff --git a/pgsql-db/run.sh b/pgsql-db/run.sh index 7cbe7ed..9355ebb 100755 --- a/pgsql-db/run.sh +++ b/pgsql-db/run.sh @@ -17,6 +17,9 @@ source ${SCRIPT_PATH}/../common.shinc DB_VOLUME=pgsql_persistent PORT=5432 +source ${SCRIPT_PATH}/env.shinc 2> /dev/null + + init() { __init