File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 44find_docker_mods () {
55 # Mods provided via Docker
66 if [[ " ${2} " != " default" ]]; then
7+ MOD_STATE=" (${2} )"
78 docker context create " ${2} " --docker " host=${1} " > /dev/null 2>&1
89 fi
910 docker --context " ${2} " ps -q > /dev/null 2>&1 || local DOCKER_MOD_CONTEXT_FAIL=true
1011 if [[ " ${DOCKER_MOD_CONTEXT_FAIL} " == " true" ]]; then
1112 echo " [mod-init] (ERROR) Cannot connect to the Docker daemon at ${2} , skipping host"
1213 return
1314 fi
14- echo -e " [mod-init] Searching all containers in the ${2} context for DOCKER_MODS..."
15+ echo -e " [mod-init] ${MOD_STATE : + ${MOD_STATE} } Searching all containers in the ${2} context for DOCKER_MODS..."
1516 for CONTAINER in $( docker --context " ${2} " ps -q) ; do
1617 CONTAINER_MODS=$( docker --context " ${2} " inspect " ${CONTAINER} " | jq -r ' .[].Config.Env | to_entries | map(select(.value | match("DOCKER_MODS="))) | .[].value' )
1718 CONTAINER_NAME=$( docker --context " ${2} " inspect " ${CONTAINER} " | jq -r .[].Name | cut -d ' /' -f2)
1819 if [[ -n ${CONTAINER_MODS} ]]; then
1920 CONTAINER_MODS=$( awk -F ' =' ' {print $2}' <<< " ${CONTAINER_MODS}" )
2021 for CONTAINER_MOD in $( tr ' |' ' \n' <<< " ${CONTAINER_MODS}" ) ; do
2122 if [[ " ${DOCKER_MODS} " =~ ${CONTAINER_MOD} ]]; then
22- echo -e " [mod-init] ${CONTAINER_MOD} already in mod list, skipping"
23+ echo -e " [mod-init] ${MOD_STATE : + ${MOD_STATE} }${ CONTAINER_MOD} already in mod list, skipping"
2324 else
24- echo -e " [mod-init] Found new mod ${CONTAINER_MOD} for container ${CONTAINER_NAME} "
25+ echo -e " [mod-init] ${MOD_STATE : + ${MOD_STATE} } Found new mod ${CONTAINER_MOD} for container ${CONTAINER_NAME} "
2526 DOCKER_MODS=" ${DOCKER_MODS} |${CONTAINER_MOD} "
2627 DOCKER_MODS=" ${DOCKER_MODS# |} "
2728 fi
You can’t perform that action at this time.
0 commit comments