From d4e05464e6b8b394810e0b05b6f5860a878e33a0 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Mon, 5 Oct 2015 14:04:27 -0400 Subject: [PATCH 1/4] Add MONGO_CONFIG_OPTIONS env var This will allow users to configure runtime options for mongodb --- config | 1 + 1 file changed, 1 insertion(+) diff --git a/config b/config index ff57ac0..6624a3a 100644 --- a/config +++ b/config @@ -2,6 +2,7 @@ export MONGO_IMAGE=${MONGO_IMAGE:="mongo"} export MONGO_IMAGE_VERSION=${MONGO_IMAGE_VERSION:="3.0.6"} export MONGO_ROOT=${MONGO_ROOT:="/var/lib/dokku/services/mongo"} +export MONGO_CONFIG_OPTIONS=${MONGO_CONFIG_OPTIONS:=" --auth "} export PLUGIN_COMMAND_PREFIX="mongo" export PLUGIN_DATA_ROOT=$MONGO_ROOT From e5276c4118c86cc5dba770198a77f421d0866d04 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Mon, 5 Oct 2015 14:05:06 -0400 Subject: [PATCH 2/4] Use MONGO_CONFIG_OPTIONS env var when running mongodb --- commands | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commands b/commands index 1f5b291..0f2213b 100755 --- a/commands +++ b/commands @@ -35,7 +35,7 @@ case "$1" in dokku_log_info1 "Starting container" SERVICE_NAME=$(get_service_name "$SERVICE") - ID=$(docker run --name "$SERVICE_NAME" -v "$SERVICE_ROOT/data:/data/db" -d --restart always --label dokku=service --label dokku.service=mongo "$PLUGIN_IMAGE:$PLUGIN_IMAGE_VERSION" mongod --storageEngine wiredTiger --auth) + ID=$(docker run --name "$SERVICE_NAME" -v "$SERVICE_ROOT/data:/data/db" -d --restart always --label dokku=service --label dokku.service=mongo "$PLUGIN_IMAGE:$PLUGIN_IMAGE_VERSION" mongod "$MONGO_CONFIG_OPTIONS") echo "$ID" > "$SERVICE_ROOT/ID" dokku_log_verbose_quiet "Waiting for container to be ready" From 277a5c08b324ef3e11a172d0eae71f1cf28c21e3 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Mon, 5 Oct 2015 14:05:33 -0400 Subject: [PATCH 3/4] Default to wiredTiger storage engine --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config b/config index 6624a3a..becaca8 100644 --- a/config +++ b/config @@ -2,7 +2,7 @@ export MONGO_IMAGE=${MONGO_IMAGE:="mongo"} export MONGO_IMAGE_VERSION=${MONGO_IMAGE_VERSION:="3.0.6"} export MONGO_ROOT=${MONGO_ROOT:="/var/lib/dokku/services/mongo"} -export MONGO_CONFIG_OPTIONS=${MONGO_CONFIG_OPTIONS:=" --auth "} +export MONGO_CONFIG_OPTIONS=${MONGO_CONFIG_OPTIONS:=" --storageEngine wiredTiger --auth "} export PLUGIN_COMMAND_PREFIX="mongo" export PLUGIN_DATA_ROOT=$MONGO_ROOT From cbd49a633f8b10262fbf584c82589e85c5c6f11a Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sun, 11 Oct 2015 02:39:18 -0400 Subject: [PATCH 4/4] Remove quotes on `$MONGO_CONFIG_OPTIONS` to allow for variable expansion --- commands | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commands b/commands index 0f2213b..a5e7bf3 100755 --- a/commands +++ b/commands @@ -35,7 +35,7 @@ case "$1" in dokku_log_info1 "Starting container" SERVICE_NAME=$(get_service_name "$SERVICE") - ID=$(docker run --name "$SERVICE_NAME" -v "$SERVICE_ROOT/data:/data/db" -d --restart always --label dokku=service --label dokku.service=mongo "$PLUGIN_IMAGE:$PLUGIN_IMAGE_VERSION" mongod "$MONGO_CONFIG_OPTIONS") + ID=$(docker run --name "$SERVICE_NAME" -v "$SERVICE_ROOT/data:/data/db" -d --restart always --label dokku=service --label dokku.service=mongo "$PLUGIN_IMAGE:$PLUGIN_IMAGE_VERSION" mongod $MONGO_CONFIG_OPTIONS) echo "$ID" > "$SERVICE_ROOT/ID" dokku_log_verbose_quiet "Waiting for container to be ready"