Skip to content

Commit 6032cd3

Browse files
tianontianon
committed
Refactor entrypoint to allow "sql.gz" files as well
1 parent 09b09ed commit 6032cd3

6 files changed

+60
-60
lines changed

‎9.1/docker-entrypoint.sh

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,10 @@ if [ "$1" = 'postgres' ]; then
5555
: ${POSTGRES_DB:=$POSTGRES_USER}
5656
export POSTGRES_USER POSTGRES_DB
5757

58+
psql=( psql -v ON_ERROR_STOP=1 )
59+
5860
if [ "$POSTGRES_DB" != 'postgres' ]; then
59-
psql --username postgres <<-EOSQL
61+
"${psql[@]}" --username postgres <<-EOSQL
6062
CREATE DATABASE "$POSTGRES_DB" ;
6163
EOSQL
6264
echo
@@ -67,22 +69,20 @@ if [ "$1" = 'postgres' ]; then
6769
else
6870
op='CREATE'
6971
fi
70-
71-
psql --username postgres <<-EOSQL
72+
"${psql[@]}" --username postgres <<-EOSQL
7273
$op USER "$POSTGRES_USER" WITH SUPERUSER $pass ;
7374
EOSQL
7475
echo
7576

77+
psql+=( --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" )
78+
7679
echo
7780
for f in /docker-entrypoint-initdb.d/*; do
7881
case "$f" in
79-
*.sh) echo "$0: running $f"; . "$f" ;;
80-
*.sql)
81-
echo "$0: running $f";
82-
psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" < "$f"
83-
echo
84-
;;
85-
*) echo "$0: ignoring $f" ;;
82+
*.sh) echo "$0: running $f"; . "$f" ;;
83+
*.sql) echo "$0: running $f"; "${psql[@]}" < "$f"; echo ;;
84+
*.sql.gz) echo "$0: running $f"; gunzip -c "$f" | "${psql[@]}"; echo ;;
85+
*) echo "$0: ignoring $f" ;;
8686
esac
8787
echo
8888
done

‎9.2/docker-entrypoint.sh

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,10 @@ if [ "$1" = 'postgres' ]; then
5555
: ${POSTGRES_DB:=$POSTGRES_USER}
5656
export POSTGRES_USER POSTGRES_DB
5757

58+
psql=( psql -v ON_ERROR_STOP=1 )
59+
5860
if [ "$POSTGRES_DB" != 'postgres' ]; then
59-
psql --username postgres <<-EOSQL
61+
"${psql[@]}" --username postgres <<-EOSQL
6062
CREATE DATABASE "$POSTGRES_DB" ;
6163
EOSQL
6264
echo
@@ -67,22 +69,20 @@ if [ "$1" = 'postgres' ]; then
6769
else
6870
op='CREATE'
6971
fi
70-
71-
psql --username postgres <<-EOSQL
72+
"${psql[@]}" --username postgres <<-EOSQL
7273
$op USER "$POSTGRES_USER" WITH SUPERUSER $pass ;
7374
EOSQL
7475
echo
7576

77+
psql+=( --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" )
78+
7679
echo
7780
for f in /docker-entrypoint-initdb.d/*; do
7881
case "$f" in
79-
*.sh) echo "$0: running $f"; . "$f" ;;
80-
*.sql)
81-
echo "$0: running $f";
82-
psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" < "$f"
83-
echo
84-
;;
85-
*) echo "$0: ignoring $f" ;;
82+
*.sh) echo "$0: running $f"; . "$f" ;;
83+
*.sql) echo "$0: running $f"; "${psql[@]}" < "$f"; echo ;;
84+
*.sql.gz) echo "$0: running $f"; gunzip -c "$f" | "${psql[@]}"; echo ;;
85+
*) echo "$0: ignoring $f" ;;
8686
esac
8787
echo
8888
done

‎9.3/docker-entrypoint.sh

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,10 @@ if [ "$1" = 'postgres' ]; then
5555
: ${POSTGRES_DB:=$POSTGRES_USER}
5656
export POSTGRES_USER POSTGRES_DB
5757

58+
psql=( psql -v ON_ERROR_STOP=1 )
59+
5860
if [ "$POSTGRES_DB" != 'postgres' ]; then
59-
psql --username postgres <<-EOSQL
61+
"${psql[@]}" --username postgres <<-EOSQL
6062
CREATE DATABASE "$POSTGRES_DB" ;
6163
EOSQL
6264
echo
@@ -67,22 +69,20 @@ if [ "$1" = 'postgres' ]; then
6769
else
6870
op='CREATE'
6971
fi
70-
71-
psql --username postgres <<-EOSQL
72+
"${psql[@]}" --username postgres <<-EOSQL
7273
$op USER "$POSTGRES_USER" WITH SUPERUSER $pass ;
7374
EOSQL
7475
echo
7576

77+
psql+=( --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" )
78+
7679
echo
7780
for f in /docker-entrypoint-initdb.d/*; do
7881
case "$f" in
79-
*.sh) echo "$0: running $f"; . "$f" ;;
80-
*.sql)
81-
echo "$0: running $f";
82-
psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" < "$f"
83-
echo
84-
;;
85-
*) echo "$0: ignoring $f" ;;
82+
*.sh) echo "$0: running $f"; . "$f" ;;
83+
*.sql) echo "$0: running $f"; "${psql[@]}" < "$f"; echo ;;
84+
*.sql.gz) echo "$0: running $f"; gunzip -c "$f" | "${psql[@]}"; echo ;;
85+
*) echo "$0: ignoring $f" ;;
8686
esac
8787
echo
8888
done

‎9.4/docker-entrypoint.sh

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,10 @@ if [ "$1" = 'postgres' ]; then
5555
: ${POSTGRES_DB:=$POSTGRES_USER}
5656
export POSTGRES_USER POSTGRES_DB
5757

58+
psql=( psql -v ON_ERROR_STOP=1 )
59+
5860
if [ "$POSTGRES_DB" != 'postgres' ]; then
59-
psql --username postgres <<-EOSQL
61+
"${psql[@]}" --username postgres <<-EOSQL
6062
CREATE DATABASE "$POSTGRES_DB" ;
6163
EOSQL
6264
echo
@@ -67,22 +69,20 @@ if [ "$1" = 'postgres' ]; then
6769
else
6870
op='CREATE'
6971
fi
70-
71-
psql --username postgres <<-EOSQL
72+
"${psql[@]}" --username postgres <<-EOSQL
7273
$op USER "$POSTGRES_USER" WITH SUPERUSER $pass ;
7374
EOSQL
7475
echo
7576

77+
psql+=( --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" )
78+
7679
echo
7780
for f in /docker-entrypoint-initdb.d/*; do
7881
case "$f" in
79-
*.sh) echo "$0: running $f"; . "$f" ;;
80-
*.sql)
81-
echo "$0: running $f";
82-
psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" < "$f"
83-
echo
84-
;;
85-
*) echo "$0: ignoring $f" ;;
82+
*.sh) echo "$0: running $f"; . "$f" ;;
83+
*.sql) echo "$0: running $f"; "${psql[@]}" < "$f"; echo ;;
84+
*.sql.gz) echo "$0: running $f"; gunzip -c "$f" | "${psql[@]}"; echo ;;
85+
*) echo "$0: ignoring $f" ;;
8686
esac
8787
echo
8888
done

‎9.5/docker-entrypoint.sh

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,10 @@ if [ "$1" = 'postgres' ]; then
5555
: ${POSTGRES_DB:=$POSTGRES_USER}
5656
export POSTGRES_USER POSTGRES_DB
5757

58+
psql=( psql -v ON_ERROR_STOP=1 )
59+
5860
if [ "$POSTGRES_DB" != 'postgres' ]; then
59-
psql --username postgres <<-EOSQL
61+
"${psql[@]}" --username postgres <<-EOSQL
6062
CREATE DATABASE "$POSTGRES_DB" ;
6163
EOSQL
6264
echo
@@ -67,22 +69,20 @@ if [ "$1" = 'postgres' ]; then
6769
else
6870
op='CREATE'
6971
fi
70-
71-
psql --username postgres <<-EOSQL
72+
"${psql[@]}" --username postgres <<-EOSQL
7273
$op USER "$POSTGRES_USER" WITH SUPERUSER $pass ;
7374
EOSQL
7475
echo
7576

77+
psql+=( --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" )
78+
7679
echo
7780
for f in /docker-entrypoint-initdb.d/*; do
7881
case "$f" in
79-
*.sh) echo "$0: running $f"; . "$f" ;;
80-
*.sql)
81-
echo "$0: running $f";
82-
psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" < "$f"
83-
echo
84-
;;
85-
*) echo "$0: ignoring $f" ;;
82+
*.sh) echo "$0: running $f"; . "$f" ;;
83+
*.sql) echo "$0: running $f"; "${psql[@]}" < "$f"; echo ;;
84+
*.sql.gz) echo "$0: running $f"; gunzip -c "$f" | "${psql[@]}"; echo ;;
85+
*) echo "$0: ignoring $f" ;;
8686
esac
8787
echo
8888
done

‎docker-entrypoint.sh

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,10 @@ if [ "$1" = 'postgres' ]; then
5555
: ${POSTGRES_DB:=$POSTGRES_USER}
5656
export POSTGRES_USER POSTGRES_DB
5757

58+
psql=( psql -v ON_ERROR_STOP=1 )
59+
5860
if [ "$POSTGRES_DB" != 'postgres' ]; then
59-
psql --username postgres <<-EOSQL
61+
"${psql[@]}" --username postgres <<-EOSQL
6062
CREATE DATABASE "$POSTGRES_DB" ;
6163
EOSQL
6264
echo
@@ -67,22 +69,20 @@ if [ "$1" = 'postgres' ]; then
6769
else
6870
op='CREATE'
6971
fi
70-
71-
psql --username postgres <<-EOSQL
72+
"${psql[@]}" --username postgres <<-EOSQL
7273
$op USER "$POSTGRES_USER" WITH SUPERUSER $pass ;
7374
EOSQL
7475
echo
7576

77+
psql+=( --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" )
78+
7679
echo
7780
for f in /docker-entrypoint-initdb.d/*; do
7881
case "$f" in
79-
*.sh) echo "$0: running $f"; . "$f" ;;
80-
*.sql)
81-
echo "$0: running $f";
82-
psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" < "$f"
83-
echo
84-
;;
85-
*) echo "$0: ignoring $f" ;;
82+
*.sh) echo "$0: running $f"; . "$f" ;;
83+
*.sql) echo "$0: running $f"; "${psql[@]}" < "$f"; echo ;;
84+
*.sql.gz) echo "$0: running $f"; gunzip -c "$f" | "${psql[@]}"; echo ;;
85+
*) echo "$0: ignoring $f" ;;
8686
esac
8787
echo
8888
done

0 commit comments

Comments
 (0)