updates to datastore script

ckan · Jul 12, 2017 · 53aac5e · 53aac5e
1 parent ef71f66
commit 53aac5e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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