Skip to content

Commit 04f2884

Browse files
authored
Merge pull request #694 from infosiftr/ls
Fix silently skipped init scripts
2 parents 0a0f644 + 33bccfc commit 04f2884

11 files changed

+44
-0
lines changed

10/alpine/docker-entrypoint.sh

+4
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,10 @@ _main() {
284284
# only run initialization on an empty data directory
285285
if [ -z "$DATABASE_ALREADY_EXISTS" ]; then
286286
docker_verify_minimum_env
287+
288+
# check dir permissions to reduce likelihood of half-initialized database
289+
ls /docker-entrypoint-initdb.d/ > /dev/null
290+
287291
docker_init_database_dir
288292
pg_setup_hba_conf
289293

10/docker-entrypoint.sh

+4
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,10 @@ _main() {
284284
# only run initialization on an empty data directory
285285
if [ -z "$DATABASE_ALREADY_EXISTS" ]; then
286286
docker_verify_minimum_env
287+
288+
# check dir permissions to reduce likelihood of half-initialized database
289+
ls /docker-entrypoint-initdb.d/ > /dev/null
290+
287291
docker_init_database_dir
288292
pg_setup_hba_conf
289293

11/alpine/docker-entrypoint.sh

+4
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,10 @@ _main() {
284284
# only run initialization on an empty data directory
285285
if [ -z "$DATABASE_ALREADY_EXISTS" ]; then
286286
docker_verify_minimum_env
287+
288+
# check dir permissions to reduce likelihood of half-initialized database
289+
ls /docker-entrypoint-initdb.d/ > /dev/null
290+
287291
docker_init_database_dir
288292
pg_setup_hba_conf
289293

11/docker-entrypoint.sh

+4
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,10 @@ _main() {
284284
# only run initialization on an empty data directory
285285
if [ -z "$DATABASE_ALREADY_EXISTS" ]; then
286286
docker_verify_minimum_env
287+
288+
# check dir permissions to reduce likelihood of half-initialized database
289+
ls /docker-entrypoint-initdb.d/ > /dev/null
290+
287291
docker_init_database_dir
288292
pg_setup_hba_conf
289293

12/alpine/docker-entrypoint.sh

+4
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,10 @@ _main() {
284284
# only run initialization on an empty data directory
285285
if [ -z "$DATABASE_ALREADY_EXISTS" ]; then
286286
docker_verify_minimum_env
287+
288+
# check dir permissions to reduce likelihood of half-initialized database
289+
ls /docker-entrypoint-initdb.d/ > /dev/null
290+
287291
docker_init_database_dir
288292
pg_setup_hba_conf
289293

12/docker-entrypoint.sh

+4
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,10 @@ _main() {
284284
# only run initialization on an empty data directory
285285
if [ -z "$DATABASE_ALREADY_EXISTS" ]; then
286286
docker_verify_minimum_env
287+
288+
# check dir permissions to reduce likelihood of half-initialized database
289+
ls /docker-entrypoint-initdb.d/ > /dev/null
290+
287291
docker_init_database_dir
288292
pg_setup_hba_conf
289293

9.5/alpine/docker-entrypoint.sh

+4
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,10 @@ _main() {
284284
# only run initialization on an empty data directory
285285
if [ -z "$DATABASE_ALREADY_EXISTS" ]; then
286286
docker_verify_minimum_env
287+
288+
# check dir permissions to reduce likelihood of half-initialized database
289+
ls /docker-entrypoint-initdb.d/ > /dev/null
290+
287291
docker_init_database_dir
288292
pg_setup_hba_conf
289293

9.5/docker-entrypoint.sh

+4
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,10 @@ _main() {
284284
# only run initialization on an empty data directory
285285
if [ -z "$DATABASE_ALREADY_EXISTS" ]; then
286286
docker_verify_minimum_env
287+
288+
# check dir permissions to reduce likelihood of half-initialized database
289+
ls /docker-entrypoint-initdb.d/ > /dev/null
290+
287291
docker_init_database_dir
288292
pg_setup_hba_conf
289293

9.6/alpine/docker-entrypoint.sh

+4
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,10 @@ _main() {
284284
# only run initialization on an empty data directory
285285
if [ -z "$DATABASE_ALREADY_EXISTS" ]; then
286286
docker_verify_minimum_env
287+
288+
# check dir permissions to reduce likelihood of half-initialized database
289+
ls /docker-entrypoint-initdb.d/ > /dev/null
290+
287291
docker_init_database_dir
288292
pg_setup_hba_conf
289293

9.6/docker-entrypoint.sh

+4
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,10 @@ _main() {
284284
# only run initialization on an empty data directory
285285
if [ -z "$DATABASE_ALREADY_EXISTS" ]; then
286286
docker_verify_minimum_env
287+
288+
# check dir permissions to reduce likelihood of half-initialized database
289+
ls /docker-entrypoint-initdb.d/ > /dev/null
290+
287291
docker_init_database_dir
288292
pg_setup_hba_conf
289293

docker-entrypoint.sh

+4
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,10 @@ _main() {
284284
# only run initialization on an empty data directory
285285
if [ -z "$DATABASE_ALREADY_EXISTS" ]; then
286286
docker_verify_minimum_env
287+
288+
# check dir permissions to reduce likelihood of half-initialized database
289+
ls /docker-entrypoint-initdb.d/ > /dev/null
290+
287291
docker_init_database_dir
288292
pg_setup_hba_conf
289293

0 commit comments

Comments
 (0)