From 54394d1ae95943020cf750de3bf032ddb426f47d Mon Sep 17 00:00:00 2001 From: Thomas VIAL Date: Sun, 1 Jan 2017 20:54:53 +0100 Subject: [PATCH] Moved printenv and changed default var export --- Makefile | 3 +-- target/start-mailserver.sh | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 475d32f0..116c0051 100644 --- a/Makefile +++ b/Makefile @@ -58,8 +58,6 @@ endif --cap-add=NET_ADMIN \ -h mail.my-domain.com -t $(NAME) - docker exec mail printenv - # Wait for containers to fully start sleep 15 @@ -76,6 +74,7 @@ run-local: sleep 15 fixtures: + docker exec mail printenv cp config/postfix-accounts.cf config/postfix-accounts.cf.bak # Setup sieve & create filtering folder (INBOX/spam) docker cp "`pwd`/test/config/sieve/dovecot.sieve" mail:/var/mail/localhost.localdomain/user1/.dovecot.sieve diff --git a/target/start-mailserver.sh b/target/start-mailserver.sh index 28b465a1..ed3ba9ba 100644 --- a/target/start-mailserver.sh +++ b/target/start-mailserver.sh @@ -334,7 +334,7 @@ function _setup_default_vars() { notify 'task' "Setting up default variables [$FUNCNAME]" for var in ${!DEFAULT_VARS[@]}; do - echo "export $var=${DEFAULT_VARS[$var]}" >> /root/.bashrc + echo "export $var=${DEFAULT_VARS[$var]}" [ $? != 0 ] && notify 'err' "Unable to set $var=${DEFAULT_VARS[$var]}" && return 1 notify 'inf' "Set $var=${DEFAULT_VARS[$var]}" done