diff --git a/UBI/11/root/requirements.txt b/UBI/11/root/requirements.txt
index 40793364..e67e2293 100644
--- a/UBI/11/root/requirements.txt
+++ b/UBI/11/root/requirements.txt
@@ -29,12 +29,12 @@ barman[azure,cloud,google,snappy]==3.9.0 \
     # via
     #   -r requirements.in
     #   barman
-boto3==1.34.6 \
-    --hash=sha256:1dd6d952a175da45d05cf9eb2b8d5be31f4863cc54444ac27fbcbba966fc4053 \
-    --hash=sha256:ae47b84db94fc3b8e635c6d1b93da85a5fdca961b212260e5dbf5166435fe7b0
-botocore==1.34.6 \
-    --hash=sha256:697000cb756b8f469c10ed0a8a8590f799a90a98b814ebfccd2add4048084ff1 \
-    --hash=sha256:bfe587f48e154a3a836f85af165116b7d5dba9b3b746ce0b94e6d2ed1e06c206
+boto3==1.34.7 \
+    --hash=sha256:04c1cc752946f20513ed70058d4b750b3591c82bb59cbbe26157dbe125e687cc \
+    --hash=sha256:76b62ca46a4632117b4cd31ae56164492e41afb9fec41973688293c536580561
+botocore==1.34.7 \
+    --hash=sha256:85164e924965c850fb02b1edcbef03f61413aff5f0064e660992b8b76c996d0c \
+    --hash=sha256:b145a52b7d1fd4e072bcd692369d4cb77f971651bb0dc2bf38e2b4f9d62973e6
     # via
     #   boto3
     #   s3transfer
diff --git a/UBI/11/root/usr/local/bin/docker-entrypoint.sh b/UBI/11/root/usr/local/bin/docker-entrypoint.sh
index 6d197bc0..6f59993e 100755
--- a/UBI/11/root/usr/local/bin/docker-entrypoint.sh
+++ b/UBI/11/root/usr/local/bin/docker-entrypoint.sh
@@ -103,20 +103,24 @@ docker_init_database_dir() {
 # print large warning if POSTGRES_HOST_AUTH_METHOD is set to 'trust'
 # assumes database is not set up, ie: [ -z "$DATABASE_ALREADY_EXISTS" ]
 docker_verify_minimum_env() {
-	# check password first so we can output the warning before postgres
-	# messes it up
-	if [ "${#POSTGRES_PASSWORD}" -ge 100 ]; then
-		cat >&2 <<-'EOWARN'
+	case "${PG_MAJOR:-}" in
+		12 | 13) # https://github.com/postgres/postgres/commit/67a472d71c98c3d2fa322a1b4013080b20720b98
+			# check password first so we can output the warning before postgres
+			# messes it up
+			if [ "${#POSTGRES_PASSWORD}" -ge 100 ]; then
+				cat >&2 <<-'EOWARN'
 
-			WARNING: The supplied POSTGRES_PASSWORD is 100+ characters.
+					WARNING: The supplied POSTGRES_PASSWORD is 100+ characters.
 
-			  This will not work if used via PGPASSWORD with "psql".
+					  This will not work if used via PGPASSWORD with "psql".
 
-			  https://www.postgresql.org/message-id/flat/E1Rqxp2-0004Qt-PL%40wrigleys.postgresql.org (BUG #6412)
-			  https://github.com/docker-library/postgres/issues/507
+					  https://www.postgresql.org/message-id/flat/E1Rqxp2-0004Qt-PL%40wrigleys.postgresql.org (BUG #6412)
+					  https://github.com/docker-library/postgres/issues/507
 
-		EOWARN
-	fi
+				EOWARN
+			fi
+			;;
+	esac
 	if [ -z "$POSTGRES_PASSWORD" ] && [ 'trust' != "$POSTGRES_HOST_AUTH_METHOD" ]; then
 		# The - option suppresses leading tabs but *not* spaces. :)
 		cat >&2 <<-'EOE'
diff --git a/UBI/12/root/requirements.txt b/UBI/12/root/requirements.txt
index 40793364..e67e2293 100644
--- a/UBI/12/root/requirements.txt
+++ b/UBI/12/root/requirements.txt
@@ -29,12 +29,12 @@ barman[azure,cloud,google,snappy]==3.9.0 \
     # via
     #   -r requirements.in
     #   barman
-boto3==1.34.6 \
-    --hash=sha256:1dd6d952a175da45d05cf9eb2b8d5be31f4863cc54444ac27fbcbba966fc4053 \
-    --hash=sha256:ae47b84db94fc3b8e635c6d1b93da85a5fdca961b212260e5dbf5166435fe7b0
-botocore==1.34.6 \
-    --hash=sha256:697000cb756b8f469c10ed0a8a8590f799a90a98b814ebfccd2add4048084ff1 \
-    --hash=sha256:bfe587f48e154a3a836f85af165116b7d5dba9b3b746ce0b94e6d2ed1e06c206
+boto3==1.34.7 \
+    --hash=sha256:04c1cc752946f20513ed70058d4b750b3591c82bb59cbbe26157dbe125e687cc \
+    --hash=sha256:76b62ca46a4632117b4cd31ae56164492e41afb9fec41973688293c536580561
+botocore==1.34.7 \
+    --hash=sha256:85164e924965c850fb02b1edcbef03f61413aff5f0064e660992b8b76c996d0c \
+    --hash=sha256:b145a52b7d1fd4e072bcd692369d4cb77f971651bb0dc2bf38e2b4f9d62973e6
     # via
     #   boto3
     #   s3transfer
diff --git a/UBI/12/root/usr/local/bin/docker-entrypoint.sh b/UBI/12/root/usr/local/bin/docker-entrypoint.sh
index 6d197bc0..6f59993e 100755
--- a/UBI/12/root/usr/local/bin/docker-entrypoint.sh
+++ b/UBI/12/root/usr/local/bin/docker-entrypoint.sh
@@ -103,20 +103,24 @@ docker_init_database_dir() {
 # print large warning if POSTGRES_HOST_AUTH_METHOD is set to 'trust'
 # assumes database is not set up, ie: [ -z "$DATABASE_ALREADY_EXISTS" ]
 docker_verify_minimum_env() {
-	# check password first so we can output the warning before postgres
-	# messes it up
-	if [ "${#POSTGRES_PASSWORD}" -ge 100 ]; then
-		cat >&2 <<-'EOWARN'
+	case "${PG_MAJOR:-}" in
+		12 | 13) # https://github.com/postgres/postgres/commit/67a472d71c98c3d2fa322a1b4013080b20720b98
+			# check password first so we can output the warning before postgres
+			# messes it up
+			if [ "${#POSTGRES_PASSWORD}" -ge 100 ]; then
+				cat >&2 <<-'EOWARN'
 
-			WARNING: The supplied POSTGRES_PASSWORD is 100+ characters.
+					WARNING: The supplied POSTGRES_PASSWORD is 100+ characters.
 
-			  This will not work if used via PGPASSWORD with "psql".
+					  This will not work if used via PGPASSWORD with "psql".
 
-			  https://www.postgresql.org/message-id/flat/E1Rqxp2-0004Qt-PL%40wrigleys.postgresql.org (BUG #6412)
-			  https://github.com/docker-library/postgres/issues/507
+					  https://www.postgresql.org/message-id/flat/E1Rqxp2-0004Qt-PL%40wrigleys.postgresql.org (BUG #6412)
+					  https://github.com/docker-library/postgres/issues/507
 
-		EOWARN
-	fi
+				EOWARN
+			fi
+			;;
+	esac
 	if [ -z "$POSTGRES_PASSWORD" ] && [ 'trust' != "$POSTGRES_HOST_AUTH_METHOD" ]; then
 		# The - option suppresses leading tabs but *not* spaces. :)
 		cat >&2 <<-'EOE'
diff --git a/UBI/13/root/requirements.txt b/UBI/13/root/requirements.txt
index 40793364..e67e2293 100644
--- a/UBI/13/root/requirements.txt
+++ b/UBI/13/root/requirements.txt
@@ -29,12 +29,12 @@ barman[azure,cloud,google,snappy]==3.9.0 \
     # via
     #   -r requirements.in
     #   barman
-boto3==1.34.6 \
-    --hash=sha256:1dd6d952a175da45d05cf9eb2b8d5be31f4863cc54444ac27fbcbba966fc4053 \
-    --hash=sha256:ae47b84db94fc3b8e635c6d1b93da85a5fdca961b212260e5dbf5166435fe7b0
-botocore==1.34.6 \
-    --hash=sha256:697000cb756b8f469c10ed0a8a8590f799a90a98b814ebfccd2add4048084ff1 \
-    --hash=sha256:bfe587f48e154a3a836f85af165116b7d5dba9b3b746ce0b94e6d2ed1e06c206
+boto3==1.34.7 \
+    --hash=sha256:04c1cc752946f20513ed70058d4b750b3591c82bb59cbbe26157dbe125e687cc \
+    --hash=sha256:76b62ca46a4632117b4cd31ae56164492e41afb9fec41973688293c536580561
+botocore==1.34.7 \
+    --hash=sha256:85164e924965c850fb02b1edcbef03f61413aff5f0064e660992b8b76c996d0c \
+    --hash=sha256:b145a52b7d1fd4e072bcd692369d4cb77f971651bb0dc2bf38e2b4f9d62973e6
     # via
     #   boto3
     #   s3transfer
diff --git a/UBI/13/root/usr/local/bin/docker-entrypoint.sh b/UBI/13/root/usr/local/bin/docker-entrypoint.sh
index 6d197bc0..6f59993e 100755
--- a/UBI/13/root/usr/local/bin/docker-entrypoint.sh
+++ b/UBI/13/root/usr/local/bin/docker-entrypoint.sh
@@ -103,20 +103,24 @@ docker_init_database_dir() {
 # print large warning if POSTGRES_HOST_AUTH_METHOD is set to 'trust'
 # assumes database is not set up, ie: [ -z "$DATABASE_ALREADY_EXISTS" ]
 docker_verify_minimum_env() {
-	# check password first so we can output the warning before postgres
-	# messes it up
-	if [ "${#POSTGRES_PASSWORD}" -ge 100 ]; then
-		cat >&2 <<-'EOWARN'
+	case "${PG_MAJOR:-}" in
+		12 | 13) # https://github.com/postgres/postgres/commit/67a472d71c98c3d2fa322a1b4013080b20720b98
+			# check password first so we can output the warning before postgres
+			# messes it up
+			if [ "${#POSTGRES_PASSWORD}" -ge 100 ]; then
+				cat >&2 <<-'EOWARN'
 
-			WARNING: The supplied POSTGRES_PASSWORD is 100+ characters.
+					WARNING: The supplied POSTGRES_PASSWORD is 100+ characters.
 
-			  This will not work if used via PGPASSWORD with "psql".
+					  This will not work if used via PGPASSWORD with "psql".
 
-			  https://www.postgresql.org/message-id/flat/E1Rqxp2-0004Qt-PL%40wrigleys.postgresql.org (BUG #6412)
-			  https://github.com/docker-library/postgres/issues/507
+					  https://www.postgresql.org/message-id/flat/E1Rqxp2-0004Qt-PL%40wrigleys.postgresql.org (BUG #6412)
+					  https://github.com/docker-library/postgres/issues/507
 
-		EOWARN
-	fi
+				EOWARN
+			fi
+			;;
+	esac
 	if [ -z "$POSTGRES_PASSWORD" ] && [ 'trust' != "$POSTGRES_HOST_AUTH_METHOD" ]; then
 		# The - option suppresses leading tabs but *not* spaces. :)
 		cat >&2 <<-'EOE'
diff --git a/UBI/14/root/requirements.txt b/UBI/14/root/requirements.txt
index 40793364..e67e2293 100644
--- a/UBI/14/root/requirements.txt
+++ b/UBI/14/root/requirements.txt
@@ -29,12 +29,12 @@ barman[azure,cloud,google,snappy]==3.9.0 \
     # via
     #   -r requirements.in
     #   barman
-boto3==1.34.6 \
-    --hash=sha256:1dd6d952a175da45d05cf9eb2b8d5be31f4863cc54444ac27fbcbba966fc4053 \
-    --hash=sha256:ae47b84db94fc3b8e635c6d1b93da85a5fdca961b212260e5dbf5166435fe7b0
-botocore==1.34.6 \
-    --hash=sha256:697000cb756b8f469c10ed0a8a8590f799a90a98b814ebfccd2add4048084ff1 \
-    --hash=sha256:bfe587f48e154a3a836f85af165116b7d5dba9b3b746ce0b94e6d2ed1e06c206
+boto3==1.34.7 \
+    --hash=sha256:04c1cc752946f20513ed70058d4b750b3591c82bb59cbbe26157dbe125e687cc \
+    --hash=sha256:76b62ca46a4632117b4cd31ae56164492e41afb9fec41973688293c536580561
+botocore==1.34.7 \
+    --hash=sha256:85164e924965c850fb02b1edcbef03f61413aff5f0064e660992b8b76c996d0c \
+    --hash=sha256:b145a52b7d1fd4e072bcd692369d4cb77f971651bb0dc2bf38e2b4f9d62973e6
     # via
     #   boto3
     #   s3transfer
diff --git a/UBI/14/root/usr/local/bin/docker-entrypoint.sh b/UBI/14/root/usr/local/bin/docker-entrypoint.sh
index 6d197bc0..6f59993e 100755
--- a/UBI/14/root/usr/local/bin/docker-entrypoint.sh
+++ b/UBI/14/root/usr/local/bin/docker-entrypoint.sh
@@ -103,20 +103,24 @@ docker_init_database_dir() {
 # print large warning if POSTGRES_HOST_AUTH_METHOD is set to 'trust'
 # assumes database is not set up, ie: [ -z "$DATABASE_ALREADY_EXISTS" ]
 docker_verify_minimum_env() {
-	# check password first so we can output the warning before postgres
-	# messes it up
-	if [ "${#POSTGRES_PASSWORD}" -ge 100 ]; then
-		cat >&2 <<-'EOWARN'
+	case "${PG_MAJOR:-}" in
+		12 | 13) # https://github.com/postgres/postgres/commit/67a472d71c98c3d2fa322a1b4013080b20720b98
+			# check password first so we can output the warning before postgres
+			# messes it up
+			if [ "${#POSTGRES_PASSWORD}" -ge 100 ]; then
+				cat >&2 <<-'EOWARN'
 
-			WARNING: The supplied POSTGRES_PASSWORD is 100+ characters.
+					WARNING: The supplied POSTGRES_PASSWORD is 100+ characters.
 
-			  This will not work if used via PGPASSWORD with "psql".
+					  This will not work if used via PGPASSWORD with "psql".
 
-			  https://www.postgresql.org/message-id/flat/E1Rqxp2-0004Qt-PL%40wrigleys.postgresql.org (BUG #6412)
-			  https://github.com/docker-library/postgres/issues/507
+					  https://www.postgresql.org/message-id/flat/E1Rqxp2-0004Qt-PL%40wrigleys.postgresql.org (BUG #6412)
+					  https://github.com/docker-library/postgres/issues/507
 
-		EOWARN
-	fi
+				EOWARN
+			fi
+			;;
+	esac
 	if [ -z "$POSTGRES_PASSWORD" ] && [ 'trust' != "$POSTGRES_HOST_AUTH_METHOD" ]; then
 		# The - option suppresses leading tabs but *not* spaces. :)
 		cat >&2 <<-'EOE'
diff --git a/UBI/15/root/requirements.txt b/UBI/15/root/requirements.txt
index 40793364..e67e2293 100644
--- a/UBI/15/root/requirements.txt
+++ b/UBI/15/root/requirements.txt
@@ -29,12 +29,12 @@ barman[azure,cloud,google,snappy]==3.9.0 \
     # via
     #   -r requirements.in
     #   barman
-boto3==1.34.6 \
-    --hash=sha256:1dd6d952a175da45d05cf9eb2b8d5be31f4863cc54444ac27fbcbba966fc4053 \
-    --hash=sha256:ae47b84db94fc3b8e635c6d1b93da85a5fdca961b212260e5dbf5166435fe7b0
-botocore==1.34.6 \
-    --hash=sha256:697000cb756b8f469c10ed0a8a8590f799a90a98b814ebfccd2add4048084ff1 \
-    --hash=sha256:bfe587f48e154a3a836f85af165116b7d5dba9b3b746ce0b94e6d2ed1e06c206
+boto3==1.34.7 \
+    --hash=sha256:04c1cc752946f20513ed70058d4b750b3591c82bb59cbbe26157dbe125e687cc \
+    --hash=sha256:76b62ca46a4632117b4cd31ae56164492e41afb9fec41973688293c536580561
+botocore==1.34.7 \
+    --hash=sha256:85164e924965c850fb02b1edcbef03f61413aff5f0064e660992b8b76c996d0c \
+    --hash=sha256:b145a52b7d1fd4e072bcd692369d4cb77f971651bb0dc2bf38e2b4f9d62973e6
     # via
     #   boto3
     #   s3transfer
diff --git a/UBI/15/root/usr/local/bin/docker-entrypoint.sh b/UBI/15/root/usr/local/bin/docker-entrypoint.sh
index 6d197bc0..6f59993e 100755
--- a/UBI/15/root/usr/local/bin/docker-entrypoint.sh
+++ b/UBI/15/root/usr/local/bin/docker-entrypoint.sh
@@ -103,20 +103,24 @@ docker_init_database_dir() {
 # print large warning if POSTGRES_HOST_AUTH_METHOD is set to 'trust'
 # assumes database is not set up, ie: [ -z "$DATABASE_ALREADY_EXISTS" ]
 docker_verify_minimum_env() {
-	# check password first so we can output the warning before postgres
-	# messes it up
-	if [ "${#POSTGRES_PASSWORD}" -ge 100 ]; then
-		cat >&2 <<-'EOWARN'
+	case "${PG_MAJOR:-}" in
+		12 | 13) # https://github.com/postgres/postgres/commit/67a472d71c98c3d2fa322a1b4013080b20720b98
+			# check password first so we can output the warning before postgres
+			# messes it up
+			if [ "${#POSTGRES_PASSWORD}" -ge 100 ]; then
+				cat >&2 <<-'EOWARN'
 
-			WARNING: The supplied POSTGRES_PASSWORD is 100+ characters.
+					WARNING: The supplied POSTGRES_PASSWORD is 100+ characters.
 
-			  This will not work if used via PGPASSWORD with "psql".
+					  This will not work if used via PGPASSWORD with "psql".
 
-			  https://www.postgresql.org/message-id/flat/E1Rqxp2-0004Qt-PL%40wrigleys.postgresql.org (BUG #6412)
-			  https://github.com/docker-library/postgres/issues/507
+					  https://www.postgresql.org/message-id/flat/E1Rqxp2-0004Qt-PL%40wrigleys.postgresql.org (BUG #6412)
+					  https://github.com/docker-library/postgres/issues/507
 
-		EOWARN
-	fi
+				EOWARN
+			fi
+			;;
+	esac
 	if [ -z "$POSTGRES_PASSWORD" ] && [ 'trust' != "$POSTGRES_HOST_AUTH_METHOD" ]; then
 		# The - option suppresses leading tabs but *not* spaces. :)
 		cat >&2 <<-'EOE'
diff --git a/UBI/16/root/requirements.txt b/UBI/16/root/requirements.txt
index 40793364..e67e2293 100644
--- a/UBI/16/root/requirements.txt
+++ b/UBI/16/root/requirements.txt
@@ -29,12 +29,12 @@ barman[azure,cloud,google,snappy]==3.9.0 \
     # via
     #   -r requirements.in
     #   barman
-boto3==1.34.6 \
-    --hash=sha256:1dd6d952a175da45d05cf9eb2b8d5be31f4863cc54444ac27fbcbba966fc4053 \
-    --hash=sha256:ae47b84db94fc3b8e635c6d1b93da85a5fdca961b212260e5dbf5166435fe7b0
-botocore==1.34.6 \
-    --hash=sha256:697000cb756b8f469c10ed0a8a8590f799a90a98b814ebfccd2add4048084ff1 \
-    --hash=sha256:bfe587f48e154a3a836f85af165116b7d5dba9b3b746ce0b94e6d2ed1e06c206
+boto3==1.34.7 \
+    --hash=sha256:04c1cc752946f20513ed70058d4b750b3591c82bb59cbbe26157dbe125e687cc \
+    --hash=sha256:76b62ca46a4632117b4cd31ae56164492e41afb9fec41973688293c536580561
+botocore==1.34.7 \
+    --hash=sha256:85164e924965c850fb02b1edcbef03f61413aff5f0064e660992b8b76c996d0c \
+    --hash=sha256:b145a52b7d1fd4e072bcd692369d4cb77f971651bb0dc2bf38e2b4f9d62973e6
     # via
     #   boto3
     #   s3transfer
diff --git a/UBI/16/root/usr/local/bin/docker-entrypoint.sh b/UBI/16/root/usr/local/bin/docker-entrypoint.sh
index 6d197bc0..6f59993e 100755
--- a/UBI/16/root/usr/local/bin/docker-entrypoint.sh
+++ b/UBI/16/root/usr/local/bin/docker-entrypoint.sh
@@ -103,20 +103,24 @@ docker_init_database_dir() {
 # print large warning if POSTGRES_HOST_AUTH_METHOD is set to 'trust'
 # assumes database is not set up, ie: [ -z "$DATABASE_ALREADY_EXISTS" ]
 docker_verify_minimum_env() {
-	# check password first so we can output the warning before postgres
-	# messes it up
-	if [ "${#POSTGRES_PASSWORD}" -ge 100 ]; then
-		cat >&2 <<-'EOWARN'
+	case "${PG_MAJOR:-}" in
+		12 | 13) # https://github.com/postgres/postgres/commit/67a472d71c98c3d2fa322a1b4013080b20720b98
+			# check password first so we can output the warning before postgres
+			# messes it up
+			if [ "${#POSTGRES_PASSWORD}" -ge 100 ]; then
+				cat >&2 <<-'EOWARN'
 
-			WARNING: The supplied POSTGRES_PASSWORD is 100+ characters.
+					WARNING: The supplied POSTGRES_PASSWORD is 100+ characters.
 
-			  This will not work if used via PGPASSWORD with "psql".
+					  This will not work if used via PGPASSWORD with "psql".
 
-			  https://www.postgresql.org/message-id/flat/E1Rqxp2-0004Qt-PL%40wrigleys.postgresql.org (BUG #6412)
-			  https://github.com/docker-library/postgres/issues/507
+					  https://www.postgresql.org/message-id/flat/E1Rqxp2-0004Qt-PL%40wrigleys.postgresql.org (BUG #6412)
+					  https://github.com/docker-library/postgres/issues/507
 
-		EOWARN
-	fi
+				EOWARN
+			fi
+			;;
+	esac
 	if [ -z "$POSTGRES_PASSWORD" ] && [ 'trust' != "$POSTGRES_HOST_AUTH_METHOD" ]; then
 		# The - option suppresses leading tabs but *not* spaces. :)
 		cat >&2 <<-'EOE'
diff --git a/UBI/src/root/requirements.txt b/UBI/src/root/requirements.txt
index 40793364..e67e2293 100644
--- a/UBI/src/root/requirements.txt
+++ b/UBI/src/root/requirements.txt
@@ -29,12 +29,12 @@ barman[azure,cloud,google,snappy]==3.9.0 \
     # via
     #   -r requirements.in
     #   barman
-boto3==1.34.6 \
-    --hash=sha256:1dd6d952a175da45d05cf9eb2b8d5be31f4863cc54444ac27fbcbba966fc4053 \
-    --hash=sha256:ae47b84db94fc3b8e635c6d1b93da85a5fdca961b212260e5dbf5166435fe7b0
-botocore==1.34.6 \
-    --hash=sha256:697000cb756b8f469c10ed0a8a8590f799a90a98b814ebfccd2add4048084ff1 \
-    --hash=sha256:bfe587f48e154a3a836f85af165116b7d5dba9b3b746ce0b94e6d2ed1e06c206
+boto3==1.34.7 \
+    --hash=sha256:04c1cc752946f20513ed70058d4b750b3591c82bb59cbbe26157dbe125e687cc \
+    --hash=sha256:76b62ca46a4632117b4cd31ae56164492e41afb9fec41973688293c536580561
+botocore==1.34.7 \
+    --hash=sha256:85164e924965c850fb02b1edcbef03f61413aff5f0064e660992b8b76c996d0c \
+    --hash=sha256:b145a52b7d1fd4e072bcd692369d4cb77f971651bb0dc2bf38e2b4f9d62973e6
     # via
     #   boto3
     #   s3transfer
diff --git a/UBI/src/root/usr/local/bin/docker-entrypoint.sh b/UBI/src/root/usr/local/bin/docker-entrypoint.sh
index 6d197bc0..6f59993e 100755
--- a/UBI/src/root/usr/local/bin/docker-entrypoint.sh
+++ b/UBI/src/root/usr/local/bin/docker-entrypoint.sh
@@ -103,20 +103,24 @@ docker_init_database_dir() {
 # print large warning if POSTGRES_HOST_AUTH_METHOD is set to 'trust'
 # assumes database is not set up, ie: [ -z "$DATABASE_ALREADY_EXISTS" ]
 docker_verify_minimum_env() {
-	# check password first so we can output the warning before postgres
-	# messes it up
-	if [ "${#POSTGRES_PASSWORD}" -ge 100 ]; then
-		cat >&2 <<-'EOWARN'
+	case "${PG_MAJOR:-}" in
+		12 | 13) # https://github.com/postgres/postgres/commit/67a472d71c98c3d2fa322a1b4013080b20720b98
+			# check password first so we can output the warning before postgres
+			# messes it up
+			if [ "${#POSTGRES_PASSWORD}" -ge 100 ]; then
+				cat >&2 <<-'EOWARN'
 
-			WARNING: The supplied POSTGRES_PASSWORD is 100+ characters.
+					WARNING: The supplied POSTGRES_PASSWORD is 100+ characters.
 
-			  This will not work if used via PGPASSWORD with "psql".
+					  This will not work if used via PGPASSWORD with "psql".
 
-			  https://www.postgresql.org/message-id/flat/E1Rqxp2-0004Qt-PL%40wrigleys.postgresql.org (BUG #6412)
-			  https://github.com/docker-library/postgres/issues/507
+					  https://www.postgresql.org/message-id/flat/E1Rqxp2-0004Qt-PL%40wrigleys.postgresql.org (BUG #6412)
+					  https://github.com/docker-library/postgres/issues/507
 
-		EOWARN
-	fi
+				EOWARN
+			fi
+			;;
+	esac
 	if [ -z "$POSTGRES_PASSWORD" ] && [ 'trust' != "$POSTGRES_HOST_AUTH_METHOD" ]; then
 		# The - option suppresses leading tabs but *not* spaces. :)
 		cat >&2 <<-'EOE'