Merge pull request #902 from bartelemi/master
fix: Add --no-psqlrc to psql script invocations
This commit is contained in:
commit
dd84d6fccb
|
|
@ -187,7 +187,7 @@ docker_process_init_files() {
|
||||||
# ie: docker_process_sql -f my-file.sql
|
# ie: docker_process_sql -f my-file.sql
|
||||||
# ie: docker_process_sql <my-file.sql
|
# ie: docker_process_sql <my-file.sql
|
||||||
docker_process_sql() {
|
docker_process_sql() {
|
||||||
local query_runner=( psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --no-password )
|
local query_runner=( psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --no-password --no-psqlrc )
|
||||||
if [ -n "$POSTGRES_DB" ]; then
|
if [ -n "$POSTGRES_DB" ]; then
|
||||||
query_runner+=( --dbname "$POSTGRES_DB" )
|
query_runner+=( --dbname "$POSTGRES_DB" )
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
|
|
@ -187,7 +187,7 @@ docker_process_init_files() {
|
||||||
# ie: docker_process_sql -f my-file.sql
|
# ie: docker_process_sql -f my-file.sql
|
||||||
# ie: docker_process_sql <my-file.sql
|
# ie: docker_process_sql <my-file.sql
|
||||||
docker_process_sql() {
|
docker_process_sql() {
|
||||||
local query_runner=( psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --no-password )
|
local query_runner=( psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --no-password --no-psqlrc )
|
||||||
if [ -n "$POSTGRES_DB" ]; then
|
if [ -n "$POSTGRES_DB" ]; then
|
||||||
query_runner+=( --dbname "$POSTGRES_DB" )
|
query_runner+=( --dbname "$POSTGRES_DB" )
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
|
|
@ -187,7 +187,7 @@ docker_process_init_files() {
|
||||||
# ie: docker_process_sql -f my-file.sql
|
# ie: docker_process_sql -f my-file.sql
|
||||||
# ie: docker_process_sql <my-file.sql
|
# ie: docker_process_sql <my-file.sql
|
||||||
docker_process_sql() {
|
docker_process_sql() {
|
||||||
local query_runner=( psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --no-password )
|
local query_runner=( psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --no-password --no-psqlrc )
|
||||||
if [ -n "$POSTGRES_DB" ]; then
|
if [ -n "$POSTGRES_DB" ]; then
|
||||||
query_runner+=( --dbname "$POSTGRES_DB" )
|
query_runner+=( --dbname "$POSTGRES_DB" )
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
|
|
@ -187,7 +187,7 @@ docker_process_init_files() {
|
||||||
# ie: docker_process_sql -f my-file.sql
|
# ie: docker_process_sql -f my-file.sql
|
||||||
# ie: docker_process_sql <my-file.sql
|
# ie: docker_process_sql <my-file.sql
|
||||||
docker_process_sql() {
|
docker_process_sql() {
|
||||||
local query_runner=( psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --no-password )
|
local query_runner=( psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --no-password --no-psqlrc )
|
||||||
if [ -n "$POSTGRES_DB" ]; then
|
if [ -n "$POSTGRES_DB" ]; then
|
||||||
query_runner+=( --dbname "$POSTGRES_DB" )
|
query_runner+=( --dbname "$POSTGRES_DB" )
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
|
|
@ -187,7 +187,7 @@ docker_process_init_files() {
|
||||||
# ie: docker_process_sql -f my-file.sql
|
# ie: docker_process_sql -f my-file.sql
|
||||||
# ie: docker_process_sql <my-file.sql
|
# ie: docker_process_sql <my-file.sql
|
||||||
docker_process_sql() {
|
docker_process_sql() {
|
||||||
local query_runner=( psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --no-password )
|
local query_runner=( psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --no-password --no-psqlrc )
|
||||||
if [ -n "$POSTGRES_DB" ]; then
|
if [ -n "$POSTGRES_DB" ]; then
|
||||||
query_runner+=( --dbname "$POSTGRES_DB" )
|
query_runner+=( --dbname "$POSTGRES_DB" )
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
|
|
@ -187,7 +187,7 @@ docker_process_init_files() {
|
||||||
# ie: docker_process_sql -f my-file.sql
|
# ie: docker_process_sql -f my-file.sql
|
||||||
# ie: docker_process_sql <my-file.sql
|
# ie: docker_process_sql <my-file.sql
|
||||||
docker_process_sql() {
|
docker_process_sql() {
|
||||||
local query_runner=( psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --no-password )
|
local query_runner=( psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --no-password --no-psqlrc )
|
||||||
if [ -n "$POSTGRES_DB" ]; then
|
if [ -n "$POSTGRES_DB" ]; then
|
||||||
query_runner+=( --dbname "$POSTGRES_DB" )
|
query_runner+=( --dbname "$POSTGRES_DB" )
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
|
|
@ -187,7 +187,7 @@ docker_process_init_files() {
|
||||||
# ie: docker_process_sql -f my-file.sql
|
# ie: docker_process_sql -f my-file.sql
|
||||||
# ie: docker_process_sql <my-file.sql
|
# ie: docker_process_sql <my-file.sql
|
||||||
docker_process_sql() {
|
docker_process_sql() {
|
||||||
local query_runner=( psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --no-password )
|
local query_runner=( psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --no-password --no-psqlrc )
|
||||||
if [ -n "$POSTGRES_DB" ]; then
|
if [ -n "$POSTGRES_DB" ]; then
|
||||||
query_runner+=( --dbname "$POSTGRES_DB" )
|
query_runner+=( --dbname "$POSTGRES_DB" )
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
|
|
@ -187,7 +187,7 @@ docker_process_init_files() {
|
||||||
# ie: docker_process_sql -f my-file.sql
|
# ie: docker_process_sql -f my-file.sql
|
||||||
# ie: docker_process_sql <my-file.sql
|
# ie: docker_process_sql <my-file.sql
|
||||||
docker_process_sql() {
|
docker_process_sql() {
|
||||||
local query_runner=( psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --no-password )
|
local query_runner=( psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --no-password --no-psqlrc )
|
||||||
if [ -n "$POSTGRES_DB" ]; then
|
if [ -n "$POSTGRES_DB" ]; then
|
||||||
query_runner+=( --dbname "$POSTGRES_DB" )
|
query_runner+=( --dbname "$POSTGRES_DB" )
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
|
|
@ -187,7 +187,7 @@ docker_process_init_files() {
|
||||||
# ie: docker_process_sql -f my-file.sql
|
# ie: docker_process_sql -f my-file.sql
|
||||||
# ie: docker_process_sql <my-file.sql
|
# ie: docker_process_sql <my-file.sql
|
||||||
docker_process_sql() {
|
docker_process_sql() {
|
||||||
local query_runner=( psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --no-password )
|
local query_runner=( psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --no-password --no-psqlrc )
|
||||||
if [ -n "$POSTGRES_DB" ]; then
|
if [ -n "$POSTGRES_DB" ]; then
|
||||||
query_runner+=( --dbname "$POSTGRES_DB" )
|
query_runner+=( --dbname "$POSTGRES_DB" )
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
|
|
@ -187,7 +187,7 @@ docker_process_init_files() {
|
||||||
# ie: docker_process_sql -f my-file.sql
|
# ie: docker_process_sql -f my-file.sql
|
||||||
# ie: docker_process_sql <my-file.sql
|
# ie: docker_process_sql <my-file.sql
|
||||||
docker_process_sql() {
|
docker_process_sql() {
|
||||||
local query_runner=( psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --no-password )
|
local query_runner=( psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --no-password --no-psqlrc )
|
||||||
if [ -n "$POSTGRES_DB" ]; then
|
if [ -n "$POSTGRES_DB" ]; then
|
||||||
query_runner+=( --dbname "$POSTGRES_DB" )
|
query_runner+=( --dbname "$POSTGRES_DB" )
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
|
|
@ -187,7 +187,7 @@ docker_process_init_files() {
|
||||||
# ie: docker_process_sql -f my-file.sql
|
# ie: docker_process_sql -f my-file.sql
|
||||||
# ie: docker_process_sql <my-file.sql
|
# ie: docker_process_sql <my-file.sql
|
||||||
docker_process_sql() {
|
docker_process_sql() {
|
||||||
local query_runner=( psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --no-password )
|
local query_runner=( psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --no-password --no-psqlrc )
|
||||||
if [ -n "$POSTGRES_DB" ]; then
|
if [ -n "$POSTGRES_DB" ]; then
|
||||||
query_runner+=( --dbname "$POSTGRES_DB" )
|
query_runner+=( --dbname "$POSTGRES_DB" )
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
|
|
@ -187,7 +187,7 @@ docker_process_init_files() {
|
||||||
# ie: docker_process_sql -f my-file.sql
|
# ie: docker_process_sql -f my-file.sql
|
||||||
# ie: docker_process_sql <my-file.sql
|
# ie: docker_process_sql <my-file.sql
|
||||||
docker_process_sql() {
|
docker_process_sql() {
|
||||||
local query_runner=( psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --no-password )
|
local query_runner=( psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --no-password --no-psqlrc )
|
||||||
if [ -n "$POSTGRES_DB" ]; then
|
if [ -n "$POSTGRES_DB" ]; then
|
||||||
query_runner+=( --dbname "$POSTGRES_DB" )
|
query_runner+=( --dbname "$POSTGRES_DB" )
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
|
|
@ -187,7 +187,7 @@ docker_process_init_files() {
|
||||||
# ie: docker_process_sql -f my-file.sql
|
# ie: docker_process_sql -f my-file.sql
|
||||||
# ie: docker_process_sql <my-file.sql
|
# ie: docker_process_sql <my-file.sql
|
||||||
docker_process_sql() {
|
docker_process_sql() {
|
||||||
local query_runner=( psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --no-password )
|
local query_runner=( psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --no-password --no-psqlrc )
|
||||||
if [ -n "$POSTGRES_DB" ]; then
|
if [ -n "$POSTGRES_DB" ]; then
|
||||||
query_runner+=( --dbname "$POSTGRES_DB" )
|
query_runner+=( --dbname "$POSTGRES_DB" )
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
|
|
@ -187,7 +187,7 @@ docker_process_init_files() {
|
||||||
# ie: docker_process_sql -f my-file.sql
|
# ie: docker_process_sql -f my-file.sql
|
||||||
# ie: docker_process_sql <my-file.sql
|
# ie: docker_process_sql <my-file.sql
|
||||||
docker_process_sql() {
|
docker_process_sql() {
|
||||||
local query_runner=( psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --no-password )
|
local query_runner=( psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --no-password --no-psqlrc )
|
||||||
if [ -n "$POSTGRES_DB" ]; then
|
if [ -n "$POSTGRES_DB" ]; then
|
||||||
query_runner+=( --dbname "$POSTGRES_DB" )
|
query_runner+=( --dbname "$POSTGRES_DB" )
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
|
|
@ -187,7 +187,7 @@ docker_process_init_files() {
|
||||||
# ie: docker_process_sql -f my-file.sql
|
# ie: docker_process_sql -f my-file.sql
|
||||||
# ie: docker_process_sql <my-file.sql
|
# ie: docker_process_sql <my-file.sql
|
||||||
docker_process_sql() {
|
docker_process_sql() {
|
||||||
local query_runner=( psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --no-password )
|
local query_runner=( psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --no-password --no-psqlrc )
|
||||||
if [ -n "$POSTGRES_DB" ]; then
|
if [ -n "$POSTGRES_DB" ]; then
|
||||||
query_runner+=( --dbname "$POSTGRES_DB" )
|
query_runner+=( --dbname "$POSTGRES_DB" )
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
|
|
@ -187,7 +187,7 @@ docker_process_init_files() {
|
||||||
# ie: docker_process_sql -f my-file.sql
|
# ie: docker_process_sql -f my-file.sql
|
||||||
# ie: docker_process_sql <my-file.sql
|
# ie: docker_process_sql <my-file.sql
|
||||||
docker_process_sql() {
|
docker_process_sql() {
|
||||||
local query_runner=( psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --no-password )
|
local query_runner=( psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --no-password --no-psqlrc )
|
||||||
if [ -n "$POSTGRES_DB" ]; then
|
if [ -n "$POSTGRES_DB" ]; then
|
||||||
query_runner+=( --dbname "$POSTGRES_DB" )
|
query_runner+=( --dbname "$POSTGRES_DB" )
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue