Skip to content

Commit ebecea2

Browse files
yosifkityosifkit
committed
Merge pull request docker-library#49 from rothgar/postgres_db_var
Added POSTGRES_DB variable to optionally specify DB name
2 parents 57de8c8 + 796f3f1 commit ebecea2

File tree

7 files changed

+70
-35
lines changed

7 files changed

+70
-35
lines changed

‎8.4/docker-entrypoint.sh

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,21 @@ if [ "$1" = 'postgres' ]; then
3535
fi
3636

3737
: ${POSTGRES_USER:=postgres}
38-
if [ "$POSTGRES_USER" = 'postgres' ]; then
39-
op='ALTER'
40-
else
41-
op='CREATE'
38+
: ${POSTGRES_DB:=$POSTGRES_USER}
39+
40+
if [ "$POSTGRES_DB" != 'postgres' ]; then
4241
gosu postgres postgres --single -jE <<-EOSQL
43-
CREATE DATABASE "$POSTGRES_USER" ;
42+
CREATE DATABASE "$POSTGRES_DB" ;
4443
EOSQL
4544
echo
4645
fi
4746

47+
if [ "$POSTGRES_USER" = 'postgres' ]; then
48+
op='ALTER'
49+
else
50+
op='CREATE'
51+
fi
52+
4853
gosu postgres postgres --single -jE <<-EOSQL
4954
$op USER "$POSTGRES_USER" WITH SUPERUSER $pass ;
5055
EOSQL

‎9.0/docker-entrypoint.sh

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,21 @@ if [ "$1" = 'postgres' ]; then
3535
fi
3636

3737
: ${POSTGRES_USER:=postgres}
38-
if [ "$POSTGRES_USER" = 'postgres' ]; then
39-
op='ALTER'
40-
else
41-
op='CREATE'
38+
: ${POSTGRES_DB:=$POSTGRES_USER}
39+
40+
if [ "$POSTGRES_DB" != 'postgres' ]; then
4241
gosu postgres postgres --single -jE <<-EOSQL
43-
CREATE DATABASE "$POSTGRES_USER" ;
42+
CREATE DATABASE "$POSTGRES_DB" ;
4443
EOSQL
4544
echo
4645
fi
4746

47+
if [ "$POSTGRES_USER" = 'postgres' ]; then
48+
op='ALTER'
49+
else
50+
op='CREATE'
51+
fi
52+
4853
gosu postgres postgres --single -jE <<-EOSQL
4954
$op USER "$POSTGRES_USER" WITH SUPERUSER $pass ;
5055
EOSQL

‎9.1/docker-entrypoint.sh

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,21 @@ if [ "$1" = 'postgres' ]; then
3535
fi
3636

3737
: ${POSTGRES_USER:=postgres}
38-
if [ "$POSTGRES_USER" = 'postgres' ]; then
39-
op='ALTER'
40-
else
41-
op='CREATE'
38+
: ${POSTGRES_DB:=$POSTGRES_USER}
39+
40+
if [ "$POSTGRES_DB" != 'postgres' ]; then
4241
gosu postgres postgres --single -jE <<-EOSQL
43-
CREATE DATABASE "$POSTGRES_USER" ;
42+
CREATE DATABASE "$POSTGRES_DB" ;
4443
EOSQL
4544
echo
4645
fi
4746

47+
if [ "$POSTGRES_USER" = 'postgres' ]; then
48+
op='ALTER'
49+
else
50+
op='CREATE'
51+
fi
52+
4853
gosu postgres postgres --single -jE <<-EOSQL
4954
$op USER "$POSTGRES_USER" WITH SUPERUSER $pass ;
5055
EOSQL

‎9.2/docker-entrypoint.sh

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,21 @@ if [ "$1" = 'postgres' ]; then
3535
fi
3636

3737
: ${POSTGRES_USER:=postgres}
38-
if [ "$POSTGRES_USER" = 'postgres' ]; then
39-
op='ALTER'
40-
else
41-
op='CREATE'
38+
: ${POSTGRES_DB:=$POSTGRES_USER}
39+
40+
if [ "$POSTGRES_DB" != 'postgres' ]; then
4241
gosu postgres postgres --single -jE <<-EOSQL
43-
CREATE DATABASE "$POSTGRES_USER" ;
42+
CREATE DATABASE "$POSTGRES_DB" ;
4443
EOSQL
4544
echo
4645
fi
4746

47+
if [ "$POSTGRES_USER" = 'postgres' ]; then
48+
op='ALTER'
49+
else
50+
op='CREATE'
51+
fi
52+
4853
gosu postgres postgres --single -jE <<-EOSQL
4954
$op USER "$POSTGRES_USER" WITH SUPERUSER $pass ;
5055
EOSQL

‎9.3/docker-entrypoint.sh

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,21 @@ if [ "$1" = 'postgres' ]; then
3535
fi
3636

3737
: ${POSTGRES_USER:=postgres}
38-
if [ "$POSTGRES_USER" = 'postgres' ]; then
39-
op='ALTER'
40-
else
41-
op='CREATE'
38+
: ${POSTGRES_DB:=$POSTGRES_USER}
39+
40+
if [ "$POSTGRES_DB" != 'postgres' ]; then
4241
gosu postgres postgres --single -jE <<-EOSQL
43-
CREATE DATABASE "$POSTGRES_USER" ;
42+
CREATE DATABASE "$POSTGRES_DB" ;
4443
EOSQL
4544
echo
4645
fi
4746

47+
if [ "$POSTGRES_USER" = 'postgres' ]; then
48+
op='ALTER'
49+
else
50+
op='CREATE'
51+
fi
52+
4853
gosu postgres postgres --single -jE <<-EOSQL
4954
$op USER "$POSTGRES_USER" WITH SUPERUSER $pass ;
5055
EOSQL

‎9.4/docker-entrypoint.sh

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,21 @@ if [ "$1" = 'postgres' ]; then
3535
fi
3636

3737
: ${POSTGRES_USER:=postgres}
38-
if [ "$POSTGRES_USER" = 'postgres' ]; then
39-
op='ALTER'
40-
else
41-
op='CREATE'
38+
: ${POSTGRES_DB:=$POSTGRES_USER}
39+
40+
if [ "$POSTGRES_DB" != 'postgres' ]; then
4241
gosu postgres postgres --single -jE <<-EOSQL
43-
CREATE DATABASE "$POSTGRES_USER" ;
42+
CREATE DATABASE "$POSTGRES_DB" ;
4443
EOSQL
4544
echo
4645
fi
4746

47+
if [ "$POSTGRES_USER" = 'postgres' ]; then
48+
op='ALTER'
49+
else
50+
op='CREATE'
51+
fi
52+
4853
gosu postgres postgres --single -jE <<-EOSQL
4954
$op USER "$POSTGRES_USER" WITH SUPERUSER $pass ;
5055
EOSQL

‎docker-entrypoint.sh

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,21 @@ if [ "$1" = 'postgres' ]; then
3535
fi
3636

3737
: ${POSTGRES_USER:=postgres}
38-
if [ "$POSTGRES_USER" = 'postgres' ]; then
39-
op='ALTER'
40-
else
41-
op='CREATE'
38+
: ${POSTGRES_DB:=$POSTGRES_USER}
39+
40+
if [ "$POSTGRES_DB" != 'postgres' ]; then
4241
gosu postgres postgres --single -jE <<-EOSQL
43-
CREATE DATABASE "$POSTGRES_USER" ;
42+
CREATE DATABASE "$POSTGRES_DB" ;
4443
EOSQL
4544
echo
4645
fi
4746

47+
if [ "$POSTGRES_USER" = 'postgres' ]; then
48+
op='ALTER'
49+
else
50+
op='CREATE'
51+
fi
52+
4853
gosu postgres postgres --single -jE <<-EOSQL
4954
$op USER "$POSTGRES_USER" WITH SUPERUSER $pass ;
5055
EOSQL

0 commit comments

Comments
 (0)