Skip to content

Commit e818fe7

Browse files
committed
Fix APP_ENV issue
1 parent 527dfdd commit e818fe7

2 files changed

Lines changed: 4 additions & 15 deletions

File tree

makeconfigs.sh

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -106,19 +106,7 @@ jq -r ".db_ssl_enable=true" "$mytemp/mongo-config.json" |
106106
jq -r ".db_auth_config.username=\"$myappuser\"" |
107107
jq -r ".db_auth_config.password=\"$myapppwd\"" |
108108
jq -r '.db_auth_config.authenticateDb="admin"' >"${RG_HOME}/config/mongo-config.json"
109-
echo "Modifying global-config.json"
110-
if [ -z "$baseurl" ]; then
111-
echo "WARNING: Base URL is not passed. global-config.json file may not be configured correctly"
112-
fi
113-
jq -r ".secureURL.PROD=\"$baseurl\"" "$mytemp/global-config.json" |
114-
jq -r ".linksForRg.termsAndConditions=\"$baseurl\"" >"${RG_HOME}/config/global-config.json"
115-
echo "Modifying email-config.json"
116-
if [ -z "$baseurl" ]; then
117-
echo "WARNING: Base URL is not passed. The following file may not be configured correctly"
118-
fi
119-
jq -r ".email.url=\"$baseurl:2687/bot/sns_notify_bot/exec\"" "$mytemp/email-config.json" |
120-
jq -r '.email.options.body.data.from="rlc.support@relevancelab.com"' |
121-
jq -r '.email.options.body.data.url="https://serviceone.rlcatalyst.com"' >"${RG_HOME}/config/email-config.json"
109+
122110
echo "Modifying notification-config.json"
123111
jq -r ".tokenID=[\"$generated_token\"]" "$mytemp/notification-config.json" >"${RG_HOME}/config/notification-config.json"
124112
echo "Modifying trustPolicy.json"

scripts/fixconfigs.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@ echo "Copying docker-compose.yml from $RG_SRC to $RG_HOME"
5656
# trunk-ignore(shellcheck/SC2016)
5757
repcmd='s#\${PWD}#'$RG_HOME'#'
5858
echo "Modifying docker-compose.yml"
59-
sed -e "$repcmd" "$RG_SRC/docker-compose.yml" -e "s#APP_ENV=.*#APP_ENV=$RG_ENV#" >"$RG_HOME/docker-compose.yml"
60-
echo "Modified docker-compose.yml with APP_ENV=$RG_ENV"
59+
sed -e "$repcmd" -e "s#APP_ENV=.*#APP_ENV=$RG_ENV#" "$RG_SRC/docker-compose.yml" >"$RG_HOME/docker-compose.yml"
60+
grep -i "APP_ENV" "$RG_HOME/docker-compose.yml"
61+
echo "Modified docker-compose.yml"
6162

6263
echo 'Configuration changed successfully'

0 commit comments

Comments
 (0)