diff --git a/docker/init.sh b/docker/init.sh index e7e2c5ff96bdd2880b8d2226497edca9183293a4..9c7c858cb27599c8778a9028e54ca5282cd90d0f 100755 --- a/docker/init.sh +++ b/docker/init.sh @@ -21,7 +21,8 @@ # 2024-07-22 v1.14 <axel.hahn@unibe.ch> show colored boxes with container status # 2024-07-24 v1.15 <axel.hahn@unibe.ch> update menu output # 2024-07-26 v1.16 <axel.hahn@unibe.ch> hide unnecessary menu items (WIP) -# 2024-07-29 v1.17 <axel.hahn@unibe.ch> hide unnecessary menu items; reorder functions +# 2024-07-29 v1.17 <www.axel-hahn.de> hide unnecessary menu items; reorder functions +# 2024-08-14 v1.18 <www.axel-hahn.de> update container view # ====================================================================== cd "$( dirname "$0" )" || exit 1 @@ -35,7 +36,7 @@ _self=$( basename "$0" ) # shellcheck source=/dev/null . "${_self}.cfg" || exit 1 -_version="1.17" +_version="1.18" # git@git-repo.iml.unibe.ch:iml-open-source/docker-php-starterkit.git selfgitrepo="docker-php-starterkit.git" @@ -45,6 +46,8 @@ fgRed="\e[31m" fgGreen="\e[32m" fgBrown="\e[33m" fgBlue="\e[34m" + +fgInvert="\e[7m" fgReset="\e[0m" # ----- status varsiables @@ -143,9 +146,12 @@ function showMenu(){ fi echo if [ $DC_WEB_UP -eq 0 ] || [ $_bAll -eq 1 ]; then - echo "${_spacer}$( _key u ) - startup containers docker-compose ... up -d" - echo "${_spacer}$( _key U ) - startup containers docker-compose ... up -d --build" - echo "${_spacer}$( _key r ) - remove containers docker-compose rm -f" + if [ $DC_CONFIG_CHANGED -eq 0 ] || [ $_bAll -eq 1 ]; then + echo "${_spacer}$( _key u ) - startup containers docker-compose ... up -d" + echo "${_spacer}$( _key U ) - startup containers docker-compose ... up -d --build" + echo + echo "${_spacer}$( _key r ) - remove containers docker-compose rm -f" + fi fi if [ $DC_WEB_UP -eq 1 ] || [ $_bAll -eq 1 ]; then echo "${_spacer}$( _key s ) - shutdown containers docker-compose stop" @@ -455,12 +461,12 @@ function _showContainers(){ fi h2 CONTAINERS - printf "$colWeb ____________________________________ $colDb ____________________________________ $fgReset \n" - printf "$colWeb | %-32s \ $colDb | %-32s \ $fgReset \n" "" "" - printf "$colWeb | %-32s | $colDb | %-32s | $fgReset \n" "${APP_NAME}-web ${StatusWeb}" "${APP_NAME}-db ${StatusDb}" - printf "$colWeb | %-32s | $colDb | %-32s | $fgReset \n" " PHP ${APP_PHP_VERSION}" " ${MYSQL_IMAGE}" - printf "$colWeb | %-32s | $colDb | %-32s | $fgReset \n" " :${APP_PORT}" " :${DB_PORT}" - printf "$colWeb |____________________________________| $colDb |____________________________________| $fgReset \n" + + echo + printf " $colWeb$fgInvert %-32s $fgReset $colDb$fgInvert %-32s $fgReset\n" "WEB ${StatusWeb}" "DB ${StatusDb}" + printf " %-32s $fgReset %-32s $fgReset\n" "PHP ${APP_PHP_VERSION}" "${MYSQL_IMAGE}" + printf " %-32s $fgReset %-32s $fgReset\n" ":${APP_PORT}" ":${DB_PORT}" + echo if [ -n "$Status" ]; then