X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/7385689b6fd8df96434aadf7c0377d684c4abe1c..e88556b084ba5af008e0cde991a4502d106e4d09:/tools/arvbox/lib/arvbox/docker/service/postgres/run-service

diff --git a/tools/arvbox/lib/arvbox/docker/service/postgres/run-service b/tools/arvbox/lib/arvbox/docker/service/postgres/run-service
index 9137aa03af..2819ee2d96 100755
--- a/tools/arvbox/lib/arvbox/docker/service/postgres/run-service
+++ b/tools/arvbox/lib/arvbox/docker/service/postgres/run-service
@@ -6,11 +6,10 @@
 exec 2>&1
 set -eux -o pipefail
 
-PGVERSION=9.6
+PGVERSION=$(psql --version | grep -E -o '[0-9]+' | head -n1)
 
 if ! test -d /var/lib/postgresql/$PGVERSION/main ; then
-    /usr/lib/postgresql/$PGVERSION/bin/initdb -D /var/lib/postgresql/$PGVERSION/main
-    sh -c "while ! (psql postgres -c'\du' | grep '^ arvbox ') >/dev/null ; do createuser -s arvbox ; sleep 1 ; done" &
+    /usr/lib/postgresql/$PGVERSION/bin/initdb --locale=en_US.UTF-8 -D /var/lib/postgresql/$PGVERSION/main
 fi
 mkdir -p /var/run/postgresql/$PGVERSION-main.pg_stat_tmp