Allow to pass custom args to the createdb command

Author: timaschew

README.md

@@ -66,6 +66,7 @@ dokku postgres:create <service> [--create-flags...]
 flags:
 
 - `-c|--config-options "--args --go=here"`: extra arguments to pass to the container create command (default: `None`)
+- `-c|--createdb-options "--locale=C"`: extra arguments to pass to the `createdb` command inside the container (default: `-E=UTF8`)
 - `-C|--custom-env "USER=alpha;HOST=beta"`: semi-colon delimited environment variables to start the service with
 - `-i|--image IMAGE`: the image name to start the service with
 - `-I|--image-version IMAGE_VERSION`: the image version to start the service with

common-functions

@@ -269,6 +269,10 @@ service_commit_config() {
     echo "$SERVICE_MEMORY" >"$SERVICE_ROOT/SERVICE_MEMORY"
   fi
 
+  if [[ -n "$CREATEDB_OPTIONS" ]]; then
+    echo "$CREATEDB_OPTIONS" >"$SERVICE_ROOT/CREATEDB_OPTIONS"
+  fi
+
   if [[ -n "$SERVICE_SHM_SIZE" ]]; then
     echo "$SERVICE_SHM_SIZE" >"$SERVICE_ROOT/SHM_SIZE"
   fi
@@ -452,6 +456,7 @@ service_info() {
   local flag_map=(
     "--config-dir: ${SERVICE_ROOT}/${PLUGIN_CONFIG_SUFFIX}"
     "--config-options: $(cat "$SERVICE_ROOT/CONFIG_OPTIONS")"
+    "--createdb-options: $(cat "$SERVICE_ROOT/CREATEDB_OPTIONS")"
     "--data-dir: ${SERVICE_ROOT}/data"
     "--dsn: ${SERVICE_URL}"
     "--exposed-ports: $(service_exposed_ports "$SERVICE")"
@@ -606,6 +611,7 @@ service_parse_args() {
     case "$arg" in
       "--alias") set -- "$@" "-a" ;;
       "--config-options") set -- "$@" "-c" ;;
+      "--createdb-options") set -- "$@" "-o" ;;
       "--custom-env") set -- "$@" "-C" ;;
       "--database") set -- "$@" "-d" ;;
       "--image-version") set -- "$@" "-I" ;;

functions

@@ -73,6 +73,10 @@ service_create_container() {
     export CONFIG_OPTIONS="$(cat "$SERVICE_ROOT/CONFIG_OPTIONS")"
   fi
 
+  if [[ -f "$SERVICE_ROOT/CREATEDB_OPTIONS" ]]; then
+    export CREATEDB_OPTIONS="$(cat "$SERVICE_ROOT/CREATEDB_OPTIONS")"
+  fi
+
   [[ -f "$SERVICE_ROOT/SERVICE_MEMORY" ]] && SERVICE_MEMORY="$(cat "$SERVICE_ROOT/SERVICE_MEMORY")"
   if [[ -n "$SERVICE_MEMORY" ]]; then
     MEMORY_LIMIT="--memory=${SERVICE_MEMORY}m"
@@ -94,7 +98,7 @@ service_create_container() {
   docker run --rm --link "$SERVICE_NAME:$PLUGIN_COMMAND_PREFIX" "$PLUGIN_WAIT_IMAGE" -p "$PLUGIN_DATASTORE_WAIT_PORT" >/dev/null
 
   dokku_log_verbose_quiet "Creating container database"
-  docker exec "$SERVICE_NAME" su - postgres -c "createdb -E utf8 $DATABASE_NAME" 2>/dev/null || dokku_log_verbose_quiet 'Already exists'
+  docker exec "$SERVICE_NAME" su - postgres -c "createdb -E=UTF8 $CREATEDB_OPTIONS $DATABASE_NAME" 2>/dev/null || dokku_log_verbose_quiet 'Already exists'
 
   dokku_log_verbose_quiet "Securing connection to database"
   service_stop "$SERVICE" >/dev/null

plugin.toml

@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku postgres service plugin"
-version = "1.14.1"
+version = "1.15.2"
 [plugin.config]

subcommands/create

@@ -19,6 +19,7 @@ service-create-cmd() {
   #E dokku $PLUGIN_COMMAND_PREFIX:create lollipop
   #A service, service to run command against
   #F -c|--config-options "--args --go=here", extra arguments to pass to the container create command
+  #F -c|--createdb-options "--locale=C ", extra arguments to pass to the createdb command inside the container
   #F -C|--custom-env "USER=alpha;HOST=beta", semi-colon delimited environment variables to start the service with
   #F -i|--image IMAGE, the image name to start the service with
   #F -I|--image-version IMAGE_VERSION, the image version to start the service with