From 65139aa3d045ee6e07072e61d79128ead5ad69b6 Mon Sep 17 00:00:00 2001
From: Ryan Brooks <ryan@slatehorse.com>
Date: Wed, 10 Jan 2018 17:53:39 +0000
Subject: [PATCH] Call the datastore creation PSQL comands from a shell script,
 to allow variable interpolation

---
 .../docker-entrypoint-initdb.d/00_create_datastore.sh     | 8 ++++++++
 .../docker-entrypoint-initdb.d/00_create_datastore.sql    | 3 ---
 2 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 contrib/docker/postgresql/docker-entrypoint-initdb.d/00_create_datastore.sh
 delete mode 100644 contrib/docker/postgresql/docker-entrypoint-initdb.d/00_create_datastore.sql

diff --git a/contrib/docker/postgresql/docker-entrypoint-initdb.d/00_create_datastore.sh b/contrib/docker/postgresql/docker-entrypoint-initdb.d/00_create_datastore.sh
new file mode 100644
index 00000000000..ec1b3c38854
--- /dev/null
+++ b/contrib/docker/postgresql/docker-entrypoint-initdb.d/00_create_datastore.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+set -e
+
+psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" <<-EOSQL
+    CREATE ROLE datastore_ro NOSUPERUSER NOCREATEDB NOCREATEROLE LOGIN PASSWORD '$DS_RO_PASS';
+    CREATE DATABASE datastore OWNER ckan ENCODING 'utf-8';
+    GRANT ALL PRIVILEGES ON DATABASE datastore TO ckan;
+EOSQL
\ No newline at end of file
diff --git a/contrib/docker/postgresql/docker-entrypoint-initdb.d/00_create_datastore.sql b/contrib/docker/postgresql/docker-entrypoint-initdb.d/00_create_datastore.sql
deleted file mode 100644
index 06340ecb932..00000000000
--- a/contrib/docker/postgresql/docker-entrypoint-initdb.d/00_create_datastore.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-CREATE ROLE datastore_ro NOSUPERUSER NOCREATEDB NOCREATEROLE LOGIN PASSWORD '$DS_RO_PASS';
-CREATE DATABASE datastore OWNER ckan ENCODING 'utf-8';
-GRANT ALL PRIVILEGES ON DATABASE datastore TO ckan;