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

Merge pull request #72 from bakavic/fix-gce

Browse Source 
Check that vol actually contains DB files, as opposed to a non-empty dir.
This commit is contained in:
Tianon Gravi
2015-07-20 11:09:28 -07:00
parent 403dc53653 9c7bb73021
commit 28b8bd7456
7 changed files with 105 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
9.0/docker-entrypoint.sh
View File

@ -2,17 +2,19 @@
set -e set -e
if [ "$1" = 'postgres' ]; then if [ "$1" = 'postgres' ]; then
mkdir -p "$PGDATA"
chown -R postgres "$PGDATA" chown -R postgres "$PGDATA"
chmod g+s /run/postgresql chmod g+s /run/postgresql
chown -R postgres:postgres /run/postgresql chown -R postgres:postgres /run/postgresql
if [ -z "$(ls -A "$PGDATA")" ]; then # look specifically for PG_VERSION, as it is expected in the DB dir
if [ -s "$PGDATA/PG_VERSION" ]; then
gosu postgres initdb gosu postgres initdb
sed -ri "s/^#(listen_addresses\s*=\s*)\S+/\1'*'/" "$PGDATA"/postgresql.conf sed -ri "s/^#(listen_addresses\s*=\s*)\S+/\1'*'/" "$PGDATA"/postgresql.conf
# check password first so we can ouptut the warning before postgres # check password first so we can output the warning before postgres
# messes it up # messes it up
if [ "$POSTGRES_PASSWORD" ]; then if [ "$POSTGRES_PASSWORD" ]; then
pass="PASSWORD '$POSTGRES_PASSWORD'" pass="PASSWORD '$POSTGRES_PASSWORD'"

6
9.1/docker-entrypoint.sh
View File

@ -2,17 +2,19 @@
set -e set -e
if [ "$1" = 'postgres' ]; then if [ "$1" = 'postgres' ]; then
mkdir -p "$PGDATA"
chown -R postgres "$PGDATA" chown -R postgres "$PGDATA"
chmod g+s /run/postgresql chmod g+s /run/postgresql
chown -R postgres:postgres /run/postgresql chown -R postgres:postgres /run/postgresql
if [ -z "$(ls -A "$PGDATA")" ]; then # look specifically for PG_VERSION, as it is expected in the DB dir
if [ -s "$PGDATA/PG_VERSION" ]; then
gosu postgres initdb gosu postgres initdb
sed -ri "s/^#(listen_addresses\s*=\s*)\S+/\1'*'/" "$PGDATA"/postgresql.conf sed -ri "s/^#(listen_addresses\s*=\s*)\S+/\1'*'/" "$PGDATA"/postgresql.conf
# check password first so we can ouptut the warning before postgres # check password first so we can output the warning before postgres
# messes it up # messes it up
if [ "$POSTGRES_PASSWORD" ]; then if [ "$POSTGRES_PASSWORD" ]; then
pass="PASSWORD '$POSTGRES_PASSWORD'" pass="PASSWORD '$POSTGRES_PASSWORD'"

6
9.2/docker-entrypoint.sh
View File

@ -2,17 +2,19 @@
set -e set -e
if [ "$1" = 'postgres' ]; then if [ "$1" = 'postgres' ]; then
mkdir -p "$PGDATA"
chown -R postgres "$PGDATA" chown -R postgres "$PGDATA"
chmod g+s /run/postgresql chmod g+s /run/postgresql
chown -R postgres:postgres /run/postgresql chown -R postgres:postgres /run/postgresql
if [ -z "$(ls -A "$PGDATA")" ]; then # look specifically for PG_VERSION, as it is expected in the DB dir
if [ -s "$PGDATA/PG_VERSION" ]; then
gosu postgres initdb gosu postgres initdb
sed -ri "s/^#(listen_addresses\s*=\s*)\S+/\1'*'/" "$PGDATA"/postgresql.conf sed -ri "s/^#(listen_addresses\s*=\s*)\S+/\1'*'/" "$PGDATA"/postgresql.conf
# check password first so we can ouptut the warning before postgres # check password first so we can output the warning before postgres
# messes it up # messes it up
if [ "$POSTGRES_PASSWORD" ]; then if [ "$POSTGRES_PASSWORD" ]; then
pass="PASSWORD '$POSTGRES_PASSWORD'" pass="PASSWORD '$POSTGRES_PASSWORD'"

6
9.3/docker-entrypoint.sh
View File

@ -2,17 +2,19 @@
set -e set -e
if [ "$1" = 'postgres' ]; then if [ "$1" = 'postgres' ]; then
mkdir -p "$PGDATA"
chown -R postgres "$PGDATA" chown -R postgres "$PGDATA"
chmod g+s /run/postgresql chmod g+s /run/postgresql
chown -R postgres:postgres /run/postgresql chown -R postgres:postgres /run/postgresql
if [ -z "$(ls -A "$PGDATA")" ]; then # look specifically for PG_VERSION, as it is expected in the DB dir
if [ -s "$PGDATA/PG_VERSION" ]; then
gosu postgres initdb gosu postgres initdb
sed -ri "s/^#(listen_addresses\s*=\s*)\S+/\1'*'/" "$PGDATA"/postgresql.conf sed -ri "s/^#(listen_addresses\s*=\s*)\S+/\1'*'/" "$PGDATA"/postgresql.conf
# check password first so we can ouptut the warning before postgres # check password first so we can output the warning before postgres
# messes it up # messes it up
if [ "$POSTGRES_PASSWORD" ]; then if [ "$POSTGRES_PASSWORD" ]; then
pass="PASSWORD '$POSTGRES_PASSWORD'" pass="PASSWORD '$POSTGRES_PASSWORD'"

6
9.4/docker-entrypoint.sh
View File

@ -2,17 +2,19 @@
set -e set -e
if [ "$1" = 'postgres' ]; then if [ "$1" = 'postgres' ]; then
mkdir -p "$PGDATA"
chown -R postgres "$PGDATA" chown -R postgres "$PGDATA"
chmod g+s /run/postgresql chmod g+s /run/postgresql
chown -R postgres:postgres /run/postgresql chown -R postgres:postgres /run/postgresql
if [ -z "$(ls -A "$PGDATA")" ]; then # look specifically for PG_VERSION, as it is expected in the DB dir
if [ -s "$PGDATA/PG_VERSION" ]; then
gosu postgres initdb gosu postgres initdb
sed -ri "s/^#(listen_addresses\s*=\s*)\S+/\1'*'/" "$PGDATA"/postgresql.conf sed -ri "s/^#(listen_addresses\s*=\s*)\S+/\1'*'/" "$PGDATA"/postgresql.conf
# check password first so we can ouptut the warning before postgres # check password first so we can output the warning before postgres
# messes it up # messes it up
if [ "$POSTGRES_PASSWORD" ]; then if [ "$POSTGRES_PASSWORD" ]; then
pass="PASSWORD '$POSTGRES_PASSWORD'" pass="PASSWORD '$POSTGRES_PASSWORD'"

6
9.5/docker-entrypoint.sh
View File

@ -2,17 +2,19 @@
set -e set -e
if [ "$1" = 'postgres' ]; then if [ "$1" = 'postgres' ]; then
mkdir -p "$PGDATA"
chown -R postgres "$PGDATA" chown -R postgres "$PGDATA"
chmod g+s /run/postgresql chmod g+s /run/postgresql
chown -R postgres:postgres /run/postgresql chown -R postgres:postgres /run/postgresql
if [ -z "$(ls -A "$PGDATA")" ]; then # look specifically for PG_VERSION, as it is expected in the DB dir
if [ -s "$PGDATA/PG_VERSION" ]; then
gosu postgres initdb gosu postgres initdb
sed -ri "s/^#(listen_addresses\s*=\s*)\S+/\1'*'/" "$PGDATA"/postgresql.conf sed -ri "s/^#(listen_addresses\s*=\s*)\S+/\1'*'/" "$PGDATA"/postgresql.conf
# check password first so we can ouptut the warning before postgres # check password first so we can output the warning before postgres
# messes it up # messes it up
if [ "$POSTGRES_PASSWORD" ]; then if [ "$POSTGRES_PASSWORD" ]; then
pass="PASSWORD '$POSTGRES_PASSWORD'" pass="PASSWORD '$POSTGRES_PASSWORD'"

6
docker-entrypoint.sh
View File

@ -2,17 +2,19 @@
set -e set -e
if [ "$1" = 'postgres' ]; then if [ "$1" = 'postgres' ]; then
mkdir -p "$PGDATA"
chown -R postgres "$PGDATA" chown -R postgres "$PGDATA"
chmod g+s /run/postgresql chmod g+s /run/postgresql
chown -R postgres:postgres /run/postgresql chown -R postgres:postgres /run/postgresql
if [ -z "$(ls -A "$PGDATA")" ]; then # look specifically for PG_VERSION, as it is expected in the DB dir
if [ -s "$PGDATA/PG_VERSION" ]; then
gosu postgres initdb gosu postgres initdb
sed -ri "s/^#(listen_addresses\s*=\s*)\S+/\1'*'/" "$PGDATA"/postgresql.conf sed -ri "s/^#(listen_addresses\s*=\s*)\S+/\1'*'/" "$PGDATA"/postgresql.conf
# check password first so we can ouptut the warning before postgres # check password first so we can output the warning before postgres
# messes it up # messes it up
if [ "$POSTGRES_PASSWORD" ]; then if [ "$POSTGRES_PASSWORD" ]; then
pass="PASSWORD '$POSTGRES_PASSWORD'" pass="PASSWORD '$POSTGRES_PASSWORD'"