Allow use of docker-pre-entrypoint.d and docker-post-entrypoint.d

tbeadle · tbeadle · commit 8394b42b2db9 · 2017-01-24T12:21:40.000-05:00
directories.
diff --git a/9.2/alpine/docker-entrypoint.sh b/9.2/alpine/docker-entrypoint.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 set -e
+shopt -s nullglob
+
 
 # usage: file_env VAR [DEFAULT]
 #    ie: file_env 'XYZ_DB_PASSWORD' 'example'
@@ -36,6 +38,13 @@ if [ "${1:0:1}" = '-' ]; then
 fi
 
 if [ "$1" = 'postgres' ]; then
+	for x in /docker-pre-entrypoint.d/*; do
+		if [ -x "${x}" ]; then
+			echo "-----> Running ${x}"
+			"${x}"
+		fi
+	done
+
 	mkdir -p "$PGDATA"
 	chmod 700 "$PGDATA"
 	chown -R postgres "$PGDATA"
@@ -149,6 +158,13 @@ EOF
 		echo
 	fi
 
+	for x in /docker-post-entrypoint.d/*; do
+		if [ -x "${x}" ]; then
+			echo "-----> Running ${x}"
+			"${x}"
+		fi
+	done
+
 	exec su-exec postgres "$@"
 fi
 
diff --git a/9.2/docker-entrypoint.sh b/9.2/docker-entrypoint.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 set -e
+shopt -s nullglob
+
 
 # usage: file_env VAR [DEFAULT]
 #    ie: file_env 'XYZ_DB_PASSWORD' 'example'
@@ -36,6 +38,13 @@ if [ "${1:0:1}" = '-' ]; then
 fi
 
 if [ "$1" = 'postgres' ]; then
+	for x in /docker-pre-entrypoint.d/*; do
+		if [ -x "${x}" ]; then
+			echo "-----> Running ${x}"
+			"${x}"
+		fi
+	done
+
 	mkdir -p "$PGDATA"
 	chmod 700 "$PGDATA"
 	chown -R postgres "$PGDATA"
@@ -149,6 +158,13 @@ EOF
 		echo
 	fi
 
+	for x in /docker-post-entrypoint.d/*; do
+		if [ -x "${x}" ]; then
+			echo "-----> Running ${x}"
+			"${x}"
+		fi
+	done
+
 	exec gosu postgres "$@"
 fi
 
diff --git a/9.3/alpine/docker-entrypoint.sh b/9.3/alpine/docker-entrypoint.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 set -e
+shopt -s nullglob
+
 
 # usage: file_env VAR [DEFAULT]
 #    ie: file_env 'XYZ_DB_PASSWORD' 'example'
@@ -36,6 +38,13 @@ if [ "${1:0:1}" = '-' ]; then
 fi
 
 if [ "$1" = 'postgres' ]; then
+	for x in /docker-pre-entrypoint.d/*; do
+		if [ -x "${x}" ]; then
+			echo "-----> Running ${x}"
+			"${x}"
+		fi
+	done
+
 	mkdir -p "$PGDATA"
 	chmod 700 "$PGDATA"
 	chown -R postgres "$PGDATA"
@@ -149,6 +158,13 @@ EOF
 		echo
 	fi
 
+	for x in /docker-post-entrypoint.d/*; do
+		if [ -x "${x}" ]; then
+			echo "-----> Running ${x}"
+			"${x}"
+		fi
+	done
+
 	exec su-exec postgres "$@"
 fi
 
diff --git a/9.3/docker-entrypoint.sh b/9.3/docker-entrypoint.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 set -e
+shopt -s nullglob
+
 
 # usage: file_env VAR [DEFAULT]
 #    ie: file_env 'XYZ_DB_PASSWORD' 'example'
@@ -36,6 +38,13 @@ if [ "${1:0:1}" = '-' ]; then
 fi
 
 if [ "$1" = 'postgres' ]; then
+	for x in /docker-pre-entrypoint.d/*; do
+		if [ -x "${x}" ]; then
+			echo "-----> Running ${x}"
+			"${x}"
+		fi
+	done
+
 	mkdir -p "$PGDATA"
 	chmod 700 "$PGDATA"
 	chown -R postgres "$PGDATA"
@@ -149,6 +158,13 @@ EOF
 		echo
 	fi
 
+	for x in /docker-post-entrypoint.d/*; do
+		if [ -x "${x}" ]; then
+			echo "-----> Running ${x}"
+			"${x}"
+		fi
+	done
+
 	exec gosu postgres "$@"
 fi
 
diff --git a/9.4/alpine/docker-entrypoint.sh b/9.4/alpine/docker-entrypoint.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 set -e
+shopt -s nullglob
+
 
 # usage: file_env VAR [DEFAULT]
 #    ie: file_env 'XYZ_DB_PASSWORD' 'example'
@@ -36,6 +38,13 @@ if [ "${1:0:1}" = '-' ]; then
 fi
 
 if [ "$1" = 'postgres' ]; then
+	for x in /docker-pre-entrypoint.d/*; do
+		if [ -x "${x}" ]; then
+			echo "-----> Running ${x}"
+			"${x}"
+		fi
+	done
+
 	mkdir -p "$PGDATA"
 	chmod 700 "$PGDATA"
 	chown -R postgres "$PGDATA"
@@ -149,6 +158,13 @@ EOF
 		echo
 	fi
 
+	for x in /docker-post-entrypoint.d/*; do
+		if [ -x "${x}" ]; then
+			echo "-----> Running ${x}"
+			"${x}"
+		fi
+	done
+
 	exec su-exec postgres "$@"
 fi
 
diff --git a/9.4/docker-entrypoint.sh b/9.4/docker-entrypoint.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 set -e
+shopt -s nullglob
+
 
 # usage: file_env VAR [DEFAULT]
 #    ie: file_env 'XYZ_DB_PASSWORD' 'example'
@@ -36,6 +38,13 @@ if [ "${1:0:1}" = '-' ]; then
 fi
 
 if [ "$1" = 'postgres' ]; then
+	for x in /docker-pre-entrypoint.d/*; do
+		if [ -x "${x}" ]; then
+			echo "-----> Running ${x}"
+			"${x}"
+		fi
+	done
+
 	mkdir -p "$PGDATA"
 	chmod 700 "$PGDATA"
 	chown -R postgres "$PGDATA"
@@ -149,6 +158,13 @@ EOF
 		echo
 	fi
 
+	for x in /docker-post-entrypoint.d/*; do
+		if [ -x "${x}" ]; then
+			echo "-----> Running ${x}"
+			"${x}"
+		fi
+	done
+
 	exec gosu postgres "$@"
 fi
 
diff --git a/9.5/alpine/docker-entrypoint.sh b/9.5/alpine/docker-entrypoint.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 set -e
+shopt -s nullglob
+
 
 # usage: file_env VAR [DEFAULT]
 #    ie: file_env 'XYZ_DB_PASSWORD' 'example'
@@ -36,6 +38,13 @@ if [ "${1:0:1}" = '-' ]; then
 fi
 
 if [ "$1" = 'postgres' ]; then
+	for x in /docker-pre-entrypoint.d/*; do
+		if [ -x "${x}" ]; then
+			echo "-----> Running ${x}"
+			"${x}"
+		fi
+	done
+
 	mkdir -p "$PGDATA"
 	chmod 700 "$PGDATA"
 	chown -R postgres "$PGDATA"
@@ -149,6 +158,13 @@ EOF
 		echo
 	fi
 
+	for x in /docker-post-entrypoint.d/*; do
+		if [ -x "${x}" ]; then
+			echo "-----> Running ${x}"
+			"${x}"
+		fi
+	done
+
 	exec su-exec postgres "$@"
 fi
 
diff --git a/9.5/docker-entrypoint.sh b/9.5/docker-entrypoint.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 set -e
+shopt -s nullglob
+
 
 # usage: file_env VAR [DEFAULT]
 #    ie: file_env 'XYZ_DB_PASSWORD' 'example'
@@ -36,6 +38,13 @@ if [ "${1:0:1}" = '-' ]; then
 fi
 
 if [ "$1" = 'postgres' ]; then
+	for x in /docker-pre-entrypoint.d/*; do
+		if [ -x "${x}" ]; then
+			echo "-----> Running ${x}"
+			"${x}"
+		fi
+	done
+
 	mkdir -p "$PGDATA"
 	chmod 700 "$PGDATA"
 	chown -R postgres "$PGDATA"
@@ -149,6 +158,13 @@ EOF
 		echo
 	fi
 
+	for x in /docker-post-entrypoint.d/*; do
+		if [ -x "${x}" ]; then
+			echo "-----> Running ${x}"
+			"${x}"
+		fi
+	done
+
 	exec gosu postgres "$@"
 fi
 
diff --git a/9.6/alpine/docker-entrypoint.sh b/9.6/alpine/docker-entrypoint.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 set -e
+shopt -s nullglob
+
 
 # usage: file_env VAR [DEFAULT]
 #    ie: file_env 'XYZ_DB_PASSWORD' 'example'
@@ -36,6 +38,13 @@ if [ "${1:0:1}" = '-' ]; then
 fi
 
 if [ "$1" = 'postgres' ]; then
+	for x in /docker-pre-entrypoint.d/*; do
+		if [ -x "${x}" ]; then
+			echo "-----> Running ${x}"
+			"${x}"
+		fi
+	done
+
 	mkdir -p "$PGDATA"
 	chmod 700 "$PGDATA"
 	chown -R postgres "$PGDATA"
@@ -149,6 +158,13 @@ EOF
 		echo
 	fi
 
+	for x in /docker-post-entrypoint.d/*; do
+		if [ -x "${x}" ]; then
+			echo "-----> Running ${x}"
+			"${x}"
+		fi
+	done
+
 	exec su-exec postgres "$@"
 fi
 
diff --git a/9.6/docker-entrypoint.sh b/9.6/docker-entrypoint.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 set -e
+shopt -s nullglob
+
 
 # usage: file_env VAR [DEFAULT]
 #    ie: file_env 'XYZ_DB_PASSWORD' 'example'
@@ -36,6 +38,13 @@ if [ "${1:0:1}" = '-' ]; then
 fi
 
 if [ "$1" = 'postgres' ]; then
+	for x in /docker-pre-entrypoint.d/*; do
+		if [ -x "${x}" ]; then
+			echo "-----> Running ${x}"
+			"${x}"
+		fi
+	done
+
 	mkdir -p "$PGDATA"
 	chmod 700 "$PGDATA"
 	chown -R postgres "$PGDATA"
@@ -149,6 +158,13 @@ EOF
 		echo
 	fi
 
+	for x in /docker-post-entrypoint.d/*; do
+		if [ -x "${x}" ]; then
+			echo "-----> Running ${x}"
+			"${x}"
+		fi
+	done
+
 	exec gosu postgres "$@"
 fi
 
diff --git a/README.md b/README.md
@@ -17,6 +17,13 @@ The following changes are incorporated:
    `psql` command. (Only in the debian-based images)
  - The suggestions for postgresql.conf taken from Christophe Pettus's excellent
    talk at https://www.youtube.com/watch?v=jqmdujimzfq are included.
+ - If any executable scripts are found in `/docker-pre-entrypoint.d`, then those
+   scripts will be executed before initializing or starting the database.
+   If any executable scripts are found in `/docker-pre-entrypoint.d`, then those
+   scripts will be executed immediately before starting the database.  These
+   directories are different from the standard `/docker-entrypoint-initdb.d` in
+   that that directory will only be processed when the database did not already
+   exist and is getting initialized.
 
 The images are on docker hub at https://hub.docker.com/r/tbeadle/postgres/
 
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
