diff --git a/10/alpine/docker-entrypoint.sh b/10/alpine/docker-entrypoint.sh
index 33d48430fc..2548880890 100755
--- a/10/alpine/docker-entrypoint.sh
+++ b/10/alpine/docker-entrypoint.sh
@@ -30,9 +30,11 @@ fi
 
 # allow the container to be started with `--user`
 if [ "$1" = 'postgres' ] && [ "$(id -u)" = '0' ]; then
-	mkdir -p "$PGDATA"
-	chown -R postgres "$PGDATA"
-	chmod 700 "$PGDATA"
+	if mountpoint $PGDATA; then
+		mkdir -p "$PGDATA"
+		chown -R postgres "$PGDATA"
+		chmod 700 "$PGDATA"
+	fi
 
 	mkdir -p /var/run/postgresql
 	chown -R postgres /var/run/postgresql
@@ -49,9 +51,11 @@ if [ "$1" = 'postgres' ] && [ "$(id -u)" = '0' ]; then
 fi
 
 if [ "$1" = 'postgres' ]; then
-	mkdir -p "$PGDATA"
-	chown -R "$(id -u)" "$PGDATA" 2>/dev/null || :
-	chmod 700 "$PGDATA" 2>/dev/null || :
+	if mountpoint $PGDATA; then
+		mkdir -p "$PGDATA"
+		chown -R "$(id -u)" "$PGDATA" 2>/dev/null || :
+		chmod 700 "$PGDATA" 2>/dev/null || :
+	fi
 
 	# look specifically for PG_VERSION, as it is expected in the DB dir
 	if [ ! -s "$PGDATA/PG_VERSION" ]; then
diff --git a/10/docker-entrypoint.sh b/10/docker-entrypoint.sh
index dafe66000f..352d2b8885 100755
--- a/10/docker-entrypoint.sh
+++ b/10/docker-entrypoint.sh
@@ -30,9 +30,11 @@ fi
 
 # allow the container to be started with `--user`
 if [ "$1" = 'postgres' ] && [ "$(id -u)" = '0' ]; then
-	mkdir -p "$PGDATA"
-	chown -R postgres "$PGDATA"
-	chmod 700 "$PGDATA"
+	if mountpoint $PGDATA; then
+		mkdir -p "$PGDATA"
+		chown -R postgres "$PGDATA"
+		chmod 700 "$PGDATA"
+	fi
 
 	mkdir -p /var/run/postgresql
 	chown -R postgres /var/run/postgresql
@@ -49,9 +51,11 @@ if [ "$1" = 'postgres' ] && [ "$(id -u)" = '0' ]; then
 fi
 
 if [ "$1" = 'postgres' ]; then
-	mkdir -p "$PGDATA"
-	chown -R "$(id -u)" "$PGDATA" 2>/dev/null || :
-	chmod 700 "$PGDATA" 2>/dev/null || :
+	if mountpoint $PGDATA; then
+		mkdir -p "$PGDATA"
+		chown -R "$(id -u)" "$PGDATA" 2>/dev/null || :
+		chmod 700 "$PGDATA" 2>/dev/null || :
+	fi
 
 	# look specifically for PG_VERSION, as it is expected in the DB dir
 	if [ ! -s "$PGDATA/PG_VERSION" ]; then
diff --git a/11/alpine/docker-entrypoint.sh b/11/alpine/docker-entrypoint.sh
index 33d48430fc..2548880890 100755
--- a/11/alpine/docker-entrypoint.sh
+++ b/11/alpine/docker-entrypoint.sh
@@ -30,9 +30,11 @@ fi
 
 # allow the container to be started with `--user`
 if [ "$1" = 'postgres' ] && [ "$(id -u)" = '0' ]; then
-	mkdir -p "$PGDATA"
-	chown -R postgres "$PGDATA"
-	chmod 700 "$PGDATA"
+	if mountpoint $PGDATA; then
+		mkdir -p "$PGDATA"
+		chown -R postgres "$PGDATA"
+		chmod 700 "$PGDATA"
+	fi
 
 	mkdir -p /var/run/postgresql
 	chown -R postgres /var/run/postgresql
@@ -49,9 +51,11 @@ if [ "$1" = 'postgres' ] && [ "$(id -u)" = '0' ]; then
 fi
 
 if [ "$1" = 'postgres' ]; then
-	mkdir -p "$PGDATA"
-	chown -R "$(id -u)" "$PGDATA" 2>/dev/null || :
-	chmod 700 "$PGDATA" 2>/dev/null || :
+	if mountpoint $PGDATA; then
+		mkdir -p "$PGDATA"
+		chown -R "$(id -u)" "$PGDATA" 2>/dev/null || :
+		chmod 700 "$PGDATA" 2>/dev/null || :
+	fi
 
 	# look specifically for PG_VERSION, as it is expected in the DB dir
 	if [ ! -s "$PGDATA/PG_VERSION" ]; then
diff --git a/11/docker-entrypoint.sh b/11/docker-entrypoint.sh
index dafe66000f..352d2b8885 100755
--- a/11/docker-entrypoint.sh
+++ b/11/docker-entrypoint.sh
@@ -30,9 +30,11 @@ fi
 
 # allow the container to be started with `--user`
 if [ "$1" = 'postgres' ] && [ "$(id -u)" = '0' ]; then
-	mkdir -p "$PGDATA"
-	chown -R postgres "$PGDATA"
-	chmod 700 "$PGDATA"
+	if mountpoint $PGDATA; then
+		mkdir -p "$PGDATA"
+		chown -R postgres "$PGDATA"
+		chmod 700 "$PGDATA"
+	fi
 
 	mkdir -p /var/run/postgresql
 	chown -R postgres /var/run/postgresql
@@ -49,9 +51,11 @@ if [ "$1" = 'postgres' ] && [ "$(id -u)" = '0' ]; then
 fi
 
 if [ "$1" = 'postgres' ]; then
-	mkdir -p "$PGDATA"
-	chown -R "$(id -u)" "$PGDATA" 2>/dev/null || :
-	chmod 700 "$PGDATA" 2>/dev/null || :
+	if mountpoint $PGDATA; then
+		mkdir -p "$PGDATA"
+		chown -R "$(id -u)" "$PGDATA" 2>/dev/null || :
+		chmod 700 "$PGDATA" 2>/dev/null || :
+	fi
 
 	# look specifically for PG_VERSION, as it is expected in the DB dir
 	if [ ! -s "$PGDATA/PG_VERSION" ]; then
diff --git a/9.3/alpine/docker-entrypoint.sh b/9.3/alpine/docker-entrypoint.sh
index 4ab34909c7..4373fed8ae 100755
--- a/9.3/alpine/docker-entrypoint.sh
+++ b/9.3/alpine/docker-entrypoint.sh
@@ -30,9 +30,11 @@ fi
 
 # allow the container to be started with `--user`
 if [ "$1" = 'postgres' ] && [ "$(id -u)" = '0' ]; then
-	mkdir -p "$PGDATA"
-	chown -R postgres "$PGDATA"
-	chmod 700 "$PGDATA"
+	if mountpoint $PGDATA; then
+		mkdir -p "$PGDATA"
+		chown -R postgres "$PGDATA"
+		chmod 700 "$PGDATA"
+	fi
 
 	mkdir -p /var/run/postgresql
 	chown -R postgres /var/run/postgresql
@@ -49,9 +51,11 @@ if [ "$1" = 'postgres' ] && [ "$(id -u)" = '0' ]; then
 fi
 
 if [ "$1" = 'postgres' ]; then
-	mkdir -p "$PGDATA"
-	chown -R "$(id -u)" "$PGDATA" 2>/dev/null || :
-	chmod 700 "$PGDATA" 2>/dev/null || :
+	if mountpoint $PGDATA; then
+		mkdir -p "$PGDATA"
+		chown -R "$(id -u)" "$PGDATA" 2>/dev/null || :
+		chmod 700 "$PGDATA" 2>/dev/null || :
+	fi
 
 	# look specifically for PG_VERSION, as it is expected in the DB dir
 	if [ ! -s "$PGDATA/PG_VERSION" ]; then
diff --git a/9.3/docker-entrypoint.sh b/9.3/docker-entrypoint.sh
index 41802e82c2..cfdaeed060 100755
--- a/9.3/docker-entrypoint.sh
+++ b/9.3/docker-entrypoint.sh
@@ -30,9 +30,11 @@ fi
 
 # allow the container to be started with `--user`
 if [ "$1" = 'postgres' ] && [ "$(id -u)" = '0' ]; then
-	mkdir -p "$PGDATA"
-	chown -R postgres "$PGDATA"
-	chmod 700 "$PGDATA"
+	if mountpoint $PGDATA; then
+		mkdir -p "$PGDATA"
+		chown -R postgres "$PGDATA"
+		chmod 700 "$PGDATA"
+	fi
 
 	mkdir -p /var/run/postgresql
 	chown -R postgres /var/run/postgresql
@@ -49,9 +51,11 @@ if [ "$1" = 'postgres' ] && [ "$(id -u)" = '0' ]; then
 fi
 
 if [ "$1" = 'postgres' ]; then
-	mkdir -p "$PGDATA"
-	chown -R "$(id -u)" "$PGDATA" 2>/dev/null || :
-	chmod 700 "$PGDATA" 2>/dev/null || :
+	if mountpoint $PGDATA; then
+		mkdir -p "$PGDATA"
+		chown -R "$(id -u)" "$PGDATA" 2>/dev/null || :
+		chmod 700 "$PGDATA" 2>/dev/null || :
+	fi
 
 	# look specifically for PG_VERSION, as it is expected in the DB dir
 	if [ ! -s "$PGDATA/PG_VERSION" ]; then
diff --git a/9.4/alpine/docker-entrypoint.sh b/9.4/alpine/docker-entrypoint.sh
index 4ab34909c7..4373fed8ae 100755
--- a/9.4/alpine/docker-entrypoint.sh
+++ b/9.4/alpine/docker-entrypoint.sh
@@ -30,9 +30,11 @@ fi
 
 # allow the container to be started with `--user`
 if [ "$1" = 'postgres' ] && [ "$(id -u)" = '0' ]; then
-	mkdir -p "$PGDATA"
-	chown -R postgres "$PGDATA"
-	chmod 700 "$PGDATA"
+	if mountpoint $PGDATA; then
+		mkdir -p "$PGDATA"
+		chown -R postgres "$PGDATA"
+		chmod 700 "$PGDATA"
+	fi
 
 	mkdir -p /var/run/postgresql
 	chown -R postgres /var/run/postgresql
@@ -49,9 +51,11 @@ if [ "$1" = 'postgres' ] && [ "$(id -u)" = '0' ]; then
 fi
 
 if [ "$1" = 'postgres' ]; then
-	mkdir -p "$PGDATA"
-	chown -R "$(id -u)" "$PGDATA" 2>/dev/null || :
-	chmod 700 "$PGDATA" 2>/dev/null || :
+	if mountpoint $PGDATA; then
+		mkdir -p "$PGDATA"
+		chown -R "$(id -u)" "$PGDATA" 2>/dev/null || :
+		chmod 700 "$PGDATA" 2>/dev/null || :
+	fi
 
 	# look specifically for PG_VERSION, as it is expected in the DB dir
 	if [ ! -s "$PGDATA/PG_VERSION" ]; then
diff --git a/9.4/docker-entrypoint.sh b/9.4/docker-entrypoint.sh
index 41802e82c2..cfdaeed060 100755
--- a/9.4/docker-entrypoint.sh
+++ b/9.4/docker-entrypoint.sh
@@ -30,9 +30,11 @@ fi
 
 # allow the container to be started with `--user`
 if [ "$1" = 'postgres' ] && [ "$(id -u)" = '0' ]; then
-	mkdir -p "$PGDATA"
-	chown -R postgres "$PGDATA"
-	chmod 700 "$PGDATA"
+	if mountpoint $PGDATA; then
+		mkdir -p "$PGDATA"
+		chown -R postgres "$PGDATA"
+		chmod 700 "$PGDATA"
+	fi
 
 	mkdir -p /var/run/postgresql
 	chown -R postgres /var/run/postgresql
@@ -49,9 +51,11 @@ if [ "$1" = 'postgres' ] && [ "$(id -u)" = '0' ]; then
 fi
 
 if [ "$1" = 'postgres' ]; then
-	mkdir -p "$PGDATA"
-	chown -R "$(id -u)" "$PGDATA" 2>/dev/null || :
-	chmod 700 "$PGDATA" 2>/dev/null || :
+	if mountpoint $PGDATA; then
+		mkdir -p "$PGDATA"
+		chown -R "$(id -u)" "$PGDATA" 2>/dev/null || :
+		chmod 700 "$PGDATA" 2>/dev/null || :
+	fi
 
 	# look specifically for PG_VERSION, as it is expected in the DB dir
 	if [ ! -s "$PGDATA/PG_VERSION" ]; then
diff --git a/9.5/alpine/docker-entrypoint.sh b/9.5/alpine/docker-entrypoint.sh
index 4ab34909c7..4373fed8ae 100755
--- a/9.5/alpine/docker-entrypoint.sh
+++ b/9.5/alpine/docker-entrypoint.sh
@@ -30,9 +30,11 @@ fi
 
 # allow the container to be started with `--user`
 if [ "$1" = 'postgres' ] && [ "$(id -u)" = '0' ]; then
-	mkdir -p "$PGDATA"
-	chown -R postgres "$PGDATA"
-	chmod 700 "$PGDATA"
+	if mountpoint $PGDATA; then
+		mkdir -p "$PGDATA"
+		chown -R postgres "$PGDATA"
+		chmod 700 "$PGDATA"
+	fi
 
 	mkdir -p /var/run/postgresql
 	chown -R postgres /var/run/postgresql
@@ -49,9 +51,11 @@ if [ "$1" = 'postgres' ] && [ "$(id -u)" = '0' ]; then
 fi
 
 if [ "$1" = 'postgres' ]; then
-	mkdir -p "$PGDATA"
-	chown -R "$(id -u)" "$PGDATA" 2>/dev/null || :
-	chmod 700 "$PGDATA" 2>/dev/null || :
+	if mountpoint $PGDATA; then
+		mkdir -p "$PGDATA"
+		chown -R "$(id -u)" "$PGDATA" 2>/dev/null || :
+		chmod 700 "$PGDATA" 2>/dev/null || :
+	fi
 
 	# look specifically for PG_VERSION, as it is expected in the DB dir
 	if [ ! -s "$PGDATA/PG_VERSION" ]; then
diff --git a/9.5/docker-entrypoint.sh b/9.5/docker-entrypoint.sh
index 41802e82c2..cfdaeed060 100755
--- a/9.5/docker-entrypoint.sh
+++ b/9.5/docker-entrypoint.sh
@@ -30,9 +30,11 @@ fi
 
 # allow the container to be started with `--user`
 if [ "$1" = 'postgres' ] && [ "$(id -u)" = '0' ]; then
-	mkdir -p "$PGDATA"
-	chown -R postgres "$PGDATA"
-	chmod 700 "$PGDATA"
+	if mountpoint $PGDATA; then
+		mkdir -p "$PGDATA"
+		chown -R postgres "$PGDATA"
+		chmod 700 "$PGDATA"
+	fi
 
 	mkdir -p /var/run/postgresql
 	chown -R postgres /var/run/postgresql
@@ -49,9 +51,11 @@ if [ "$1" = 'postgres' ] && [ "$(id -u)" = '0' ]; then
 fi
 
 if [ "$1" = 'postgres' ]; then
-	mkdir -p "$PGDATA"
-	chown -R "$(id -u)" "$PGDATA" 2>/dev/null || :
-	chmod 700 "$PGDATA" 2>/dev/null || :
+	if mountpoint $PGDATA; then
+		mkdir -p "$PGDATA"
+		chown -R "$(id -u)" "$PGDATA" 2>/dev/null || :
+		chmod 700 "$PGDATA" 2>/dev/null || :
+	fi
 
 	# look specifically for PG_VERSION, as it is expected in the DB dir
 	if [ ! -s "$PGDATA/PG_VERSION" ]; then
diff --git a/9.6/alpine/docker-entrypoint.sh b/9.6/alpine/docker-entrypoint.sh
index 4ab34909c7..4373fed8ae 100755
--- a/9.6/alpine/docker-entrypoint.sh
+++ b/9.6/alpine/docker-entrypoint.sh
@@ -30,9 +30,11 @@ fi
 
 # allow the container to be started with `--user`
 if [ "$1" = 'postgres' ] && [ "$(id -u)" = '0' ]; then
-	mkdir -p "$PGDATA"
-	chown -R postgres "$PGDATA"
-	chmod 700 "$PGDATA"
+	if mountpoint $PGDATA; then
+		mkdir -p "$PGDATA"
+		chown -R postgres "$PGDATA"
+		chmod 700 "$PGDATA"
+	fi
 
 	mkdir -p /var/run/postgresql
 	chown -R postgres /var/run/postgresql
@@ -49,9 +51,11 @@ if [ "$1" = 'postgres' ] && [ "$(id -u)" = '0' ]; then
 fi
 
 if [ "$1" = 'postgres' ]; then
-	mkdir -p "$PGDATA"
-	chown -R "$(id -u)" "$PGDATA" 2>/dev/null || :
-	chmod 700 "$PGDATA" 2>/dev/null || :
+	if mountpoint $PGDATA; then
+		mkdir -p "$PGDATA"
+		chown -R "$(id -u)" "$PGDATA" 2>/dev/null || :
+		chmod 700 "$PGDATA" 2>/dev/null || :
+	fi
 
 	# look specifically for PG_VERSION, as it is expected in the DB dir
 	if [ ! -s "$PGDATA/PG_VERSION" ]; then
diff --git a/9.6/docker-entrypoint.sh b/9.6/docker-entrypoint.sh
index 41802e82c2..cfdaeed060 100755
--- a/9.6/docker-entrypoint.sh
+++ b/9.6/docker-entrypoint.sh
@@ -30,9 +30,11 @@ fi
 
 # allow the container to be started with `--user`
 if [ "$1" = 'postgres' ] && [ "$(id -u)" = '0' ]; then
-	mkdir -p "$PGDATA"
-	chown -R postgres "$PGDATA"
-	chmod 700 "$PGDATA"
+	if mountpoint $PGDATA; then
+		mkdir -p "$PGDATA"
+		chown -R postgres "$PGDATA"
+		chmod 700 "$PGDATA"
+	fi
 
 	mkdir -p /var/run/postgresql
 	chown -R postgres /var/run/postgresql
@@ -49,9 +51,11 @@ if [ "$1" = 'postgres' ] && [ "$(id -u)" = '0' ]; then
 fi
 
 if [ "$1" = 'postgres' ]; then
-	mkdir -p "$PGDATA"
-	chown -R "$(id -u)" "$PGDATA" 2>/dev/null || :
-	chmod 700 "$PGDATA" 2>/dev/null || :
+	if mountpoint $PGDATA; then
+		mkdir -p "$PGDATA"
+		chown -R "$(id -u)" "$PGDATA" 2>/dev/null || :
+		chmod 700 "$PGDATA" 2>/dev/null || :
+	fi
 
 	# look specifically for PG_VERSION, as it is expected in the DB dir
 	if [ ! -s "$PGDATA/PG_VERSION" ]; then
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index dafe66000f..352d2b8885 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -30,9 +30,11 @@ fi
 
 # allow the container to be started with `--user`
 if [ "$1" = 'postgres' ] && [ "$(id -u)" = '0' ]; then
-	mkdir -p "$PGDATA"
-	chown -R postgres "$PGDATA"
-	chmod 700 "$PGDATA"
+	if mountpoint $PGDATA; then
+		mkdir -p "$PGDATA"
+		chown -R postgres "$PGDATA"
+		chmod 700 "$PGDATA"
+	fi
 
 	mkdir -p /var/run/postgresql
 	chown -R postgres /var/run/postgresql
@@ -49,9 +51,11 @@ if [ "$1" = 'postgres' ] && [ "$(id -u)" = '0' ]; then
 fi
 
 if [ "$1" = 'postgres' ]; then
-	mkdir -p "$PGDATA"
-	chown -R "$(id -u)" "$PGDATA" 2>/dev/null || :
-	chmod 700 "$PGDATA" 2>/dev/null || :
+	if mountpoint $PGDATA; then
+		mkdir -p "$PGDATA"
+		chown -R "$(id -u)" "$PGDATA" 2>/dev/null || :
+		chmod 700 "$PGDATA" 2>/dev/null || :
+	fi
 
 	# look specifically for PG_VERSION, as it is expected in the DB dir
 	if [ ! -s "$PGDATA/PG_VERSION" ]; then