Skip to content

Commit cd52b6f

Browse files
yosifkityosifkit
committed
Namespace functions for less conflict when sourced
1 parent b918839 commit cd52b6f

13 files changed

+377
-377
lines changed

‎10/alpine/docker-entrypoint.sh

+29-29
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ _is_sourced() {
3131
}
3232

3333
# used to create initial posgres directories and if run as root, ensure ownership to the "postgres" user
34-
create_postgres_dirs() {
34+
docker_create_database_dirs() {
3535
local user="$(id -u)"
3636

3737
mkdir -p "$PGDATA"
@@ -56,7 +56,7 @@ create_postgres_dirs() {
5656
}
5757

5858
# initialize empty PGDATA directory with new database via 'initdb'
59-
init_pgdata() {
59+
docker_init_database_dir() {
6060
# "initdb" is particular about the current user existing in "/etc/passwd", so we use "nss_wrapper" to fake that if necessary
6161
# see https://github.com/docker-library/postgres/pull/253, https://github.com/docker-library/postgres/issues/359, https://cwrap.org/nss_wrapper.html
6262
if ! getent passwd "$(id -u)" &> /dev/null && [ -e /usr/lib/libnss_wrapper.so ]; then
@@ -82,7 +82,7 @@ init_pgdata() {
8282
}
8383

8484
# print large warning if POSTGRES_PASSWORD is empty
85-
print_password_warning() {
85+
docker_print_password_warning() {
8686
# check password first so we can output the warning before postgres
8787
# messes it up
8888
if [ -z "$POSTGRES_PASSWORD" ]; then
@@ -105,9 +105,9 @@ print_password_warning() {
105105
}
106106

107107
# run, source, or read files from /docker-entrypoint-initdb.d (or specified directory)
108-
process_init_files() {
108+
docker_process_init_files() {
109109
# psql here for backwards compatiblilty "${psql[@]}"
110-
psql=( psql_run )
110+
psql=( docker_psql_run )
111111

112112
local initDir="${1:-/docker-entrypoint-initdb.d}"
113113

@@ -125,16 +125,16 @@ process_init_files() {
125125
. "$f"
126126
fi
127127
;;
128-
*.sql) echo "$0: running $f"; psql_run -f "$f"; echo ;;
129-
*.sql.gz) echo "$0: running $f"; gunzip -c "$f" | psql_run; echo ;;
128+
*.sql) echo "$0: running $f"; docker_psql_run -f "$f"; echo ;;
129+
*.sql.gz) echo "$0: running $f"; gunzip -c "$f" | docker_psql_run; echo ;;
130130
*) echo "$0: ignoring $f" ;;
131131
esac
132132
echo
133133
done
134134
}
135135

136136
# run `psql` with proper arguments for user and db
137-
psql_run() {
137+
docker_psql_run() {
138138
local query_runner=( psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --no-password )
139139
if [ -n "$POSTGRES_DB" ]; then
140140
query_runner+=( --dbname "$POSTGRES_DB" )
@@ -145,25 +145,25 @@ psql_run() {
145145

146146
# create initial postgresql superuser with password and database
147147
# uses environment variables for input: POSTGRES_USER, POSTGRES_PASSWORD, POSTGRES_DB
148-
setup_database() {
148+
docker_setup_database() {
149149
if [ "$POSTGRES_DB" != 'postgres' ]; then
150-
POSTGRES_DB= psql_run --dbname postgres --set db="$POSTGRES_DB" <<-'EOSQL'
150+
POSTGRES_DB= docker_psql_run --dbname postgres --set db="$POSTGRES_DB" <<-'EOSQL'
151151
CREATE DATABASE :"db" ;
152152
EOSQL
153153
echo
154154
fi
155155
}
156156

157157
# get user/pass and db from env vars or via file
158-
setup_env_vars() {
158+
docker_setup_env_vars() {
159159
file_env 'POSTGRES_PASSWORD'
160160

161161
file_env 'POSTGRES_USER' 'postgres'
162162
file_env 'POSTGRES_DB' "$POSTGRES_USER"
163163
}
164164

165165
# append md5 or trust auth to pg_hba.conf based on existence of POSTGRES_PASSWORD
166-
setup_pg_hba() {
166+
docker_setup_pg_hba() {
167167
local authMethod
168168
if [ "$POSTGRES_PASSWORD" ]; then
169169
authMethod='md5'
@@ -178,56 +178,56 @@ setup_pg_hba() {
178178
}
179179

180180
# start socket-only postgresql server for setting up user or running scripts
181-
temporary_pgserver_start() {
181+
# all arguments will be passed along as arguments to `postgres` (via pg_ctl)
182+
docker_temporary_pgserver_start() {
182183
# internal start of server in order to allow set-up using psql-client
183-
# does not listen on external TCP/IP and waits until start finishes
184+
# does not listen on external TCP/IP and waits until start finishes (can be overridden via args)
184185
PGUSER="${PGUSER:-$POSTGRES_USER}" \
185186
pg_ctl -D "$PGDATA" \
186-
-o "-c listen_addresses=''" \
187+
-o "-c listen_addresses='' $([ "$#" -gt 0 ] && printf '%q ' "$@")" \
187188
-w start
188-
#??? "$@"
189189
}
190190

191191
# stop postgresql server after done setting up user and running scripts
192-
temporary_pgserver_stop() {
192+
docker_temporary_pgserver_stop() {
193193
PGUSER="${PGUSER:-postgres}" \
194194
pg_ctl -D "$PGDATA" -m fast -w stop
195195
}
196196

197-
main() {
197+
_main() {
198198
# if first arg looks like a flag, assume we want to run postgres server
199199
if [ "${1:0:1}" = '-' ]; then
200200
set -- postgres "$@"
201201
fi
202202

203203
# setup data directories and permissions, then restart script as postgres user
204204
if [ "$1" = 'postgres' ] && [ "$(id -u)" = '0' ]; then
205-
create_postgres_dirs
205+
docker_create_database_dirs
206206
exec su-exec postgres "$BASH_SOURCE" "$@"
207207
fi
208208

209209
if [ "$1" = 'postgres' ]; then
210-
create_postgres_dirs
210+
docker_create_database_dirs
211211

212212
# only run initialization on an empty data directory
213213
# look specifically for PG_VERSION, as it is expected in the DB dir
214214
if [ ! -s "$PGDATA/PG_VERSION" ]; then
215-
init_pgdata
215+
docker_init_database_dir
216216

217-
setup_env_vars
218-
print_password_warning
219-
setup_pg_hba
217+
docker_setup_env_vars
218+
docker_print_password_warning
219+
docker_setup_pg_hba
220220

221221
# PGPASSWORD is required for psql when authentication is required for 'local' connections via pg_hba.conf and is otherwise harmless
222222
# e.g. when '--auth=md5' or '--auth-local=md5' is used in POSTGRES_INITDB_ARGS
223223
export PGPASSWORD="${PGPASSWORD:-$POSTGRES_PASSWORD}"
224-
temporary_pgserver_start
224+
docker_temporary_pgserver_start "${@:2}"
225225

226-
setup_database
226+
docker_setup_database
227227

228-
process_init_files
228+
docker_process_init_files
229229

230-
temporary_pgserver_stop
230+
docker_temporary_pgserver_stop
231231
unset PGPASSWORD
232232

233233
echo
@@ -244,5 +244,5 @@ main() {
244244
}
245245

246246
if ! _is_sourced; then
247-
main "$@"
247+
_main "$@"
248248
fi

‎10/docker-entrypoint.sh

+29-29
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ _is_sourced() {
3131
}
3232

3333
# used to create initial posgres directories and if run as root, ensure ownership to the "postgres" user
34-
create_postgres_dirs() {
34+
docker_create_database_dirs() {
3535
local user="$(id -u)"
3636

3737
mkdir -p "$PGDATA"
@@ -56,7 +56,7 @@ create_postgres_dirs() {
5656
}
5757

5858
# initialize empty PGDATA directory with new database via 'initdb'
59-
init_pgdata() {
59+
docker_init_database_dir() {
6060
# "initdb" is particular about the current user existing in "/etc/passwd", so we use "nss_wrapper" to fake that if necessary
6161
# see https://github.com/docker-library/postgres/pull/253, https://github.com/docker-library/postgres/issues/359, https://cwrap.org/nss_wrapper.html
6262
if ! getent passwd "$(id -u)" &> /dev/null && [ -e /usr/lib/libnss_wrapper.so ]; then
@@ -82,7 +82,7 @@ init_pgdata() {
8282
}
8383

8484
# print large warning if POSTGRES_PASSWORD is empty
85-
print_password_warning() {
85+
docker_print_password_warning() {
8686
# check password first so we can output the warning before postgres
8787
# messes it up
8888
if [ -z "$POSTGRES_PASSWORD" ]; then
@@ -105,9 +105,9 @@ print_password_warning() {
105105
}
106106

107107
# run, source, or read files from /docker-entrypoint-initdb.d (or specified directory)
108-
process_init_files() {
108+
docker_process_init_files() {
109109
# psql here for backwards compatiblilty "${psql[@]}"
110-
psql=( psql_run )
110+
psql=( docker_psql_run )
111111

112112
local initDir="${1:-/docker-entrypoint-initdb.d}"
113113

@@ -125,16 +125,16 @@ process_init_files() {
125125
. "$f"
126126
fi
127127
;;
128-
*.sql) echo "$0: running $f"; psql_run -f "$f"; echo ;;
129-
*.sql.gz) echo "$0: running $f"; gunzip -c "$f" | psql_run; echo ;;
128+
*.sql) echo "$0: running $f"; docker_psql_run -f "$f"; echo ;;
129+
*.sql.gz) echo "$0: running $f"; gunzip -c "$f" | docker_psql_run; echo ;;
130130
*) echo "$0: ignoring $f" ;;
131131
esac
132132
echo
133133
done
134134
}
135135

136136
# run `psql` with proper arguments for user and db
137-
psql_run() {
137+
docker_psql_run() {
138138
local query_runner=( psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --no-password )
139139
if [ -n "$POSTGRES_DB" ]; then
140140
query_runner+=( --dbname "$POSTGRES_DB" )
@@ -145,25 +145,25 @@ psql_run() {
145145

146146
# create initial postgresql superuser with password and database
147147
# uses environment variables for input: POSTGRES_USER, POSTGRES_PASSWORD, POSTGRES_DB
148-
setup_database() {
148+
docker_setup_database() {
149149
if [ "$POSTGRES_DB" != 'postgres' ]; then
150-
POSTGRES_DB= psql_run --dbname postgres --set db="$POSTGRES_DB" <<-'EOSQL'
150+
POSTGRES_DB= docker_psql_run --dbname postgres --set db="$POSTGRES_DB" <<-'EOSQL'
151151
CREATE DATABASE :"db" ;
152152
EOSQL
153153
echo
154154
fi
155155
}
156156

157157
# get user/pass and db from env vars or via file
158-
setup_env_vars() {
158+
docker_setup_env_vars() {
159159
file_env 'POSTGRES_PASSWORD'
160160

161161
file_env 'POSTGRES_USER' 'postgres'
162162
file_env 'POSTGRES_DB' "$POSTGRES_USER"
163163
}
164164

165165
# append md5 or trust auth to pg_hba.conf based on existence of POSTGRES_PASSWORD
166-
setup_pg_hba() {
166+
docker_setup_pg_hba() {
167167
local authMethod
168168
if [ "$POSTGRES_PASSWORD" ]; then
169169
authMethod='md5'
@@ -178,56 +178,56 @@ setup_pg_hba() {
178178
}
179179

180180
# start socket-only postgresql server for setting up user or running scripts
181-
temporary_pgserver_start() {
181+
# all arguments will be passed along as arguments to `postgres` (via pg_ctl)
182+
docker_temporary_pgserver_start() {
182183
# internal start of server in order to allow set-up using psql-client
183-
# does not listen on external TCP/IP and waits until start finishes
184+
# does not listen on external TCP/IP and waits until start finishes (can be overridden via args)
184185
PGUSER="${PGUSER:-$POSTGRES_USER}" \
185186
pg_ctl -D "$PGDATA" \
186-
-o "-c listen_addresses=''" \
187+
-o "-c listen_addresses='' $([ "$#" -gt 0 ] && printf '%q ' "$@")" \
187188
-w start
188-
#??? "$@"
189189
}
190190

191191
# stop postgresql server after done setting up user and running scripts
192-
temporary_pgserver_stop() {
192+
docker_temporary_pgserver_stop() {
193193
PGUSER="${PGUSER:-postgres}" \
194194
pg_ctl -D "$PGDATA" -m fast -w stop
195195
}
196196

197-
main() {
197+
_main() {
198198
# if first arg looks like a flag, assume we want to run postgres server
199199
if [ "${1:0:1}" = '-' ]; then
200200
set -- postgres "$@"
201201
fi
202202

203203
# setup data directories and permissions, then restart script as postgres user
204204
if [ "$1" = 'postgres' ] && [ "$(id -u)" = '0' ]; then
205-
create_postgres_dirs
205+
docker_create_database_dirs
206206
exec gosu postgres "$BASH_SOURCE" "$@"
207207
fi
208208

209209
if [ "$1" = 'postgres' ]; then
210-
create_postgres_dirs
210+
docker_create_database_dirs
211211

212212
# only run initialization on an empty data directory
213213
# look specifically for PG_VERSION, as it is expected in the DB dir
214214
if [ ! -s "$PGDATA/PG_VERSION" ]; then
215-
init_pgdata
215+
docker_init_database_dir
216216

217-
setup_env_vars
218-
print_password_warning
219-
setup_pg_hba
217+
docker_setup_env_vars
218+
docker_print_password_warning
219+
docker_setup_pg_hba
220220

221221
# PGPASSWORD is required for psql when authentication is required for 'local' connections via pg_hba.conf and is otherwise harmless
222222
# e.g. when '--auth=md5' or '--auth-local=md5' is used in POSTGRES_INITDB_ARGS
223223
export PGPASSWORD="${PGPASSWORD:-$POSTGRES_PASSWORD}"
224-
temporary_pgserver_start
224+
docker_temporary_pgserver_start "${@:2}"
225225

226-
setup_database
226+
docker_setup_database
227227

228-
process_init_files
228+
docker_process_init_files
229229

230-
temporary_pgserver_stop
230+
docker_temporary_pgserver_stop
231231
unset PGPASSWORD
232232

233233
echo
@@ -244,5 +244,5 @@ main() {
244244
}
245245

246246
if ! _is_sourced; then
247-
main "$@"
247+
_main "$@"
248248
fi

0 commit comments

Comments
 (0)