From 3d4e5e9f64124b72aa80f80e2635aff0545988c6 Mon Sep 17 00:00:00 2001 From: Pahaz Blinov Date: Thu, 23 Mar 2017 15:23:22 +0500 Subject: [PATCH] Simplify docker-entrypoint.sh append line --- 9.2/alpine/docker-entrypoint.sh | 5 ++++- 9.2/docker-entrypoint.sh | 5 ++++- 9.3/alpine/docker-entrypoint.sh | 5 ++++- 9.3/docker-entrypoint.sh | 5 ++++- 9.4/alpine/docker-entrypoint.sh | 5 ++++- 9.4/docker-entrypoint.sh | 5 ++++- 9.5/alpine/docker-entrypoint.sh | 5 ++++- 9.5/docker-entrypoint.sh | 5 ++++- 9.6/alpine/docker-entrypoint.sh | 5 ++++- 9.6/docker-entrypoint.sh | 5 ++++- docker-entrypoint.sh | 5 ++++- 11 files changed, 44 insertions(+), 11 deletions(-) diff --git a/9.2/alpine/docker-entrypoint.sh b/9.2/alpine/docker-entrypoint.sh index 0b0af0d7e0..0b30c05c0c 100755 --- a/9.2/alpine/docker-entrypoint.sh +++ b/9.2/alpine/docker-entrypoint.sh @@ -86,7 +86,10 @@ if [ "$1" = 'postgres' ]; then authMethod=trust fi - { echo; echo "host all all all $authMethod"; } | tee -a "$PGDATA/pg_hba.conf" > /dev/null + { + echo + echo "host all all all $authMethod" + } >> "$PGDATA/pg_hba.conf" # internal start of server in order to allow set-up using psql-client # does not listen on external TCP/IP and waits until start finishes diff --git a/9.2/docker-entrypoint.sh b/9.2/docker-entrypoint.sh index 6b18e8b1a5..354aa3405f 100755 --- a/9.2/docker-entrypoint.sh +++ b/9.2/docker-entrypoint.sh @@ -86,7 +86,10 @@ if [ "$1" = 'postgres' ]; then authMethod=trust fi - { echo; echo "host all all all $authMethod"; } | tee -a "$PGDATA/pg_hba.conf" > /dev/null + { + echo + echo "host all all all $authMethod" + } >> "$PGDATA/pg_hba.conf" # internal start of server in order to allow set-up using psql-client # does not listen on external TCP/IP and waits until start finishes diff --git a/9.3/alpine/docker-entrypoint.sh b/9.3/alpine/docker-entrypoint.sh index 0b0af0d7e0..0b30c05c0c 100755 --- a/9.3/alpine/docker-entrypoint.sh +++ b/9.3/alpine/docker-entrypoint.sh @@ -86,7 +86,10 @@ if [ "$1" = 'postgres' ]; then authMethod=trust fi - { echo; echo "host all all all $authMethod"; } | tee -a "$PGDATA/pg_hba.conf" > /dev/null + { + echo + echo "host all all all $authMethod" + } >> "$PGDATA/pg_hba.conf" # internal start of server in order to allow set-up using psql-client # does not listen on external TCP/IP and waits until start finishes diff --git a/9.3/docker-entrypoint.sh b/9.3/docker-entrypoint.sh index 6b18e8b1a5..354aa3405f 100755 --- a/9.3/docker-entrypoint.sh +++ b/9.3/docker-entrypoint.sh @@ -86,7 +86,10 @@ if [ "$1" = 'postgres' ]; then authMethod=trust fi - { echo; echo "host all all all $authMethod"; } | tee -a "$PGDATA/pg_hba.conf" > /dev/null + { + echo + echo "host all all all $authMethod" + } >> "$PGDATA/pg_hba.conf" # internal start of server in order to allow set-up using psql-client # does not listen on external TCP/IP and waits until start finishes diff --git a/9.4/alpine/docker-entrypoint.sh b/9.4/alpine/docker-entrypoint.sh index 0b0af0d7e0..0b30c05c0c 100755 --- a/9.4/alpine/docker-entrypoint.sh +++ b/9.4/alpine/docker-entrypoint.sh @@ -86,7 +86,10 @@ if [ "$1" = 'postgres' ]; then authMethod=trust fi - { echo; echo "host all all all $authMethod"; } | tee -a "$PGDATA/pg_hba.conf" > /dev/null + { + echo + echo "host all all all $authMethod" + } >> "$PGDATA/pg_hba.conf" # internal start of server in order to allow set-up using psql-client # does not listen on external TCP/IP and waits until start finishes diff --git a/9.4/docker-entrypoint.sh b/9.4/docker-entrypoint.sh index 6b18e8b1a5..354aa3405f 100755 --- a/9.4/docker-entrypoint.sh +++ b/9.4/docker-entrypoint.sh @@ -86,7 +86,10 @@ if [ "$1" = 'postgres' ]; then authMethod=trust fi - { echo; echo "host all all all $authMethod"; } | tee -a "$PGDATA/pg_hba.conf" > /dev/null + { + echo + echo "host all all all $authMethod" + } >> "$PGDATA/pg_hba.conf" # internal start of server in order to allow set-up using psql-client # does not listen on external TCP/IP and waits until start finishes diff --git a/9.5/alpine/docker-entrypoint.sh b/9.5/alpine/docker-entrypoint.sh index 0b0af0d7e0..0b30c05c0c 100755 --- a/9.5/alpine/docker-entrypoint.sh +++ b/9.5/alpine/docker-entrypoint.sh @@ -86,7 +86,10 @@ if [ "$1" = 'postgres' ]; then authMethod=trust fi - { echo; echo "host all all all $authMethod"; } | tee -a "$PGDATA/pg_hba.conf" > /dev/null + { + echo + echo "host all all all $authMethod" + } >> "$PGDATA/pg_hba.conf" # internal start of server in order to allow set-up using psql-client # does not listen on external TCP/IP and waits until start finishes diff --git a/9.5/docker-entrypoint.sh b/9.5/docker-entrypoint.sh index 6b18e8b1a5..354aa3405f 100755 --- a/9.5/docker-entrypoint.sh +++ b/9.5/docker-entrypoint.sh @@ -86,7 +86,10 @@ if [ "$1" = 'postgres' ]; then authMethod=trust fi - { echo; echo "host all all all $authMethod"; } | tee -a "$PGDATA/pg_hba.conf" > /dev/null + { + echo + echo "host all all all $authMethod" + } >> "$PGDATA/pg_hba.conf" # internal start of server in order to allow set-up using psql-client # does not listen on external TCP/IP and waits until start finishes diff --git a/9.6/alpine/docker-entrypoint.sh b/9.6/alpine/docker-entrypoint.sh index 0b0af0d7e0..0b30c05c0c 100755 --- a/9.6/alpine/docker-entrypoint.sh +++ b/9.6/alpine/docker-entrypoint.sh @@ -86,7 +86,10 @@ if [ "$1" = 'postgres' ]; then authMethod=trust fi - { echo; echo "host all all all $authMethod"; } | tee -a "$PGDATA/pg_hba.conf" > /dev/null + { + echo + echo "host all all all $authMethod" + } >> "$PGDATA/pg_hba.conf" # internal start of server in order to allow set-up using psql-client # does not listen on external TCP/IP and waits until start finishes diff --git a/9.6/docker-entrypoint.sh b/9.6/docker-entrypoint.sh index 6b18e8b1a5..354aa3405f 100755 --- a/9.6/docker-entrypoint.sh +++ b/9.6/docker-entrypoint.sh @@ -86,7 +86,10 @@ if [ "$1" = 'postgres' ]; then authMethod=trust fi - { echo; echo "host all all all $authMethod"; } | tee -a "$PGDATA/pg_hba.conf" > /dev/null + { + echo + echo "host all all all $authMethod" + } >> "$PGDATA/pg_hba.conf" # internal start of server in order to allow set-up using psql-client # does not listen on external TCP/IP and waits until start finishes diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 6b18e8b1a5..354aa3405f 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -86,7 +86,10 @@ if [ "$1" = 'postgres' ]; then authMethod=trust fi - { echo; echo "host all all all $authMethod"; } | tee -a "$PGDATA/pg_hba.conf" > /dev/null + { + echo + echo "host all all all $authMethod" + } >> "$PGDATA/pg_hba.conf" # internal start of server in order to allow set-up using psql-client # does not listen on external TCP/IP and waits until start finishes