diff --git a/docker-compose/withPostgresAndWorker/init-data.sh b/docker-compose/withPostgresAndWorker/init-data.sh index f98a972e..c7495053 100755 --- a/docker-compose/withPostgresAndWorker/init-data.sh +++ b/docker-compose/withPostgresAndWorker/init-data.sh @@ -1,13 +1,12 @@ #!/bin/bash -set -e; - +set -e if [ -n "${POSTGRES_NON_ROOT_USER:-}" ] && [ -n "${POSTGRES_NON_ROOT_PASSWORD:-}" ]; then - psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL - CREATE USER ${POSTGRES_NON_ROOT_USER} WITH PASSWORD '${POSTGRES_NON_ROOT_PASSWORD}'; - GRANT ALL PRIVILEGES ON DATABASE ${POSTGRES_DB} TO ${POSTGRES_NON_ROOT_USER}; - GRANT CREATE ON SCHEMA public TO ${POSTGRES_NON_ROOT_USER}; - EOSQL + psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL + CREATE USER "${POSTGRES_NON_ROOT_USER}" WITH ENCRYPTED PASSWORD '${POSTGRES_NON_ROOT_PASSWORD}'; + GRANT ALL PRIVILEGES ON DATABASE ${POSTGRES_DB} TO "${POSTGRES_NON_ROOT_USER}"; + GRANT CREATE ON SCHEMA public TO "${POSTGRES_NON_ROOT_USER}"; +EOSQL else - echo "SETUP INFO: No Environment variables given!" + echo "SETUP INFO: No Environment variables given!" fi