Skip to content

Commit 44073ab

Browse files
committed
add envpath handling to event scripts
1 parent a87c9f9 commit 44073ab

File tree

3 files changed

+18
-6
lines changed

3 files changed

+18
-6
lines changed

source/compose.manager/event/started

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,20 @@ for dir in $COMPOSE_ROOT/*; do
3838
override="$dir/docker-compose.override.yml"
3939
override="-f ${override@Q}"
4040
fi
41+
envpath=""
42+
if [ -f "$dir/envpath" ]; then
43+
envpath="$dir/envpath"
44+
envpath="$(< "${envpath}" )"
45+
envpath="-e ${envpath@Q}"
46+
fi
4147
logger "Starting compose stack: ${name}"
4248
if [ -f "$dir/indirect" ]; then
4349
indirect=${dir}/indirect
4450
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 &
4652
else
4753
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 &
4955
fi
5056
fi
5157
fi

source/compose.manager/event/stopping_docker

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,20 @@ for dir in $COMPOSE_ROOT/*; do
1616
override="$dir/docker-compose.override.yml"
1717
override="-f ${override@Q}"
1818
fi
19+
envpath=""
20+
if [ -f "$dir/envpath" ]; then
21+
envpath="$dir/envpath"
22+
envpath="$(< "${envpath}" )"
23+
envpath="-e ${envpath@Q}"
24+
fi
1925
logger "Stopping compose stack: ${name// /_}"
2026
if [ -f "$dir/indirect" ]; then
2127
indirect=${dir}/indirect
2228
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 &
2430
else
2531
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 &
2733
fi
2834
fi
2935
fi

source/compose.manager/php/compose_util.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ function echoComposeCommand($action)
7070
$composeCommand[] = $composeOverride;
7171
}
7272

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"));
7575
$composeCommand[] = $envPath;
7676
}
7777

0 commit comments

Comments
 (0)