From 53aac5e8b76b5537b82620e6e8d4f46474540d91 Mon Sep 17 00:00:00 2001 From: florianm Date: Wed, 12 Jul 2017 19:59:49 +0800 Subject: [PATCH] updates to datastore script --- contrib/docker/postgresql/Dockerfile | 2 ++ .../docker-entrypoint-initdb.d/00_create_datastore.sh | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/contrib/docker/postgresql/Dockerfile b/contrib/docker/postgresql/Dockerfile index ef4b05e4de9..978d035825f 100644 --- a/contrib/docker/postgresql/Dockerfile +++ b/contrib/docker/postgresql/Dockerfile @@ -12,3 +12,5 @@ ENV POSTGRES_DB ckan # Output variables when building for the first time. Will not run if using cached image. RUN echo "Building postgres:9.6 with user $POSTGRES_USER, pw $POSTGRES_PASSWORD, db $POSTGRES_DB" + +ADD /docker-entrypoint-initdb.d/00_create_datastore.sh ./00_create_datastore.sh 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 index 7a6f45ea775..3bdfaeeed55 100644 --- a/contrib/docker/postgresql/docker-entrypoint-initdb.d/00_create_datastore.sh +++ b/contrib/docker/postgresql/docker-entrypoint-initdb.d/00_create_datastore.sh @@ -2,7 +2,7 @@ set -e echo "Creating datastore readonly user and database in image db..." psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" <<-EOSQL - CREATE USER datastore_ro NOCREATEDB NOSUPERUSER NOCREATEROLE PASSWORD $DS_RO_PASS; + CREATE USER datastore_ro LOGIN NOCREATEDB NOSUPERUSER NOCREATEROLE ENCRYPTED PASSWORD "$DS_RO_PASS"; CREATE DATABASE datastore OWNER ckan ENCODING utf-8; GRANT ALL PRIVILEGES ON DATABASE datastore TO ckan; EOSQL