From 8ea20c38aa31600fdd43a84b4c488777b0d564e0 Mon Sep 17 00:00:00 2001 From: "Hahn Axel (hahn)" <axel.hahn@unibe.ch> Date: Wed, 30 Oct 2024 14:37:53 +0100 Subject: [PATCH] docker init v1.22 added: Open Mysql client in container --- docker/init.sh | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/docker/init.sh b/docker/init.sh index a363a37..96effd1 100755 --- a/docker/init.sh +++ b/docker/init.sh @@ -26,6 +26,7 @@ # 2024-09-20 v1.19 <www.axel-hahn.de> detect dockerd-rootless (hides menu item to set permissions) # 2024-10-16 v1.20 <axel.hahn@unibe.ch> add db import and export # 2024-10-25 v1.21 <axel.hahn@unibe.ch> create missing subdir dbdumps +# 2024-10-30 v1.22 <axel.hahn@unibe.ch> added: Open Mysql client in container # ====================================================================== cd "$( dirname "$0" )" || exit 1 @@ -39,7 +40,7 @@ _self=$( basename "$0" ) # shellcheck source=/dev/null . "${_self}.cfg" || exit 1 -_version="1.21" +_version="1.22" # git@git-repo.iml.unibe.ch:iml-open-source/docker-php-starterkit.git selfgitrepo="docker-php-starterkit.git" @@ -107,11 +108,15 @@ function _getStatus_docker(){ if [ "$DB_ADD" != "false" ] && [ ! -d "${DC_DUMP_DIR}" ]; then echo "INFO: creating subdir ${DC_DUMP_DIR} to import/ export databases ..." mkdir "${DC_DUMP_DIR}" || exit 1 - return -fi + return + fi } +# Get web url of the application +# It is for support of Nginx Docker Proxy +# https://github.com/axelhahn/nginx-docker-proxy +# It returns http://localhost:<port> or a https://<appname> function _getWebUrl(){ DC_WEB_URL="$frontendurl" grep -q "${APP_NAME}-server" /etc/hosts && DC_WEB_URL="https://${APP_NAME}-server/" @@ -182,8 +187,10 @@ function showMenu(){ echo "${_spacer}$( _key p ) - console check with php linter" fi if [ $DC_DB_UP -eq 1 ] || [ $_bAll -eq 1 ]; then + echo echo "${_spacer}$( _key d ) - Dump container database" echo "${_spacer}$( _key D ) - Import Dump into container database" + echo "${_spacer}$( _key M ) - Open Mysql client in database container" fi echo echo "${_spacer}$( _key q ) - quit" @@ -706,6 +713,10 @@ while true; do h2 "DB tools :: import" _dbImport ;; + M) + h2 "DB tools :: mysql client" + docker exec -it "${APP_NAME}-db" mysql -uroot -p${MYSQL_ROOT_PASS} "${MYSQL_DB}" + ;; o) h2 "Open app ..." xdg-open "$DC_WEB_URL" -- GitLab