|
@ -311,6 +311,7 @@ list_compose_vars() { |
|
|
get_running_compose_containers() { |
|
|
get_running_compose_containers() { |
|
|
## XXXvlab: docker bug: there will be a final newline anyway |
|
|
## XXXvlab: docker bug: there will be a final newline anyway |
|
|
docker ps --filter label="compose.service" --format='{{.ID}}' |
|
|
docker ps --filter label="compose.service" --format='{{.ID}}' |
|
|
|
|
|
docker ps --filter label="compose" --format='{{.ID}}' |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
get_volumes_for_container() { |
|
|
get_volumes_for_container() { |
|
@ -936,6 +937,7 @@ mk_docker_run_options() { |
|
|
"-e" "HOST_COMPOSE_LAUNCHER_OPTS=$SESSION_DIR/$UID-$hash" |
|
|
"-e" "HOST_COMPOSE_LAUNCHER_OPTS=$SESSION_DIR/$UID-$hash" |
|
|
"-e" "COMPOSE_LAUNCHER_OPTS=$dest" |
|
|
"-e" "COMPOSE_LAUNCHER_OPTS=$dest" |
|
|
"-e" "COMPOSE_LAUNCHER_BIN=$COMPOSE_LAUNCHER_BIN" |
|
|
"-e" "COMPOSE_LAUNCHER_BIN=$COMPOSE_LAUNCHER_BIN" |
|
|
|
|
|
"--label" "compose=1" |
|
|
) |
|
|
) |
|
|
p0 "${additional_docker_run_opts[@]}" >> "$filename" |
|
|
p0 "${additional_docker_run_opts[@]}" >> "$filename" |
|
|
docker_run_opts+=("${additional_docker_run_opts[@]}") |
|
|
docker_run_opts+=("${additional_docker_run_opts[@]}") |
|
|