Skip to content

Commit ac744c8

Browse files
amitkumarj441amitkumarj441
authored
Merge pull request #1 from docker-library/master
Updating Fork!!
2 parents 1b305a5 + b7929a5 commit ac744c8

11 files changed

+23
-11
lines changed

‎9.1/docker-entrypoint.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ if [ "$1" = 'postgres' ]; then
1010
chmod 700 "$PGDATA"
1111
chown -R postgres "$PGDATA"
1212

13+
mkdir -p /run/postgresql
1314
chmod g+s /run/postgresql
1415
chown -R postgres /run/postgresql
1516

@@ -42,7 +43,7 @@ if [ "$1" = 'postgres' ]; then
4243
authMethod=trust
4344
fi
4445

45-
{ echo; echo "host all all 0.0.0.0/0 $authMethod"; } >> "$PGDATA/pg_hba.conf"
46+
{ echo; echo "host all all 0.0.0.0/0 $authMethod"; } | gosu postgres tee -a "$PGDATA/pg_hba.conf" > /dev/null
4647

4748
# internal start of server in order to allow set-up using psql-client
4849
# does not listen on external TCP/IP and waits until start finishes

‎9.2/docker-entrypoint.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ if [ "$1" = 'postgres' ]; then
1010
chmod 700 "$PGDATA"
1111
chown -R postgres "$PGDATA"
1212

13+
mkdir -p /run/postgresql
1314
chmod g+s /run/postgresql
1415
chown -R postgres /run/postgresql
1516

@@ -42,7 +43,7 @@ if [ "$1" = 'postgres' ]; then
4243
authMethod=trust
4344
fi
4445

45-
{ echo; echo "host all all 0.0.0.0/0 $authMethod"; } >> "$PGDATA/pg_hba.conf"
46+
{ echo; echo "host all all 0.0.0.0/0 $authMethod"; } | gosu postgres tee -a "$PGDATA/pg_hba.conf" > /dev/null
4647

4748
# internal start of server in order to allow set-up using psql-client
4849
# does not listen on external TCP/IP and waits until start finishes

‎9.3/docker-entrypoint.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ if [ "$1" = 'postgres' ]; then
1010
chmod 700 "$PGDATA"
1111
chown -R postgres "$PGDATA"
1212

13+
mkdir -p /run/postgresql
1314
chmod g+s /run/postgresql
1415
chown -R postgres /run/postgresql
1516

@@ -42,7 +43,7 @@ if [ "$1" = 'postgres' ]; then
4243
authMethod=trust
4344
fi
4445

45-
{ echo; echo "host all all 0.0.0.0/0 $authMethod"; } >> "$PGDATA/pg_hba.conf"
46+
{ echo; echo "host all all 0.0.0.0/0 $authMethod"; } | gosu postgres tee -a "$PGDATA/pg_hba.conf" > /dev/null
4647

4748
# internal start of server in order to allow set-up using psql-client
4849
# does not listen on external TCP/IP and waits until start finishes

‎9.4/docker-entrypoint.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ if [ "$1" = 'postgres' ]; then
1010
chmod 700 "$PGDATA"
1111
chown -R postgres "$PGDATA"
1212

13+
mkdir -p /run/postgresql
1314
chmod g+s /run/postgresql
1415
chown -R postgres /run/postgresql
1516

@@ -42,7 +43,7 @@ if [ "$1" = 'postgres' ]; then
4243
authMethod=trust
4344
fi
4445

45-
{ echo; echo "host all all 0.0.0.0/0 $authMethod"; } >> "$PGDATA/pg_hba.conf"
46+
{ echo; echo "host all all 0.0.0.0/0 $authMethod"; } | gosu postgres tee -a "$PGDATA/pg_hba.conf" > /dev/null
4647

4748
# internal start of server in order to allow set-up using psql-client
4849
# does not listen on external TCP/IP and waits until start finishes

‎9.5/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ RUN mkdir /docker-entrypoint-initdb.d
2828
RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8
2929

3030
ENV PG_MAJOR 9.5
31-
ENV PG_VERSION 9.5.4-1.pgdg80+1
31+
ENV PG_VERSION 9.5.4-1.pgdg80+2
3232

3333
RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main' $PG_MAJOR > /etc/apt/sources.list.d/pgdg.list
3434

‎9.5/docker-entrypoint.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ if [ "$1" = 'postgres' ]; then
1010
chmod 700 "$PGDATA"
1111
chown -R postgres "$PGDATA"
1212

13+
mkdir -p /run/postgresql
1314
chmod g+s /run/postgresql
1415
chown -R postgres /run/postgresql
1516

@@ -42,7 +43,7 @@ if [ "$1" = 'postgres' ]; then
4243
authMethod=trust
4344
fi
4445

45-
{ echo; echo "host all all 0.0.0.0/0 $authMethod"; } >> "$PGDATA/pg_hba.conf"
46+
{ echo; echo "host all all 0.0.0.0/0 $authMethod"; } | gosu postgres tee -a "$PGDATA/pg_hba.conf" > /dev/null
4647

4748
# internal start of server in order to allow set-up using psql-client
4849
# does not listen on external TCP/IP and waits until start finishes

‎9.6/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ RUN mkdir /docker-entrypoint-initdb.d
2828
RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8
2929

3030
ENV PG_MAJOR 9.6
31-
ENV PG_VERSION 9.6~rc1-1.pgdg80+1
31+
ENV PG_VERSION 9.6.0-1.pgdg80+1
3232

3333
RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main' $PG_MAJOR > /etc/apt/sources.list.d/pgdg.list
3434

‎9.6/docker-entrypoint.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ if [ "$1" = 'postgres' ]; then
1010
chmod 700 "$PGDATA"
1111
chown -R postgres "$PGDATA"
1212

13+
mkdir -p /run/postgresql
1314
chmod g+s /run/postgresql
1415
chown -R postgres /run/postgresql
1516

@@ -42,7 +43,7 @@ if [ "$1" = 'postgres' ]; then
4243
authMethod=trust
4344
fi
4445

45-
{ echo; echo "host all all 0.0.0.0/0 $authMethod"; } >> "$PGDATA/pg_hba.conf"
46+
{ echo; echo "host all all 0.0.0.0/0 $authMethod"; } | gosu postgres tee -a "$PGDATA/pg_hba.conf" > /dev/null
4647

4748
# internal start of server in order to allow set-up using psql-client
4849
# does not listen on external TCP/IP and waits until start finishes

‎README.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ The full readme is generated over in [docker-library/docs](https://github.com/do
66

77
See a change merged here that doesn't show up on the Docker Hub yet? Check [the "library/postgres" manifest file in the docker-library/official-images repo](https://github.com/docker-library/official-images/blob/master/library/postgres), especially [PRs with the "library/postgres" label on that repo](https://github.com/docker-library/official-images/labels/library%2Fpostgres). For more information about the official images process, see the [docker-library/official-images readme](https://github.com/docker-library/official-images/blob/master/README.md).
88

9-
[![Travis CI](https://img.shields.io/travis/docker-library/postgres/master.svg)](https://travis-ci.org/docker-library/postgres/branches)
9+
---
10+
11+
- [Travis CI:
12+
![build status badge](https://img.shields.io/travis/docker-library/postgres/master.svg)](https://travis-ci.org/docker-library/postgres/branches)
13+
- [Automated `update.sh`:
14+
![build status badge](https://doi-janky.infosiftr.net/job/update.sh/job/postgres/badge/icon)](https://doi-janky.infosiftr.net/job/update.sh/job/postgres)
1015

1116
<!-- THIS FILE IS GENERATED BY https://github.com/docker-library/docs/blob/master/generate-repo-stub-readme.sh -->

‎docker-entrypoint.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ if [ "$1" = 'postgres' ]; then
1010
chmod 700 "$PGDATA"
1111
chown -R postgres "$PGDATA"
1212

13+
mkdir -p /run/postgresql
1314
chmod g+s /run/postgresql
1415
chown -R postgres /run/postgresql
1516

@@ -42,7 +43,7 @@ if [ "$1" = 'postgres' ]; then
4243
authMethod=trust
4344
fi
4445

45-
{ echo; echo "host all all 0.0.0.0/0 $authMethod"; } >> "$PGDATA/pg_hba.conf"
46+
{ echo; echo "host all all 0.0.0.0/0 $authMethod"; } | gosu postgres tee -a "$PGDATA/pg_hba.conf" > /dev/null
4647

4748
# internal start of server in order to allow set-up using psql-client
4849
# does not listen on external TCP/IP and waits until start finishes

‎generate-stackbrew-library.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
set -eu
33

44
declare -A aliases=(
5-
[9.5]='9 latest'
5+
[9.6]='9 latest'
66
)
77

88
self="$(basename "$BASH_SOURCE")"

0 commit comments

Comments
 (0)