Browse Source

fix: some compose variables would incorrectly be shown as empty

These variable are valued after the displaying code.

Signed-off-by: Valentin Lab <valentin.lab@kalysto.org>
cache-relation
Valentin Lab 5 years ago
parent
commit
42afae776e
  1. 9
      bin/compose

9
bin/compose

@ -954,6 +954,7 @@ load_env() {
if [ -z "$COMPOSE_LAUNCHER_OPTS" ]; then if [ -z "$COMPOSE_LAUNCHER_OPTS" ]; then
mk_docker_run_options "$@" || return 1 mk_docker_run_options "$@" || return 1
else else
set_os || return 1
while read-0 opt; do while read-0 opt; do
if [[ "$opt" == "!env:"* ]]; then if [[ "$opt" == "!env:"* ]]; then
opt="${opt##!env:}" opt="${opt##!env:}"
@ -986,9 +987,7 @@ run() {
local os docker_run_opts local os docker_run_opts
load_env "$@" || return 1 load_env "$@" || return 1
[ -n "$DEBUG" ] && show_env
set_os || return 1
[ -n "$DEBUG" ] && show_env >&2
if [ -n "$ARG_COMPOSE_FILE" ]; then if [ -n "$ARG_COMPOSE_FILE" ]; then
array_read-0 cmd_args < \ array_read-0 cmd_args < \
@ -1041,8 +1040,8 @@ depends docker cat readlink sed realpath tee sed grep tail
ansi_color "${ansi_color:-tty}" ansi_color "${ansi_color:-tty}"
if [ "$SHOW_ENV" ]; then if [ "$SHOW_ENV" ]; then
load_env || return 1
show_env
load_env "$@" || return 1
show_env >&2
exit 0 exit 0
fi fi

Loading…
Cancel
Save