Merge pull request #1026 from stanhu/sh-add-newlines-to-initdb
Add newline to `POSTGRES_PASSWORD` file for initdb
This commit is contained in:
commit
ff5f92b39d
|
|
@ -88,7 +88,8 @@ docker_init_database_dir() {
|
||||||
set -- --waldir "$POSTGRES_INITDB_WALDIR" "$@"
|
set -- --waldir "$POSTGRES_INITDB_WALDIR" "$@"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
eval 'initdb --username="$POSTGRES_USER" --pwfile=<(printf "%s" "$POSTGRES_PASSWORD") '"$POSTGRES_INITDB_ARGS"' "$@"'
|
# --pwfile refuses to handle a properly-empty file (hence the "\n"): https://github.com/docker-library/postgres/issues/1025
|
||||||
|
eval 'initdb --username="$POSTGRES_USER" --pwfile=<(printf "%s\n" "$POSTGRES_PASSWORD") '"$POSTGRES_INITDB_ARGS"' "$@"'
|
||||||
|
|
||||||
# unset/cleanup "nss_wrapper" bits
|
# unset/cleanup "nss_wrapper" bits
|
||||||
if [[ "${LD_PRELOAD:-}" == */libnss_wrapper.so ]]; then
|
if [[ "${LD_PRELOAD:-}" == */libnss_wrapper.so ]]; then
|
||||||
|
|
|
||||||
|
|
@ -88,7 +88,8 @@ docker_init_database_dir() {
|
||||||
set -- --waldir "$POSTGRES_INITDB_WALDIR" "$@"
|
set -- --waldir "$POSTGRES_INITDB_WALDIR" "$@"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
eval 'initdb --username="$POSTGRES_USER" --pwfile=<(printf "%s" "$POSTGRES_PASSWORD") '"$POSTGRES_INITDB_ARGS"' "$@"'
|
# --pwfile refuses to handle a properly-empty file (hence the "\n"): https://github.com/docker-library/postgres/issues/1025
|
||||||
|
eval 'initdb --username="$POSTGRES_USER" --pwfile=<(printf "%s\n" "$POSTGRES_PASSWORD") '"$POSTGRES_INITDB_ARGS"' "$@"'
|
||||||
|
|
||||||
# unset/cleanup "nss_wrapper" bits
|
# unset/cleanup "nss_wrapper" bits
|
||||||
if [[ "${LD_PRELOAD:-}" == */libnss_wrapper.so ]]; then
|
if [[ "${LD_PRELOAD:-}" == */libnss_wrapper.so ]]; then
|
||||||
|
|
|
||||||
|
|
@ -88,7 +88,8 @@ docker_init_database_dir() {
|
||||||
set -- --waldir "$POSTGRES_INITDB_WALDIR" "$@"
|
set -- --waldir "$POSTGRES_INITDB_WALDIR" "$@"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
eval 'initdb --username="$POSTGRES_USER" --pwfile=<(printf "%s" "$POSTGRES_PASSWORD") '"$POSTGRES_INITDB_ARGS"' "$@"'
|
# --pwfile refuses to handle a properly-empty file (hence the "\n"): https://github.com/docker-library/postgres/issues/1025
|
||||||
|
eval 'initdb --username="$POSTGRES_USER" --pwfile=<(printf "%s\n" "$POSTGRES_PASSWORD") '"$POSTGRES_INITDB_ARGS"' "$@"'
|
||||||
|
|
||||||
# unset/cleanup "nss_wrapper" bits
|
# unset/cleanup "nss_wrapper" bits
|
||||||
if [[ "${LD_PRELOAD:-}" == */libnss_wrapper.so ]]; then
|
if [[ "${LD_PRELOAD:-}" == */libnss_wrapper.so ]]; then
|
||||||
|
|
|
||||||
|
|
@ -88,7 +88,8 @@ docker_init_database_dir() {
|
||||||
set -- --waldir "$POSTGRES_INITDB_WALDIR" "$@"
|
set -- --waldir "$POSTGRES_INITDB_WALDIR" "$@"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
eval 'initdb --username="$POSTGRES_USER" --pwfile=<(printf "%s" "$POSTGRES_PASSWORD") '"$POSTGRES_INITDB_ARGS"' "$@"'
|
# --pwfile refuses to handle a properly-empty file (hence the "\n"): https://github.com/docker-library/postgres/issues/1025
|
||||||
|
eval 'initdb --username="$POSTGRES_USER" --pwfile=<(printf "%s\n" "$POSTGRES_PASSWORD") '"$POSTGRES_INITDB_ARGS"' "$@"'
|
||||||
|
|
||||||
# unset/cleanup "nss_wrapper" bits
|
# unset/cleanup "nss_wrapper" bits
|
||||||
if [[ "${LD_PRELOAD:-}" == */libnss_wrapper.so ]]; then
|
if [[ "${LD_PRELOAD:-}" == */libnss_wrapper.so ]]; then
|
||||||
|
|
|
||||||
|
|
@ -88,7 +88,8 @@ docker_init_database_dir() {
|
||||||
set -- --waldir "$POSTGRES_INITDB_WALDIR" "$@"
|
set -- --waldir "$POSTGRES_INITDB_WALDIR" "$@"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
eval 'initdb --username="$POSTGRES_USER" --pwfile=<(printf "%s" "$POSTGRES_PASSWORD") '"$POSTGRES_INITDB_ARGS"' "$@"'
|
# --pwfile refuses to handle a properly-empty file (hence the "\n"): https://github.com/docker-library/postgres/issues/1025
|
||||||
|
eval 'initdb --username="$POSTGRES_USER" --pwfile=<(printf "%s\n" "$POSTGRES_PASSWORD") '"$POSTGRES_INITDB_ARGS"' "$@"'
|
||||||
|
|
||||||
# unset/cleanup "nss_wrapper" bits
|
# unset/cleanup "nss_wrapper" bits
|
||||||
if [[ "${LD_PRELOAD:-}" == */libnss_wrapper.so ]]; then
|
if [[ "${LD_PRELOAD:-}" == */libnss_wrapper.so ]]; then
|
||||||
|
|
|
||||||
|
|
@ -88,7 +88,8 @@ docker_init_database_dir() {
|
||||||
set -- --waldir "$POSTGRES_INITDB_WALDIR" "$@"
|
set -- --waldir "$POSTGRES_INITDB_WALDIR" "$@"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
eval 'initdb --username="$POSTGRES_USER" --pwfile=<(printf "%s" "$POSTGRES_PASSWORD") '"$POSTGRES_INITDB_ARGS"' "$@"'
|
# --pwfile refuses to handle a properly-empty file (hence the "\n"): https://github.com/docker-library/postgres/issues/1025
|
||||||
|
eval 'initdb --username="$POSTGRES_USER" --pwfile=<(printf "%s\n" "$POSTGRES_PASSWORD") '"$POSTGRES_INITDB_ARGS"' "$@"'
|
||||||
|
|
||||||
# unset/cleanup "nss_wrapper" bits
|
# unset/cleanup "nss_wrapper" bits
|
||||||
if [[ "${LD_PRELOAD:-}" == */libnss_wrapper.so ]]; then
|
if [[ "${LD_PRELOAD:-}" == */libnss_wrapper.so ]]; then
|
||||||
|
|
|
||||||
|
|
@ -88,7 +88,8 @@ docker_init_database_dir() {
|
||||||
set -- --waldir "$POSTGRES_INITDB_WALDIR" "$@"
|
set -- --waldir "$POSTGRES_INITDB_WALDIR" "$@"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
eval 'initdb --username="$POSTGRES_USER" --pwfile=<(printf "%s" "$POSTGRES_PASSWORD") '"$POSTGRES_INITDB_ARGS"' "$@"'
|
# --pwfile refuses to handle a properly-empty file (hence the "\n"): https://github.com/docker-library/postgres/issues/1025
|
||||||
|
eval 'initdb --username="$POSTGRES_USER" --pwfile=<(printf "%s\n" "$POSTGRES_PASSWORD") '"$POSTGRES_INITDB_ARGS"' "$@"'
|
||||||
|
|
||||||
# unset/cleanup "nss_wrapper" bits
|
# unset/cleanup "nss_wrapper" bits
|
||||||
if [[ "${LD_PRELOAD:-}" == */libnss_wrapper.so ]]; then
|
if [[ "${LD_PRELOAD:-}" == */libnss_wrapper.so ]]; then
|
||||||
|
|
|
||||||
|
|
@ -88,7 +88,8 @@ docker_init_database_dir() {
|
||||||
set -- --waldir "$POSTGRES_INITDB_WALDIR" "$@"
|
set -- --waldir "$POSTGRES_INITDB_WALDIR" "$@"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
eval 'initdb --username="$POSTGRES_USER" --pwfile=<(printf "%s" "$POSTGRES_PASSWORD") '"$POSTGRES_INITDB_ARGS"' "$@"'
|
# --pwfile refuses to handle a properly-empty file (hence the "\n"): https://github.com/docker-library/postgres/issues/1025
|
||||||
|
eval 'initdb --username="$POSTGRES_USER" --pwfile=<(printf "%s\n" "$POSTGRES_PASSWORD") '"$POSTGRES_INITDB_ARGS"' "$@"'
|
||||||
|
|
||||||
# unset/cleanup "nss_wrapper" bits
|
# unset/cleanup "nss_wrapper" bits
|
||||||
if [[ "${LD_PRELOAD:-}" == */libnss_wrapper.so ]]; then
|
if [[ "${LD_PRELOAD:-}" == */libnss_wrapper.so ]]; then
|
||||||
|
|
|
||||||
|
|
@ -88,7 +88,8 @@ docker_init_database_dir() {
|
||||||
set -- --waldir "$POSTGRES_INITDB_WALDIR" "$@"
|
set -- --waldir "$POSTGRES_INITDB_WALDIR" "$@"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
eval 'initdb --username="$POSTGRES_USER" --pwfile=<(printf "%s" "$POSTGRES_PASSWORD") '"$POSTGRES_INITDB_ARGS"' "$@"'
|
# --pwfile refuses to handle a properly-empty file (hence the "\n"): https://github.com/docker-library/postgres/issues/1025
|
||||||
|
eval 'initdb --username="$POSTGRES_USER" --pwfile=<(printf "%s\n" "$POSTGRES_PASSWORD") '"$POSTGRES_INITDB_ARGS"' "$@"'
|
||||||
|
|
||||||
# unset/cleanup "nss_wrapper" bits
|
# unset/cleanup "nss_wrapper" bits
|
||||||
if [[ "${LD_PRELOAD:-}" == */libnss_wrapper.so ]]; then
|
if [[ "${LD_PRELOAD:-}" == */libnss_wrapper.so ]]; then
|
||||||
|
|
|
||||||
|
|
@ -88,7 +88,8 @@ docker_init_database_dir() {
|
||||||
set -- --waldir "$POSTGRES_INITDB_WALDIR" "$@"
|
set -- --waldir "$POSTGRES_INITDB_WALDIR" "$@"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
eval 'initdb --username="$POSTGRES_USER" --pwfile=<(printf "%s" "$POSTGRES_PASSWORD") '"$POSTGRES_INITDB_ARGS"' "$@"'
|
# --pwfile refuses to handle a properly-empty file (hence the "\n"): https://github.com/docker-library/postgres/issues/1025
|
||||||
|
eval 'initdb --username="$POSTGRES_USER" --pwfile=<(printf "%s\n" "$POSTGRES_PASSWORD") '"$POSTGRES_INITDB_ARGS"' "$@"'
|
||||||
|
|
||||||
# unset/cleanup "nss_wrapper" bits
|
# unset/cleanup "nss_wrapper" bits
|
||||||
if [[ "${LD_PRELOAD:-}" == */libnss_wrapper.so ]]; then
|
if [[ "${LD_PRELOAD:-}" == */libnss_wrapper.so ]]; then
|
||||||
|
|
|
||||||
|
|
@ -88,7 +88,8 @@ docker_init_database_dir() {
|
||||||
set -- --waldir "$POSTGRES_INITDB_WALDIR" "$@"
|
set -- --waldir "$POSTGRES_INITDB_WALDIR" "$@"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
eval 'initdb --username="$POSTGRES_USER" --pwfile=<(printf "%s" "$POSTGRES_PASSWORD") '"$POSTGRES_INITDB_ARGS"' "$@"'
|
# --pwfile refuses to handle a properly-empty file (hence the "\n"): https://github.com/docker-library/postgres/issues/1025
|
||||||
|
eval 'initdb --username="$POSTGRES_USER" --pwfile=<(printf "%s\n" "$POSTGRES_PASSWORD") '"$POSTGRES_INITDB_ARGS"' "$@"'
|
||||||
|
|
||||||
# unset/cleanup "nss_wrapper" bits
|
# unset/cleanup "nss_wrapper" bits
|
||||||
if [[ "${LD_PRELOAD:-}" == */libnss_wrapper.so ]]; then
|
if [[ "${LD_PRELOAD:-}" == */libnss_wrapper.so ]]; then
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue