docker-images/postgres
1
0
Fork 0
mirror of https://github.com/docker-library/postgres.git synced 2025-07-28 10:42:06 +03:00
Code Activity

Minor formatting/output changes

Browse Source
This commit is contained in:
Tianon Gravi
2014-12-24 16:43:17 -07:00
parent ae81e91148
commit c9d9f4c1a0
14 changed files with 63 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
8.4/Dockerfile
View File

@ -42,7 +42,7 @@ ENV PATH /usr/lib/postgresql/$PG_MAJOR/bin:$PATH
ENV PGDATA /var/lib/postgresql/data ENV PGDATA /var/lib/postgresql/data
VOLUME /var/lib/postgresql/data VOLUME /var/lib/postgresql/data
COPY ./docker-entrypoint.sh / COPY docker-entrypoint.sh /
ENTRYPOINT ["/docker-entrypoint.sh"] ENTRYPOINT ["/docker-entrypoint.sh"]

13
8.4/docker-entrypoint.sh
View File

@ -15,7 +15,7 @@ if [ "$1" = 'postgres' ]; then
pass="PASSWORD '$POSTGRES_PASSWORD'" pass="PASSWORD '$POSTGRES_PASSWORD'"
authMethod=md5 authMethod=md5
else else
# The - option suppresses leading tabs but *not* spaces. :) # The - option suppresses leading tabs but *not* spaces. :)
cat >&2 <<-'EOWARN' cat >&2 <<-'EOWARN'
**************************************************** ****************************************************
WARNING: No password has been set for the database. WARNING: No password has been set for the database.
@ -33,14 +33,17 @@ if [ "$1" = 'postgres' ]; then
op='ALTER' op='ALTER'
else else
op='CREATE' op='CREATE'
gosu postgres postgres --single -E <<-EOSQL gosu postgres postgres --single -jE <<-EOSQL
CREATE DATABASE "$POSTGRES_USER" CREATE DATABASE "$POSTGRES_USER" ;
EOSQL EOSQL
echo
fi fi
gosu postgres postgres --single <<-EOSQL gosu postgres postgres --single -jE <<-EOSQL
$op USER "$POSTGRES_USER" WITH SUPERUSER $pass $op USER "$POSTGRES_USER" WITH SUPERUSER $pass ;
EOSQL EOSQL
echo
{ echo; echo "host all \"$POSTGRES_USER\" 0.0.0.0/0 $authMethod"; } >> "$PGDATA"/pg_hba.conf { echo; echo "host all \"$POSTGRES_USER\" 0.0.0.0/0 $authMethod"; } >> "$PGDATA"/pg_hba.conf
if [ -d /docker-entrypoint-initdb.d ]; then if [ -d /docker-entrypoint-initdb.d ]; then

2
9.0/Dockerfile
View File

@ -42,7 +42,7 @@ ENV PATH /usr/lib/postgresql/$PG_MAJOR/bin:$PATH
ENV PGDATA /var/lib/postgresql/data ENV PGDATA /var/lib/postgresql/data
VOLUME /var/lib/postgresql/data VOLUME /var/lib/postgresql/data
COPY ./docker-entrypoint.sh / COPY docker-entrypoint.sh /
ENTRYPOINT ["/docker-entrypoint.sh"] ENTRYPOINT ["/docker-entrypoint.sh"]

13
9.0/docker-entrypoint.sh
View File

@ -15,7 +15,7 @@ if [ "$1" = 'postgres' ]; then
pass="PASSWORD '$POSTGRES_PASSWORD'" pass="PASSWORD '$POSTGRES_PASSWORD'"
authMethod=md5 authMethod=md5
else else
# The - option suppresses leading tabs but *not* spaces. :) # The - option suppresses leading tabs but *not* spaces. :)
cat >&2 <<-'EOWARN' cat >&2 <<-'EOWARN'
**************************************************** ****************************************************
WARNING: No password has been set for the database. WARNING: No password has been set for the database.
@ -33,14 +33,17 @@ if [ "$1" = 'postgres' ]; then
op='ALTER' op='ALTER'
else else
op='CREATE' op='CREATE'
gosu postgres postgres --single -E <<-EOSQL gosu postgres postgres --single -jE <<-EOSQL
CREATE DATABASE "$POSTGRES_USER" CREATE DATABASE "$POSTGRES_USER" ;
EOSQL EOSQL
echo
fi fi
gosu postgres postgres --single <<-EOSQL gosu postgres postgres --single -jE <<-EOSQL
$op USER "$POSTGRES_USER" WITH SUPERUSER $pass $op USER "$POSTGRES_USER" WITH SUPERUSER $pass ;
EOSQL EOSQL
echo
{ echo; echo "host all \"$POSTGRES_USER\" 0.0.0.0/0 $authMethod"; } >> "$PGDATA"/pg_hba.conf { echo; echo "host all \"$POSTGRES_USER\" 0.0.0.0/0 $authMethod"; } >> "$PGDATA"/pg_hba.conf
if [ -d /docker-entrypoint-initdb.d ]; then if [ -d /docker-entrypoint-initdb.d ]; then

2
9.1/Dockerfile
View File

@ -42,7 +42,7 @@ ENV PATH /usr/lib/postgresql/$PG_MAJOR/bin:$PATH
ENV PGDATA /var/lib/postgresql/data ENV PGDATA /var/lib/postgresql/data
VOLUME /var/lib/postgresql/data VOLUME /var/lib/postgresql/data
COPY ./docker-entrypoint.sh / COPY docker-entrypoint.sh /
ENTRYPOINT ["/docker-entrypoint.sh"] ENTRYPOINT ["/docker-entrypoint.sh"]

13
9.1/docker-entrypoint.sh
View File

@ -15,7 +15,7 @@ if [ "$1" = 'postgres' ]; then
pass="PASSWORD '$POSTGRES_PASSWORD'" pass="PASSWORD '$POSTGRES_PASSWORD'"
authMethod=md5 authMethod=md5
else else
# The - option suppresses leading tabs but *not* spaces. :) # The - option suppresses leading tabs but *not* spaces. :)
cat >&2 <<-'EOWARN' cat >&2 <<-'EOWARN'
**************************************************** ****************************************************
WARNING: No password has been set for the database. WARNING: No password has been set for the database.
@ -33,14 +33,17 @@ if [ "$1" = 'postgres' ]; then
op='ALTER' op='ALTER'
else else
op='CREATE' op='CREATE'
gosu postgres postgres --single -E <<-EOSQL gosu postgres postgres --single -jE <<-EOSQL
CREATE DATABASE "$POSTGRES_USER" CREATE DATABASE "$POSTGRES_USER" ;
EOSQL EOSQL
echo
fi fi
gosu postgres postgres --single <<-EOSQL gosu postgres postgres --single -jE <<-EOSQL
$op USER "$POSTGRES_USER" WITH SUPERUSER $pass $op USER "$POSTGRES_USER" WITH SUPERUSER $pass ;
EOSQL EOSQL
echo
{ echo; echo "host all \"$POSTGRES_USER\" 0.0.0.0/0 $authMethod"; } >> "$PGDATA"/pg_hba.conf { echo; echo "host all \"$POSTGRES_USER\" 0.0.0.0/0 $authMethod"; } >> "$PGDATA"/pg_hba.conf
if [ -d /docker-entrypoint-initdb.d ]; then if [ -d /docker-entrypoint-initdb.d ]; then

2
9.2/Dockerfile
View File

@ -42,7 +42,7 @@ ENV PATH /usr/lib/postgresql/$PG_MAJOR/bin:$PATH
ENV PGDATA /var/lib/postgresql/data ENV PGDATA /var/lib/postgresql/data
VOLUME /var/lib/postgresql/data VOLUME /var/lib/postgresql/data
COPY ./docker-entrypoint.sh / COPY docker-entrypoint.sh /
ENTRYPOINT ["/docker-entrypoint.sh"] ENTRYPOINT ["/docker-entrypoint.sh"]

13
9.2/docker-entrypoint.sh
View File

@ -15,7 +15,7 @@ if [ "$1" = 'postgres' ]; then
pass="PASSWORD '$POSTGRES_PASSWORD'" pass="PASSWORD '$POSTGRES_PASSWORD'"
authMethod=md5 authMethod=md5
else else
# The - option suppresses leading tabs but *not* spaces. :) # The - option suppresses leading tabs but *not* spaces. :)
cat >&2 <<-'EOWARN' cat >&2 <<-'EOWARN'
**************************************************** ****************************************************
WARNING: No password has been set for the database. WARNING: No password has been set for the database.
@ -33,14 +33,17 @@ if [ "$1" = 'postgres' ]; then
op='ALTER' op='ALTER'
else else
op='CREATE' op='CREATE'
gosu postgres postgres --single -E <<-EOSQL gosu postgres postgres --single -jE <<-EOSQL
CREATE DATABASE "$POSTGRES_USER" CREATE DATABASE "$POSTGRES_USER" ;
EOSQL EOSQL
echo
fi fi
gosu postgres postgres --single <<-EOSQL gosu postgres postgres --single -jE <<-EOSQL
$op USER "$POSTGRES_USER" WITH SUPERUSER $pass $op USER "$POSTGRES_USER" WITH SUPERUSER $pass ;
EOSQL EOSQL
echo
{ echo; echo "host all \"$POSTGRES_USER\" 0.0.0.0/0 $authMethod"; } >> "$PGDATA"/pg_hba.conf { echo; echo "host all \"$POSTGRES_USER\" 0.0.0.0/0 $authMethod"; } >> "$PGDATA"/pg_hba.conf
if [ -d /docker-entrypoint-initdb.d ]; then if [ -d /docker-entrypoint-initdb.d ]; then

2
9.3/Dockerfile
View File

@ -42,7 +42,7 @@ ENV PATH /usr/lib/postgresql/$PG_MAJOR/bin:$PATH
ENV PGDATA /var/lib/postgresql/data ENV PGDATA /var/lib/postgresql/data
VOLUME /var/lib/postgresql/data VOLUME /var/lib/postgresql/data
COPY ./docker-entrypoint.sh / COPY docker-entrypoint.sh /
ENTRYPOINT ["/docker-entrypoint.sh"] ENTRYPOINT ["/docker-entrypoint.sh"]

13
9.3/docker-entrypoint.sh
View File

@ -15,7 +15,7 @@ if [ "$1" = 'postgres' ]; then
pass="PASSWORD '$POSTGRES_PASSWORD'" pass="PASSWORD '$POSTGRES_PASSWORD'"
authMethod=md5 authMethod=md5
else else
# The - option suppresses leading tabs but *not* spaces. :) # The - option suppresses leading tabs but *not* spaces. :)
cat >&2 <<-'EOWARN' cat >&2 <<-'EOWARN'
**************************************************** ****************************************************
WARNING: No password has been set for the database. WARNING: No password has been set for the database.
@ -33,14 +33,17 @@ if [ "$1" = 'postgres' ]; then
op='ALTER' op='ALTER'
else else
op='CREATE' op='CREATE'
gosu postgres postgres --single -E <<-EOSQL gosu postgres postgres --single -jE <<-EOSQL
CREATE DATABASE "$POSTGRES_USER" CREATE DATABASE "$POSTGRES_USER" ;
EOSQL EOSQL
echo
fi fi
gosu postgres postgres --single <<-EOSQL gosu postgres postgres --single -jE <<-EOSQL
$op USER "$POSTGRES_USER" WITH SUPERUSER $pass $op USER "$POSTGRES_USER" WITH SUPERUSER $pass ;
EOSQL EOSQL
echo
{ echo; echo "host all \"$POSTGRES_USER\" 0.0.0.0/0 $authMethod"; } >> "$PGDATA"/pg_hba.conf { echo; echo "host all \"$POSTGRES_USER\" 0.0.0.0/0 $authMethod"; } >> "$PGDATA"/pg_hba.conf
if [ -d /docker-entrypoint-initdb.d ]; then if [ -d /docker-entrypoint-initdb.d ]; then

2
9.4/Dockerfile
View File

@ -42,7 +42,7 @@ ENV PATH /usr/lib/postgresql/$PG_MAJOR/bin:$PATH
ENV PGDATA /var/lib/postgresql/data ENV PGDATA /var/lib/postgresql/data
VOLUME /var/lib/postgresql/data VOLUME /var/lib/postgresql/data
COPY ./docker-entrypoint.sh / COPY docker-entrypoint.sh /
ENTRYPOINT ["/docker-entrypoint.sh"] ENTRYPOINT ["/docker-entrypoint.sh"]

13
9.4/docker-entrypoint.sh
View File

@ -15,7 +15,7 @@ if [ "$1" = 'postgres' ]; then
pass="PASSWORD '$POSTGRES_PASSWORD'" pass="PASSWORD '$POSTGRES_PASSWORD'"
authMethod=md5 authMethod=md5
else else
# The - option suppresses leading tabs but *not* spaces. :) # The - option suppresses leading tabs but *not* spaces. :)
cat >&2 <<-'EOWARN' cat >&2 <<-'EOWARN'
**************************************************** ****************************************************
WARNING: No password has been set for the database. WARNING: No password has been set for the database.
@ -33,14 +33,17 @@ if [ "$1" = 'postgres' ]; then
op='ALTER' op='ALTER'
else else
op='CREATE' op='CREATE'
gosu postgres postgres --single -E <<-EOSQL gosu postgres postgres --single -jE <<-EOSQL
CREATE DATABASE "$POSTGRES_USER" CREATE DATABASE "$POSTGRES_USER" ;
EOSQL EOSQL
echo
fi fi
gosu postgres postgres --single <<-EOSQL gosu postgres postgres --single -jE <<-EOSQL
$op USER "$POSTGRES_USER" WITH SUPERUSER $pass $op USER "$POSTGRES_USER" WITH SUPERUSER $pass ;
EOSQL EOSQL
echo
{ echo; echo "host all \"$POSTGRES_USER\" 0.0.0.0/0 $authMethod"; } >> "$PGDATA"/pg_hba.conf { echo; echo "host all \"$POSTGRES_USER\" 0.0.0.0/0 $authMethod"; } >> "$PGDATA"/pg_hba.conf
if [ -d /docker-entrypoint-initdb.d ]; then if [ -d /docker-entrypoint-initdb.d ]; then

2
Dockerfile.template
View File

@ -42,7 +42,7 @@ ENV PATH /usr/lib/postgresql/$PG_MAJOR/bin:$PATH
ENV PGDATA /var/lib/postgresql/data ENV PGDATA /var/lib/postgresql/data
VOLUME /var/lib/postgresql/data VOLUME /var/lib/postgresql/data
COPY ./docker-entrypoint.sh / COPY docker-entrypoint.sh /
ENTRYPOINT ["/docker-entrypoint.sh"] ENTRYPOINT ["/docker-entrypoint.sh"]

13
docker-entrypoint.sh
View File

@ -15,7 +15,7 @@ if [ "$1" = 'postgres' ]; then
pass="PASSWORD '$POSTGRES_PASSWORD'" pass="PASSWORD '$POSTGRES_PASSWORD'"
authMethod=md5 authMethod=md5
else else
# The - option suppresses leading tabs but *not* spaces. :) # The - option suppresses leading tabs but *not* spaces. :)
cat >&2 <<-'EOWARN' cat >&2 <<-'EOWARN'
**************************************************** ****************************************************
WARNING: No password has been set for the database. WARNING: No password has been set for the database.
@ -33,14 +33,17 @@ if [ "$1" = 'postgres' ]; then
op='ALTER' op='ALTER'
else else
op='CREATE' op='CREATE'
gosu postgres postgres --single -E <<-EOSQL gosu postgres postgres --single -jE <<-EOSQL
CREATE DATABASE "$POSTGRES_USER" CREATE DATABASE "$POSTGRES_USER" ;
EOSQL EOSQL
echo
fi fi
gosu postgres postgres --single <<-EOSQL gosu postgres postgres --single -jE <<-EOSQL
$op USER "$POSTGRES_USER" WITH SUPERUSER $pass $op USER "$POSTGRES_USER" WITH SUPERUSER $pass ;
EOSQL EOSQL
echo
{ echo; echo "host all \"$POSTGRES_USER\" 0.0.0.0/0 $authMethod"; } >> "$PGDATA"/pg_hba.conf { echo; echo "host all \"$POSTGRES_USER\" 0.0.0.0/0 $authMethod"; } >> "$PGDATA"/pg_hba.conf
if [ -d /docker-entrypoint-initdb.d ]; then if [ -d /docker-entrypoint-initdb.d ]; then