docker-images/postgres
1
0
Fork 0
mirror of https://github.com/docker-library/postgres.git synced 2025-07-29 21:41:20 +03:00
Code Activity

Refactor entrypoint to allow "sql.gz" files as well

Browse Source
This commit is contained in:
Tianon Gravi
2016-03-02 13:12:21 -08:00
parent 09b09edbea
commit 6032cd32d1
6 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
9.1/docker-entrypoint.sh
View File

@ -55,8 +55,10 @@ if [ "$1" = 'postgres' ]; then
: ${POSTGRES_DB:=$POSTGRES_USER} : ${POSTGRES_DB:=$POSTGRES_USER}
export POSTGRES_USER POSTGRES_DB export POSTGRES_USER POSTGRES_DB
psql=( psql -v ON_ERROR_STOP=1 )
if [ "$POSTGRES_DB" != 'postgres' ]; then if [ "$POSTGRES_DB" != 'postgres' ]; then
psql --username postgres <<-EOSQL "${psql[@]}" --username postgres <<-EOSQL
CREATE DATABASE "$POSTGRES_DB" ; CREATE DATABASE "$POSTGRES_DB" ;
EOSQL EOSQL
echo echo
@ -67,22 +69,20 @@ if [ "$1" = 'postgres' ]; then
else else
op='CREATE' op='CREATE'
fi fi
"${psql[@]}" --username postgres <<-EOSQL
psql --username postgres <<-EOSQL
$op USER "$POSTGRES_USER" WITH SUPERUSER $pass ; $op USER "$POSTGRES_USER" WITH SUPERUSER $pass ;
EOSQL EOSQL
echo echo
psql+=( --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" )
echo echo
for f in /docker-entrypoint-initdb.d/*; do for f in /docker-entrypoint-initdb.d/*; do
case "$f" in case "$f" in
*.sh) echo "$0: running $f"; . "$f" ;; *.sh) echo "$0: running $f"; . "$f" ;;
*.sql) *.sql) echo "$0: running $f"; "${psql[@]}" < "$f"; echo ;;
echo "$0: running $f"; *.sql.gz) echo "$0: running $f"; gunzip -c "$f" | "${psql[@]}"; echo ;;
psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" < "$f" *) echo "$0: ignoring $f" ;;
echo
;;
*) echo "$0: ignoring $f" ;;
esac esac
echo echo
done done

20
9.2/docker-entrypoint.sh
View File

@ -55,8 +55,10 @@ if [ "$1" = 'postgres' ]; then
: ${POSTGRES_DB:=$POSTGRES_USER} : ${POSTGRES_DB:=$POSTGRES_USER}
export POSTGRES_USER POSTGRES_DB export POSTGRES_USER POSTGRES_DB
psql=( psql -v ON_ERROR_STOP=1 )
if [ "$POSTGRES_DB" != 'postgres' ]; then if [ "$POSTGRES_DB" != 'postgres' ]; then
psql --username postgres <<-EOSQL "${psql[@]}" --username postgres <<-EOSQL
CREATE DATABASE "$POSTGRES_DB" ; CREATE DATABASE "$POSTGRES_DB" ;
EOSQL EOSQL
echo echo
@ -67,22 +69,20 @@ if [ "$1" = 'postgres' ]; then
else else
op='CREATE' op='CREATE'
fi fi
"${psql[@]}" --username postgres <<-EOSQL
psql --username postgres <<-EOSQL
$op USER "$POSTGRES_USER" WITH SUPERUSER $pass ; $op USER "$POSTGRES_USER" WITH SUPERUSER $pass ;
EOSQL EOSQL
echo echo
psql+=( --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" )
echo echo
for f in /docker-entrypoint-initdb.d/*; do for f in /docker-entrypoint-initdb.d/*; do
case "$f" in case "$f" in
*.sh) echo "$0: running $f"; . "$f" ;; *.sh) echo "$0: running $f"; . "$f" ;;
*.sql) *.sql) echo "$0: running $f"; "${psql[@]}" < "$f"; echo ;;
echo "$0: running $f"; *.sql.gz) echo "$0: running $f"; gunzip -c "$f" | "${psql[@]}"; echo ;;
psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" < "$f" *) echo "$0: ignoring $f" ;;
echo
;;
*) echo "$0: ignoring $f" ;;
esac esac
echo echo
done done

20
9.3/docker-entrypoint.sh
View File

@ -55,8 +55,10 @@ if [ "$1" = 'postgres' ]; then
: ${POSTGRES_DB:=$POSTGRES_USER} : ${POSTGRES_DB:=$POSTGRES_USER}
export POSTGRES_USER POSTGRES_DB export POSTGRES_USER POSTGRES_DB
psql=( psql -v ON_ERROR_STOP=1 )
if [ "$POSTGRES_DB" != 'postgres' ]; then if [ "$POSTGRES_DB" != 'postgres' ]; then
psql --username postgres <<-EOSQL "${psql[@]}" --username postgres <<-EOSQL
CREATE DATABASE "$POSTGRES_DB" ; CREATE DATABASE "$POSTGRES_DB" ;
EOSQL EOSQL
echo echo
@ -67,22 +69,20 @@ if [ "$1" = 'postgres' ]; then
else else
op='CREATE' op='CREATE'
fi fi
"${psql[@]}" --username postgres <<-EOSQL
psql --username postgres <<-EOSQL
$op USER "$POSTGRES_USER" WITH SUPERUSER $pass ; $op USER "$POSTGRES_USER" WITH SUPERUSER $pass ;
EOSQL EOSQL
echo echo
psql+=( --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" )
echo echo
for f in /docker-entrypoint-initdb.d/*; do for f in /docker-entrypoint-initdb.d/*; do
case "$f" in case "$f" in
*.sh) echo "$0: running $f"; . "$f" ;; *.sh) echo "$0: running $f"; . "$f" ;;
*.sql) *.sql) echo "$0: running $f"; "${psql[@]}" < "$f"; echo ;;
echo "$0: running $f"; *.sql.gz) echo "$0: running $f"; gunzip -c "$f" | "${psql[@]}"; echo ;;
psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" < "$f" *) echo "$0: ignoring $f" ;;
echo
;;
*) echo "$0: ignoring $f" ;;
esac esac
echo echo
done done

20
9.4/docker-entrypoint.sh
View File

@ -55,8 +55,10 @@ if [ "$1" = 'postgres' ]; then
: ${POSTGRES_DB:=$POSTGRES_USER} : ${POSTGRES_DB:=$POSTGRES_USER}
export POSTGRES_USER POSTGRES_DB export POSTGRES_USER POSTGRES_DB
psql=( psql -v ON_ERROR_STOP=1 )
if [ "$POSTGRES_DB" != 'postgres' ]; then if [ "$POSTGRES_DB" != 'postgres' ]; then
psql --username postgres <<-EOSQL "${psql[@]}" --username postgres <<-EOSQL
CREATE DATABASE "$POSTGRES_DB" ; CREATE DATABASE "$POSTGRES_DB" ;
EOSQL EOSQL
echo echo
@ -67,22 +69,20 @@ if [ "$1" = 'postgres' ]; then
else else
op='CREATE' op='CREATE'
fi fi
"${psql[@]}" --username postgres <<-EOSQL
psql --username postgres <<-EOSQL
$op USER "$POSTGRES_USER" WITH SUPERUSER $pass ; $op USER "$POSTGRES_USER" WITH SUPERUSER $pass ;
EOSQL EOSQL
echo echo
psql+=( --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" )
echo echo
for f in /docker-entrypoint-initdb.d/*; do for f in /docker-entrypoint-initdb.d/*; do
case "$f" in case "$f" in
*.sh) echo "$0: running $f"; . "$f" ;; *.sh) echo "$0: running $f"; . "$f" ;;
*.sql) *.sql) echo "$0: running $f"; "${psql[@]}" < "$f"; echo ;;
echo "$0: running $f"; *.sql.gz) echo "$0: running $f"; gunzip -c "$f" | "${psql[@]}"; echo ;;
psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" < "$f" *) echo "$0: ignoring $f" ;;
echo
;;
*) echo "$0: ignoring $f" ;;
esac esac
echo echo
done done

20
9.5/docker-entrypoint.sh
View File

@ -55,8 +55,10 @@ if [ "$1" = 'postgres' ]; then
: ${POSTGRES_DB:=$POSTGRES_USER} : ${POSTGRES_DB:=$POSTGRES_USER}
export POSTGRES_USER POSTGRES_DB export POSTGRES_USER POSTGRES_DB
psql=( psql -v ON_ERROR_STOP=1 )
if [ "$POSTGRES_DB" != 'postgres' ]; then if [ "$POSTGRES_DB" != 'postgres' ]; then
psql --username postgres <<-EOSQL "${psql[@]}" --username postgres <<-EOSQL
CREATE DATABASE "$POSTGRES_DB" ; CREATE DATABASE "$POSTGRES_DB" ;
EOSQL EOSQL
echo echo
@ -67,22 +69,20 @@ if [ "$1" = 'postgres' ]; then
else else
op='CREATE' op='CREATE'
fi fi
"${psql[@]}" --username postgres <<-EOSQL
psql --username postgres <<-EOSQL
$op USER "$POSTGRES_USER" WITH SUPERUSER $pass ; $op USER "$POSTGRES_USER" WITH SUPERUSER $pass ;
EOSQL EOSQL
echo echo
psql+=( --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" )
echo echo
for f in /docker-entrypoint-initdb.d/*; do for f in /docker-entrypoint-initdb.d/*; do
case "$f" in case "$f" in
*.sh) echo "$0: running $f"; . "$f" ;; *.sh) echo "$0: running $f"; . "$f" ;;
*.sql) *.sql) echo "$0: running $f"; "${psql[@]}" < "$f"; echo ;;
echo "$0: running $f"; *.sql.gz) echo "$0: running $f"; gunzip -c "$f" | "${psql[@]}"; echo ;;
psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" < "$f" *) echo "$0: ignoring $f" ;;
echo
;;
*) echo "$0: ignoring $f" ;;
esac esac
echo echo
done done

20
docker-entrypoint.sh
View File

@ -55,8 +55,10 @@ if [ "$1" = 'postgres' ]; then
: ${POSTGRES_DB:=$POSTGRES_USER} : ${POSTGRES_DB:=$POSTGRES_USER}
export POSTGRES_USER POSTGRES_DB export POSTGRES_USER POSTGRES_DB
psql=( psql -v ON_ERROR_STOP=1 )
if [ "$POSTGRES_DB" != 'postgres' ]; then if [ "$POSTGRES_DB" != 'postgres' ]; then
psql --username postgres <<-EOSQL "${psql[@]}" --username postgres <<-EOSQL
CREATE DATABASE "$POSTGRES_DB" ; CREATE DATABASE "$POSTGRES_DB" ;
EOSQL EOSQL
echo echo
@ -67,22 +69,20 @@ if [ "$1" = 'postgres' ]; then
else else
op='CREATE' op='CREATE'
fi fi
"${psql[@]}" --username postgres <<-EOSQL
psql --username postgres <<-EOSQL
$op USER "$POSTGRES_USER" WITH SUPERUSER $pass ; $op USER "$POSTGRES_USER" WITH SUPERUSER $pass ;
EOSQL EOSQL
echo echo
psql+=( --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" )
echo echo
for f in /docker-entrypoint-initdb.d/*; do for f in /docker-entrypoint-initdb.d/*; do
case "$f" in case "$f" in
*.sh) echo "$0: running $f"; . "$f" ;; *.sh) echo "$0: running $f"; . "$f" ;;
*.sql) *.sql) echo "$0: running $f"; "${psql[@]}" < "$f"; echo ;;
echo "$0: running $f"; *.sql.gz) echo "$0: running $f"; gunzip -c "$f" | "${psql[@]}"; echo ;;
psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" < "$f" *) echo "$0: ignoring $f" ;;
echo
;;
*) echo "$0: ignoring $f" ;;
esac esac
echo echo
done done