Skip to content

Commit 2fcb086

Browse files
ltangvaldyosifkit
authored andcommitted
Rename docker_file_env to file_env
This function is not meant to be part of the public set
1 parent ef9caa9 commit 2fcb086

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

.template.Debian/docker-entrypoint.sh

+8-8
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ for arg; do
3434
esac
3535
done
3636

37-
# usage: docker_file_env VAR [DEFAULT]
38-
# ie: docker_file_env 'XYZ_DB_PASSWORD' 'example'
37+
# usage: file_env VAR [DEFAULT]
38+
# ie: file_env 'XYZ_DB_PASSWORD' 'example'
3939
# (will allow for "$XYZ_DB_PASSWORD_FILE" to fill in the value of
4040
# "$XYZ_DB_PASSWORD" from a file, especially for Docker's secrets feature)
41-
docker_file_env() {
41+
file_env() {
4242
local var="$1"
4343
local fileVar="${var}_FILE"
4444
local def="${2:-}"
@@ -158,11 +158,11 @@ docker_init_env() {
158158
PASSFILE="$(mktemp ${TMPDIR}/XXXXXXXXXX)"
159159

160160
# Initialize values that might be stored in a file
161-
docker_file_env 'MYSQL_ROOT_HOST' '%'
162-
docker_file_env 'MYSQL_DATABASE'
163-
docker_file_env 'MYSQL_USER'
164-
docker_file_env 'MYSQL_PASSWORD'
165-
docker_file_env 'MYSQL_ROOT_PASSWORD'
161+
file_env 'MYSQL_ROOT_HOST' '%'
162+
file_env 'MYSQL_DATABASE'
163+
file_env 'MYSQL_USER'
164+
file_env 'MYSQL_PASSWORD'
165+
file_env 'MYSQL_ROOT_PASSWORD'
166166
}
167167

168168
# Define the client command that's used in various places

0 commit comments

Comments
 (0)