Add 'postgresql-pre-start' hook

- also cleanup some stderr output caused by missing '../init' and
  '../pre-start' directory
- add missing double-quotes

Author: praiskup

src/root/usr/bin/run-postgresql

@@ -8,6 +8,11 @@ export_vars=$(cgroup-limits) ; export $export_vars
 source "${CONTAINER_SCRIPTS_PATH}/common.sh"
 
 set_pgdata
+
+process_extending_files \
+        "${APP_DATA}/src/postgresql-pre-start" \
+        "${CONTAINER_SCRIPTS_PATH}/pre-start"
+
 check_env_vars
 generate_passwd_file
 generate_postgresql_config
@@ -24,12 +29,16 @@ fi
 
 pg_ctl -w start -o "-h ''"
 if $PG_INITIALIZED ; then
-    process_extending_files ${APP_DATA}/src/postgresql-init ${CONTAINER_SCRIPTS_PATH}/init
+    process_extending_files \
+        "${APP_DATA}/src/postgresql-init" \
+        "${CONTAINER_SCRIPTS_PATH}/init"
     migrate_db
     create_users
 fi
 
-process_extending_files ${APP_DATA}/src/postgresql-start ${CONTAINER_SCRIPTS_PATH}/start
+process_extending_files \
+    "${APP_DATA}/src/postgresql-start" \
+    "${CONTAINER_SCRIPTS_PATH}/start"
 
 pg_ctl stop
 

src/root/usr/share/container-scripts/postgresql/README.md

@@ -252,6 +252,13 @@ $ s2i build ~/image-configuration/ postgresql new-postgresql
 The directory passed to `s2i build` should contain one or more of the
 following directories:
 
+
+##### `postgresql-pre-start/`
+
+Source all `*.sh` files from this directory during early start of the
+container.  There's no PostgreSQL daemon running on background.
+
+
 ##### `postgresql-cfg/`
 
 Contained configuration files (`*.conf`) will be included at the end of image

src/root/usr/share/container-scripts/postgresql/common.sh

@@ -408,31 +408,34 @@ try_pgupgrade ()
   run_pgupgrade
 }
 
-# get_matched_files finds file for image extending
-function get_matched_files() {
-  local custom_dir default_dir
-  custom_dir="$1"
-  default_dir="$2"
-  files_matched="$3"
-  find "$default_dir" -maxdepth 1 -type f -name "$files_matched" -printf "%f\n"
-  [ -d "$custom_dir" ] && find "$custom_dir" -maxdepth 1 -type f -name "$files_matched" -printf "%f\n"
+# get_matched_files PATTERN DIR [DIR ...]
+# ---------------------------------------
+# Print all basenames for files matching PATTERN in DIRs.
+get_matched_files ()
+{
+  local pattern=$1 dir
+  shift
+  for dir; do
+    test -d "$dir" || continue
+    find "$dir" -maxdepth 1 -type f -name "$pattern" -printf "%f\n"
+  done
 }
 
-# process_extending_files process extending files in $1 and $2 directories
-# - source all *.sh files
-#   (if there are files with same name source only file from $1)
-function process_extending_files() {
-  local custom_dir default_dir
-  custom_dir=$1
-  default_dir=$2
-
+# process_extending_files DIR [DIR ...]
+# -------------------------------------
+# Source all *.sh files in DIRs in alphabetical order, but if the file exists in
+# more then one DIR, source only the first occurrence (first found wins).
+process_extending_files()
+{
+  local filename dir
   while read filename ; do
-    echo "=> sourcing $filename ..."
-    # Custom file is prefered
-    if [ -f $custom_dir/$filename ]; then
-      source $custom_dir/$filename
-    elif [ -f $default_dir/$filename ]; then
-      source $default_dir/$filename
-    fi
-  done <<<"$(get_matched_files "$custom_dir" "$default_dir" '*.sh' | sort -u)"
+    for dir in "$@"; do
+      local file="$dir/$filename"
+      if test -f "$file"; then
+        echo "=> sourcing $file ..."
+        source "$file"
+        break
+      fi
+    done
+  done <<<"$(get_matched_files '*.sh' "$@" | sort -u)"
 }