From 4540606ea2645844623e9c429b6c7d1996327888 Mon Sep 17 00:00:00 2001
From: Tianon Gravi <admwiggin@gmail.com>
Date: Fri, 1 Aug 2014 15:48:37 -0600
Subject: [PATCH] Add more minor tweaks to generate-stackbrew-library.sh and
 update.sh

---
 docker-entrypoint.sh          | 18 ++++++++++++++++++
 generate-stackbrew-library.sh |  2 +-
 update.sh                     |  3 ++-
 3 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100755 docker-entrypoint.sh

diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
new file mode 100755
index 0000000000..5868bad075
--- /dev/null
+++ b/docker-entrypoint.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+set -e
+
+if [ "$1" = 'postgres' ]; then
+	chown -R postgres "$PGDATA"
+	
+	if [ -z "$(ls -A "$PGDATA")" ]; then
+		gosu postgres initdb
+		
+		sed -ri "s/^#(listen_addresses\s*=\s*)\S+/\1'*'/" "$PGDATA"/postgresql.conf
+		
+		{ echo; echo 'host all all 0.0.0.0/0 trust'; } >> "$PGDATA"/pg_hba.conf
+	fi
+	
+	exec gosu postgres "$@"
+fi
+
+exec "$@"
diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh
index 69ae4b721a..2592bff483 100755
--- a/generate-stackbrew-library.sh
+++ b/generate-stackbrew-library.sh
@@ -11,12 +11,12 @@ cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
 
 versions=( */ )
 versions=( "${versions[@]%/}" )
-commit="$(git log -1 --format='format:%H')"
 url='git://github.com/docker-library/postgres'
 
 echo '# maintainer: InfoSiftr <github@infosiftr.com> (@infosiftr)'
 
 for version in "${versions[@]}"; do
+	commit="$(git log -1 --format='format:%H' "$version")"
 	fullVersion="$(grep -m1 'ENV PG_VERSION ' "$version/Dockerfile" | cut -d' ' -f3 | cut -d- -f1 | sed 's/~/-/g')"
 	versionAliases=( ${aliases[$version]} $version $fullVersion )
 	
diff --git a/update.sh b/update.sh
index e3d0d790a7..649d716199 100755
--- a/update.sh
+++ b/update.sh
@@ -17,7 +17,8 @@ for version in "${versions[@]}"; do
 	fullVersion="$(grep -m1 -A10 "^Package: postgresql-$version\$" "$packages" | grep -m1 '^Version: ' | cut -d' ' -f2)"
 	(
 		set -x
-		cp Dockerfile.template "$version/Dockerfile"
+		cp docker-entrypoint.sh Dockerfile.template "$version/"
+		mv "$version/Dockerfile.template" "$version/Dockerfile"
 		sed -i 's/%%PG_MAJOR%%/'$version'/g; s/%%PG_VERSION%%/'$fullVersion'/g' "$version/Dockerfile"
 	)
 done