Skip to content

Commit ff5f92b

Browse files
tianontianon
authored
Merge pull request docker-library#1026 from stanhu/sh-add-newlines-to-initdb
Add newline to `POSTGRES_PASSWORD` file for initdb
2 parents 7a852f4 + 41bd7bf commit ff5f92b

11 files changed

+22
-11
lines changed

‎11/alpine/docker-entrypoint.sh

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎11/bullseye/docker-entrypoint.sh

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎12/alpine/docker-entrypoint.sh

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎12/bullseye/docker-entrypoint.sh

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎13/alpine/docker-entrypoint.sh

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎13/bullseye/docker-entrypoint.sh

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎14/alpine/docker-entrypoint.sh

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎14/bullseye/docker-entrypoint.sh

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎15/alpine/docker-entrypoint.sh

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎15/bullseye/docker-entrypoint.sh

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docker-entrypoint.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,8 @@ docker_init_database_dir() {
8888
set -- --waldir "$POSTGRES_INITDB_WALDIR" "$@"
8989
fi
9090

91-
eval 'initdb --username="$POSTGRES_USER" --pwfile=<(printf "%s" "$POSTGRES_PASSWORD") '"$POSTGRES_INITDB_ARGS"' "$@"'
91+
# --pwfile refuses to handle a properly-empty file (hence the "\n"): https://github.com/docker-library/postgres/issues/1025
92+
eval 'initdb --username="$POSTGRES_USER" --pwfile=<(printf "%s\n" "$POSTGRES_PASSWORD") '"$POSTGRES_INITDB_ARGS"' "$@"'
9293

9394
# unset/cleanup "nss_wrapper" bits
9495
if [[ "${LD_PRELOAD:-}" == */libnss_wrapper.so ]]; then

0 commit comments

Comments
 (0)