File tree Expand file tree Collapse file tree 3 files changed +18
-6
lines changed Expand file tree Collapse file tree 3 files changed +18
-6
lines changed Original file line number Diff line number Diff line change @@ -38,14 +38,20 @@ for dir in $COMPOSE_ROOT/*; do
38
38
override=" $dir /docker-compose.override.yml"
39
39
override=" -f ${override@ Q} "
40
40
fi
41
+ envpath=" "
42
+ if [ -f " $dir /envpath" ]; then
43
+ envpath=" $dir /envpath"
44
+ envpath=" $( < " ${envpath} " ) "
45
+ envpath=" -e ${envpath@ Q} "
46
+ fi
41
47
logger " Starting compose stack: ${name} "
42
48
if [ -f " $dir /indirect" ]; then
43
49
indirect=${dir} /indirect
44
50
indirect=$( < " ${indirect} " )
45
- eval $COMPOSE_WRAPPER -c up -d ${indirect@ Q} -p ${name} $recreate $debug $override > /dev/null &
51
+ eval $COMPOSE_WRAPPER -c up -d ${indirect@ Q} -p ${name} $recreate $debug $override $envpath > /dev/null &
46
52
else
47
53
dir=" $dir /docker-compose.yml"
48
- eval $COMPOSE_WRAPPER -c up -f ${dir@ Q} -p ${name} $recreate $debug $override > /dev/null &
54
+ eval $COMPOSE_WRAPPER -c up -f ${dir@ Q} -p ${name} $recreate $debug $override $envpath > /dev/null &
49
55
fi
50
56
fi
51
57
fi
Original file line number Diff line number Diff line change @@ -16,14 +16,20 @@ for dir in $COMPOSE_ROOT/*; do
16
16
override=" $dir /docker-compose.override.yml"
17
17
override=" -f ${override@ Q} "
18
18
fi
19
+ envpath=" "
20
+ if [ -f " $dir /envpath" ]; then
21
+ envpath=" $dir /envpath"
22
+ envpath=" $( < " ${envpath} " ) "
23
+ envpath=" -e ${envpath@ Q} "
24
+ fi
19
25
logger " Stopping compose stack: ${name// / _} "
20
26
if [ -f " $dir /indirect" ]; then
21
27
indirect=${dir} /indirect
22
28
indirect=$( < " ${indirect} " )
23
- eval $COMPOSE_WRAPPER -c stop -d ${indirect@ Q} -p " ${name// / _} " $override > /dev/null &
29
+ eval $COMPOSE_WRAPPER -c stop -d ${indirect@ Q} -p " ${name// / _} " $override $envpath > /dev/null &
24
30
else
25
31
dir=" $dir /docker-compose.yml"
26
- eval $COMPOSE_WRAPPER -c stop -f ${dir@ Q} -p " ${name// / _} " $override > /dev/null &
32
+ eval $COMPOSE_WRAPPER -c stop -f ${dir@ Q} -p " ${name// / _} " $override $envpath > /dev/null &
27
33
fi
28
34
fi
29
35
fi
Original file line number Diff line number Diff line change @@ -70,8 +70,8 @@ function echoComposeCommand($action)
70
70
$ composeCommand [] = $ composeOverride ;
71
71
}
72
72
73
- if ( is_file ("$ path/envPath " ) ) {
74
- $ envPath = "-e " . trim (file_get_contents ("$ path/envPath " ));
73
+ if ( is_file ("$ path/envpath " ) ) {
74
+ $ envPath = "-e " . trim (file_get_contents ("$ path/envpath " ));
75
75
$ composeCommand [] = $ envPath ;
76
76
}
77
77
You can’t perform that action at this time.
0 commit comments