Use cat and double-quotes when retrieving the password

This commit is contained in:
Jose Diaz-Gonzalez
2016-08-27 01:34:41 -04:00
parent fbfacb44c4
commit 1924739d74

View File

@@ -387,7 +387,7 @@ service_create_container() {
local SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"
local SERVICE_NAME="$(get_service_name "$SERVICE")"
local ROOTPASSWORD=$(cat "$SERVICE_ROOT/ROOTPASSWORD")
local PASSWORD=$(cat "$SERVICE_ROOT/PASSWORD")
local PASSWORD="$(cat "$SERVICE_ROOT/PASSWORD")"
# shellcheck disable=SC2086
ID=$(docker run --name "$SERVICE_NAME" -v "$SERVICE_ROOT/data:/data/db" --env-file="$SERVICE_ROOT/ENV" -d --restart always --label dokku=service --label dokku.service=mongo "$PLUGIN_IMAGE:$PLUGIN_IMAGE_VERSION" mongod $MONGO_CONFIG_OPTIONS)
@@ -442,7 +442,7 @@ service_start() {
local PREVIOUS_ID=$(docker ps -f status=exited | grep -e "$SERVICE_NAME$" | awk '{print $1}') || true
local IMAGE_EXISTS=$(docker images | grep -e "^$PLUGIN_IMAGE " | grep -q " $PLUGIN_IMAGE_VERSION " && true)
local ROOTPASSWORD=$(cat "$SERVICE_ROOT/ROOTPASSWORD")
local PASSWORD=$(cat "$SERVICE_ROOT/PASSWORD")
local PASSWORD="$(cat "$SERVICE_ROOT/PASSWORD")"
if [[ -n $PREVIOUS_ID ]]; then
docker start "$PREVIOUS_ID" > /dev/null