From 6032cd32d17d6f85238e0bcbf64723646f6feec0 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 2 Mar 2016 13:12:21 -0800 Subject: [PATCH] Refactor entrypoint to allow "sql.gz" files as well --- 9.1/docker-entrypoint.sh | 20 ++++++++++---------- 9.2/docker-entrypoint.sh | 20 ++++++++++---------- 9.3/docker-entrypoint.sh | 20 ++++++++++---------- 9.4/docker-entrypoint.sh | 20 ++++++++++---------- 9.5/docker-entrypoint.sh | 20 ++++++++++---------- docker-entrypoint.sh | 20 ++++++++++---------- 6 files changed, 60 insertions(+), 60 deletions(-) diff --git a/9.1/docker-entrypoint.sh b/9.1/docker-entrypoint.sh index 95ec772380..27b3be45dc 100755 --- a/9.1/docker-entrypoint.sh +++ b/9.1/docker-entrypoint.sh @@ -55,8 +55,10 @@ if [ "$1" = 'postgres' ]; then : ${POSTGRES_DB:=$POSTGRES_USER} export POSTGRES_USER POSTGRES_DB + psql=( psql -v ON_ERROR_STOP=1 ) + if [ "$POSTGRES_DB" != 'postgres' ]; then - psql --username postgres <<-EOSQL + "${psql[@]}" --username postgres <<-EOSQL CREATE DATABASE "$POSTGRES_DB" ; EOSQL echo @@ -67,22 +69,20 @@ if [ "$1" = 'postgres' ]; then else op='CREATE' fi - - psql --username postgres <<-EOSQL + "${psql[@]}" --username postgres <<-EOSQL $op USER "$POSTGRES_USER" WITH SUPERUSER $pass ; EOSQL echo + psql+=( --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" ) + echo for f in /docker-entrypoint-initdb.d/*; do case "$f" in - *.sh) echo "$0: running $f"; . "$f" ;; - *.sql) - echo "$0: running $f"; - psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" < "$f" - echo - ;; - *) echo "$0: ignoring $f" ;; + *.sh) echo "$0: running $f"; . "$f" ;; + *.sql) echo "$0: running $f"; "${psql[@]}" < "$f"; echo ;; + *.sql.gz) echo "$0: running $f"; gunzip -c "$f" | "${psql[@]}"; echo ;; + *) echo "$0: ignoring $f" ;; esac echo done diff --git a/9.2/docker-entrypoint.sh b/9.2/docker-entrypoint.sh index 95ec772380..27b3be45dc 100755 --- a/9.2/docker-entrypoint.sh +++ b/9.2/docker-entrypoint.sh @@ -55,8 +55,10 @@ if [ "$1" = 'postgres' ]; then : ${POSTGRES_DB:=$POSTGRES_USER} export POSTGRES_USER POSTGRES_DB + psql=( psql -v ON_ERROR_STOP=1 ) + if [ "$POSTGRES_DB" != 'postgres' ]; then - psql --username postgres <<-EOSQL + "${psql[@]}" --username postgres <<-EOSQL CREATE DATABASE "$POSTGRES_DB" ; EOSQL echo @@ -67,22 +69,20 @@ if [ "$1" = 'postgres' ]; then else op='CREATE' fi - - psql --username postgres <<-EOSQL + "${psql[@]}" --username postgres <<-EOSQL $op USER "$POSTGRES_USER" WITH SUPERUSER $pass ; EOSQL echo + psql+=( --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" ) + echo for f in /docker-entrypoint-initdb.d/*; do case "$f" in - *.sh) echo "$0: running $f"; . "$f" ;; - *.sql) - echo "$0: running $f"; - psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" < "$f" - echo - ;; - *) echo "$0: ignoring $f" ;; + *.sh) echo "$0: running $f"; . "$f" ;; + *.sql) echo "$0: running $f"; "${psql[@]}" < "$f"; echo ;; + *.sql.gz) echo "$0: running $f"; gunzip -c "$f" | "${psql[@]}"; echo ;; + *) echo "$0: ignoring $f" ;; esac echo done diff --git a/9.3/docker-entrypoint.sh b/9.3/docker-entrypoint.sh index 95ec772380..27b3be45dc 100755 --- a/9.3/docker-entrypoint.sh +++ b/9.3/docker-entrypoint.sh @@ -55,8 +55,10 @@ if [ "$1" = 'postgres' ]; then : ${POSTGRES_DB:=$POSTGRES_USER} export POSTGRES_USER POSTGRES_DB + psql=( psql -v ON_ERROR_STOP=1 ) + if [ "$POSTGRES_DB" != 'postgres' ]; then - psql --username postgres <<-EOSQL + "${psql[@]}" --username postgres <<-EOSQL CREATE DATABASE "$POSTGRES_DB" ; EOSQL echo @@ -67,22 +69,20 @@ if [ "$1" = 'postgres' ]; then else op='CREATE' fi - - psql --username postgres <<-EOSQL + "${psql[@]}" --username postgres <<-EOSQL $op USER "$POSTGRES_USER" WITH SUPERUSER $pass ; EOSQL echo + psql+=( --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" ) + echo for f in /docker-entrypoint-initdb.d/*; do case "$f" in - *.sh) echo "$0: running $f"; . "$f" ;; - *.sql) - echo "$0: running $f"; - psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" < "$f" - echo - ;; - *) echo "$0: ignoring $f" ;; + *.sh) echo "$0: running $f"; . "$f" ;; + *.sql) echo "$0: running $f"; "${psql[@]}" < "$f"; echo ;; + *.sql.gz) echo "$0: running $f"; gunzip -c "$f" | "${psql[@]}"; echo ;; + *) echo "$0: ignoring $f" ;; esac echo done diff --git a/9.4/docker-entrypoint.sh b/9.4/docker-entrypoint.sh index 95ec772380..27b3be45dc 100755 --- a/9.4/docker-entrypoint.sh +++ b/9.4/docker-entrypoint.sh @@ -55,8 +55,10 @@ if [ "$1" = 'postgres' ]; then : ${POSTGRES_DB:=$POSTGRES_USER} export POSTGRES_USER POSTGRES_DB + psql=( psql -v ON_ERROR_STOP=1 ) + if [ "$POSTGRES_DB" != 'postgres' ]; then - psql --username postgres <<-EOSQL + "${psql[@]}" --username postgres <<-EOSQL CREATE DATABASE "$POSTGRES_DB" ; EOSQL echo @@ -67,22 +69,20 @@ if [ "$1" = 'postgres' ]; then else op='CREATE' fi - - psql --username postgres <<-EOSQL + "${psql[@]}" --username postgres <<-EOSQL $op USER "$POSTGRES_USER" WITH SUPERUSER $pass ; EOSQL echo + psql+=( --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" ) + echo for f in /docker-entrypoint-initdb.d/*; do case "$f" in - *.sh) echo "$0: running $f"; . "$f" ;; - *.sql) - echo "$0: running $f"; - psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" < "$f" - echo - ;; - *) echo "$0: ignoring $f" ;; + *.sh) echo "$0: running $f"; . "$f" ;; + *.sql) echo "$0: running $f"; "${psql[@]}" < "$f"; echo ;; + *.sql.gz) echo "$0: running $f"; gunzip -c "$f" | "${psql[@]}"; echo ;; + *) echo "$0: ignoring $f" ;; esac echo done diff --git a/9.5/docker-entrypoint.sh b/9.5/docker-entrypoint.sh index 95ec772380..27b3be45dc 100755 --- a/9.5/docker-entrypoint.sh +++ b/9.5/docker-entrypoint.sh @@ -55,8 +55,10 @@ if [ "$1" = 'postgres' ]; then : ${POSTGRES_DB:=$POSTGRES_USER} export POSTGRES_USER POSTGRES_DB + psql=( psql -v ON_ERROR_STOP=1 ) + if [ "$POSTGRES_DB" != 'postgres' ]; then - psql --username postgres <<-EOSQL + "${psql[@]}" --username postgres <<-EOSQL CREATE DATABASE "$POSTGRES_DB" ; EOSQL echo @@ -67,22 +69,20 @@ if [ "$1" = 'postgres' ]; then else op='CREATE' fi - - psql --username postgres <<-EOSQL + "${psql[@]}" --username postgres <<-EOSQL $op USER "$POSTGRES_USER" WITH SUPERUSER $pass ; EOSQL echo + psql+=( --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" ) + echo for f in /docker-entrypoint-initdb.d/*; do case "$f" in - *.sh) echo "$0: running $f"; . "$f" ;; - *.sql) - echo "$0: running $f"; - psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" < "$f" - echo - ;; - *) echo "$0: ignoring $f" ;; + *.sh) echo "$0: running $f"; . "$f" ;; + *.sql) echo "$0: running $f"; "${psql[@]}" < "$f"; echo ;; + *.sql.gz) echo "$0: running $f"; gunzip -c "$f" | "${psql[@]}"; echo ;; + *) echo "$0: ignoring $f" ;; esac echo done diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 95ec772380..27b3be45dc 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -55,8 +55,10 @@ if [ "$1" = 'postgres' ]; then : ${POSTGRES_DB:=$POSTGRES_USER} export POSTGRES_USER POSTGRES_DB + psql=( psql -v ON_ERROR_STOP=1 ) + if [ "$POSTGRES_DB" != 'postgres' ]; then - psql --username postgres <<-EOSQL + "${psql[@]}" --username postgres <<-EOSQL CREATE DATABASE "$POSTGRES_DB" ; EOSQL echo @@ -67,22 +69,20 @@ if [ "$1" = 'postgres' ]; then else op='CREATE' fi - - psql --username postgres <<-EOSQL + "${psql[@]}" --username postgres <<-EOSQL $op USER "$POSTGRES_USER" WITH SUPERUSER $pass ; EOSQL echo + psql+=( --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" ) + echo for f in /docker-entrypoint-initdb.d/*; do case "$f" in - *.sh) echo "$0: running $f"; . "$f" ;; - *.sql) - echo "$0: running $f"; - psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" < "$f" - echo - ;; - *) echo "$0: ignoring $f" ;; + *.sh) echo "$0: running $f"; . "$f" ;; + *.sql) echo "$0: running $f"; "${psql[@]}" < "$f"; echo ;; + *.sql.gz) echo "$0: running $f"; gunzip -c "$f" | "${psql[@]}"; echo ;; + *) echo "$0: ignoring $f" ;; esac echo done