Skip to content

Commit

Permalink
Propagate XNAT_DATASOURCE_PASSWORD from .env file to ./postgres/XNAT.sql
Browse files Browse the repository at this point in the history
Fixes #54
  • Loading branch information
kelseym committed Mar 16, 2021
1 parent 62d25bd commit c015f7d
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2 deletions.
5 changes: 4 additions & 1 deletion docker-compose.yml
Expand Up @@ -25,7 +25,10 @@ services:
- XNAT_HOME=/data/xnat/home

xnat-db:
build: ./postgres
build:
context: ./postgres
args:
XNAT_DATASOURCE_PASSWORD: ${XNAT_DATASOURCE_PASSWORD}
expose:
- "5432"
volumes:
Expand Down
3 changes: 3 additions & 0 deletions postgres/Dockerfile
@@ -1,5 +1,7 @@
FROM postgres:12.2-alpine

ARG XNAT_DATASOURCE_PASSWORD=${XNAT_DATASOURCE_PASSWORD}

# Default uid and gid for postgres is 70, override by building xnat-db
# container explicitly with --build-arg options:
#
Expand All @@ -13,4 +15,5 @@ RUN if [[ ! -z "${POSTGRES_GID}" && "${POSTGRES_GID}" != 70 ]]; then \
fi;

ADD --chown=postgres:postgres XNAT.sql /docker-entrypoint-initdb.d/
RUN sed -i "s/XNAT_DATASOURCE_PASSWORD/${XNAT_DATASOURCE_PASSWORD}/" /docker-entrypoint-initdb.d/XNAT.sql

2 changes: 1 addition & 1 deletion postgres/XNAT.sql
@@ -1,3 +1,3 @@
CREATE USER xnat NOCREATEDB;
CREATE DATABASE xnat OWNER xnat;
ALTER USER xnat WITH PASSWORD 'xnat';
ALTER USER xnat WITH PASSWORD 'XNAT_DATASOURCE_PASSWORD';

0 comments on commit c015f7d

Please sign in to comment.