Skip to content

Fix exec_sql to use configured credentials instead of hardcoded defaults #2431

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
scbrown wants to merge 1 commit into from
Closed

Fix exec_sql to use configured credentials instead of hardcoded defaults #2431

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,15 +92,21 @@ exec_sql() {
echo "running psql command found in: "
echo $(which psql)

local pg_user pg_password
pg_user=$(get_env_var "USER")
pg_password=$(get_env_var "PASSWORD")
pg_user="${pg_user:-postgres}"
pg_password="${pg_password:-password}"

while true; do
if [ -n "$query" ]; then
set +e
output=$(PGPASSWORD=password psql -h 127.0.0.1 -U postgres -c "$query" 2>&1)
output=$(PGPASSWORD="$pg_password" psql -h 127.0.0.1 -U "$pg_user" -c "$query" 2>&1)
status=$?
set -e
else
set +e # tmp disabled to initdb.d/ file err
output=$(PGPASSWORD=password psql -h 127.0.0.1 -U postgres < /dev/stdin 2>&1)
output=$(PGPASSWORD="$pg_password" psql -h 127.0.0.1 -U "$pg_user" < /dev/stdin 2>&1)
status=$?
set -e
fi
Expand Down