dokku/dokku-mongo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: ensure we create the config directory

Browse Source
This commit is contained in:
Jose Diaz-Gonzalez
2017-09-11 07:13:41 -04:00
parent bc37291bcb
commit bfa7e0d31e
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
common-functions
View File

@@ -328,6 +328,7 @@ service_linked_apps() {
local SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE" local SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"
local LINKS_FILE="$SERVICE_ROOT/LINKS" local LINKS_FILE="$SERVICE_ROOT/LINKS"
touch "$LINKS_FILE"
[[ -z $(< "$LINKS_FILE") ]] && echo '-' && return 0 [[ -z $(< "$LINKS_FILE") ]] && echo '-' && return 0
tr '\n' ' ' < "$LINKS_FILE" tr '\n' ' ' < "$LINKS_FILE"

5
config
View File

@@ -2,10 +2,9 @@
export MONGO_IMAGE=${MONGO_IMAGE:="mongo"} export MONGO_IMAGE=${MONGO_IMAGE:="mongo"}
export MONGO_IMAGE_VERSION=${MONGO_IMAGE_VERSION:="3.2.9"} export MONGO_IMAGE_VERSION=${MONGO_IMAGE_VERSION:="3.2.9"}
export MONGO_ROOT=${MONGO_ROOT:="/var/lib/dokku/services/mongo"} export MONGO_ROOT=${MONGO_ROOT:="/var/lib/dokku/services/mongo"}
export MONGO_CONFIG_OPTIONS=${MONGO_CONFIG_OPTIONS:=" --storageEngine wiredTiger --auth "}
export PLUGIN_COMMAND_PREFIX="mongo" export PLUGIN_COMMAND_PREFIX="mongo"
export PLUGIN_CONFIG_ROOT="${DOKKU_LIB_ROOT}/config/${PLUGIN_COMMAND_PREFIX}" export PLUGIN_CONFIG_ROOT=${PLUGIN_CONFIG_ROOT:="$DOKKU_LIB_ROOT/config/$PLUGIN_COMMAND_PREFIX"}
export PLUGIN_DATA_ROOT=$MONGO_ROOT export PLUGIN_DATA_ROOT=$MONGO_ROOT
export PLUGIN_DATASTORE_PORTS=(27017 27018 27019 28017) export PLUGIN_DATASTORE_PORTS=(27017 27018 27019 28017)
export PLUGIN_DATASTORE_WAIT_PORT=27017 export PLUGIN_DATASTORE_WAIT_PORT=27017
@@ -24,3 +23,5 @@ fi
if [[ -d "$PLUGIN_DATA_ROOT/*" ]]; then if [[ -d "$PLUGIN_DATA_ROOT/*" ]]; then
rm -rf "${PLUGIN_DATA_ROOT:?}/*" rm -rf "${PLUGIN_DATA_ROOT:?}/*"
fi fi
export MONGO_CONFIG_OPTIONS=${MONGO_CONFIG_OPTIONS:=" --storageEngine wiredTiger --auth "}

4
tests/test_helper.bash
View File

@@ -10,6 +10,7 @@ export PLUGIN_AVAILABLE_PATH="$PLUGIN_PATH"
export PLUGIN_CORE_AVAILABLE_PATH="$PLUGIN_PATH" export PLUGIN_CORE_AVAILABLE_PATH="$PLUGIN_PATH"
export MONGO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/fixtures" export MONGO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/fixtures"
export PLUGIN_DATA_ROOT="$MONGO_ROOT" export PLUGIN_DATA_ROOT="$MONGO_ROOT"
export PLUGIN_CONFIG_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/config"
if [[ "$(uname)" == "Darwin" ]]; then if [[ "$(uname)" == "Darwin" ]]; then
export PLUGN_URL="https://github.com/dokku/plugn/releases/download/v0.3.0/plugn_0.3.0_darwin_x86_64.tgz" export PLUGN_URL="https://github.com/dokku/plugn/releases/download/v0.3.0/plugn_0.3.0_darwin_x86_64.tgz"
else else
@@ -19,6 +20,9 @@ fi
mkdir -p "$PLUGIN_DATA_ROOT" mkdir -p "$PLUGIN_DATA_ROOT"
rm -rf "${PLUGIN_DATA_ROOT:?}"/* rm -rf "${PLUGIN_DATA_ROOT:?}"/*
mkdir -p "$PLUGIN_CONFIG_ROOT"
rm -rf "${PLUGIN_CONFIG_ROOT:?}"/*
flunk() { flunk() {
{ if [ "$#" -eq 0 ]; then cat - { if [ "$#" -eq 0 ]; then cat -
else echo "$*" else echo "$*"