File tree 2 files changed +14
-5
lines changed
2 files changed +14
-5
lines changed Original file line number Diff line number Diff line change @@ -23,9 +23,6 @@ file_env() {
23
23
unset " $fileVar "
24
24
}
25
25
26
- file_env ' RABBITMQ_DEFAULT_USER'
27
- file_env ' RABBITMQ_DEFAULT_PASS'
28
-
29
26
# allow the container to be started with `--user`
30
27
if [[ " $1 " == rabbitmq* ]] && [ " $( id -u) " = ' 0' ]; then
31
28
if [ " $1 " = ' rabbitmq-server' ]; then
44
41
: " ${RABBITMQ_MANAGEMENT_SSL_CERTFILE:= $RABBITMQ_SSL_CERTFILE } "
45
42
: " ${RABBITMQ_MANAGEMENT_SSL_KEYFILE:= $RABBITMQ_SSL_KEYFILE } "
46
43
44
+ # Allowed env vars that will be read from mounted files (i.e. Docker Secrets):
45
+ fileEnvKeys=(
46
+ default_user
47
+ default_pass
48
+ )
49
+
47
50
# https://www.rabbitmq.com/configure.html
48
51
sslConfigKeys=(
49
52
cacertfile
@@ -86,6 +89,7 @@ declare -A configDefaults=(
86
89
haveConfig=
87
90
haveSslConfig=
88
91
haveManagementSslConfig=
92
+ for fileEnvKey in " ${fileEnvKeys[@]} " ; do file_env " RABBITMQ_${fileEnvKey^^} " ; done
89
93
for conf in " ${allConfigKeys[@]} " ; do
90
94
var=" RABBITMQ_${conf^^} "
91
95
val=" ${! var:- } "
Original file line number Diff line number Diff line change @@ -23,8 +23,6 @@ file_env() {
23
23
unset " $fileVar "
24
24
}
25
25
26
- file_env ' RABBITMQ_DEFAULT_PASS'
27
-
28
26
# allow the container to be started with `--user`
29
27
if [[ " $1 " == rabbitmq* ]] && [ " $( id -u) " = ' 0' ]; then
30
28
if [ " $1 " = ' rabbitmq-server' ]; then
43
41
: " ${RABBITMQ_MANAGEMENT_SSL_CERTFILE:= $RABBITMQ_SSL_CERTFILE } "
44
42
: " ${RABBITMQ_MANAGEMENT_SSL_KEYFILE:= $RABBITMQ_SSL_KEYFILE } "
45
43
44
+ # Allowed env vars that will be read from mounted files (i.e. Docker Secrets):
45
+ fileEnvKeys=(
46
+ default_user
47
+ default_pass
48
+ )
49
+
46
50
# https://www.rabbitmq.com/configure.html
47
51
sslConfigKeys=(
48
52
cacertfile
@@ -85,6 +89,7 @@ declare -A configDefaults=(
85
89
haveConfig=
86
90
haveSslConfig=
87
91
haveManagementSslConfig=
92
+ for fileEnvKey in " ${fileEnvKeys[@]} " ; do file_env " RABBITMQ_${fileEnvKey^^} " ; done
88
93
for conf in " ${allConfigKeys[@]} " ; do
89
94
var=" RABBITMQ_${conf^^} "
90
95
val=" ${! var:- } "
You can’t perform that action at this time.
0 commit comments