summaryrefslogtreecommitdiffstats
path: root/Services/mariadb
diff options
context:
space:
mode:
authorstartxfr <clarue@startx.fr>2015-11-29 22:29:05 +0100
committerstartxfr <clarue@startx.fr>2015-11-29 22:29:05 +0100
commita4930f0838f1224bdf4fa0885e858e7a865513ca (patch)
treea9d95b08985c439f2b812382e3b4a36cc990e87f /Services/mariadb
parenteb3d88b10a0feb302a9fd1ec60a7a92caebb856c (diff)
downloadphpmyadmin-a4930f0838f1224bdf4fa0885e858e7a865513ca.tar.gz
phpmyadmin-a4930f0838f1224bdf4fa0885e858e7a865513ca.tar.bz2
phpmyadmin-a4930f0838f1224bdf4fa0885e858e7a865513ca.tar.xz
phpmyadmin-a4930f0838f1224bdf4fa0885e858e7a865513ca.zip
reshappe nodejs container
Diffstat (limited to 'Services/mariadb')
-rw-r--r--Services/mariadb/run.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/Services/mariadb/run.sh b/Services/mariadb/run.sh
index c5ce811..b8f8aed 100644
--- a/Services/mariadb/run.sh
+++ b/Services/mariadb/run.sh
@@ -154,7 +154,7 @@ function config_createdatabase {
function config_importsql {
if [[ -n "$LOADSQL_PATH" ]]; then
echo "import sql data into " $MYSQL_DATABASE
- if [[ ! -d $LOADSQL_PATH ]]; then
+ if [[ -d $LOADSQL_PATH ]]; then
SCHEMALIST=$(find $LOADSQL_PATH/schema-*.sql -type f -printf "%f\n")
for SCHEMAFILE in $SCHEMALIST; do
echo "SET NAMES utf8;"|cat - $LOADSQL_PATH/$SCHEMAFILE > /tmp/out && mv /tmp/out $LOADSQL_PATH/$SCHEMAFILE
@@ -184,8 +184,8 @@ function end_config {
# Start the mariadb server as a deamon and execute it inside
# the running shell
function start_daemon {
- echo "=> Starting mariadb daemon ..."
- display_container_started
+ echo "=> Starting mariadb daemon ..." | tee -a $STARTUPLOG
+ display_container_started | tee -a $STARTUPLOG
exec mysqld_safe
}
@@ -204,4 +204,4 @@ config_createdatabase | tee -a $STARTUPLOG
config_importsql | tee -a $STARTUPLOG
config_stopserver | tee -a $STARTUPLOG
end_config | tee -a $STARTUPLOG
-start_daemon | tee -a $STARTUPLOG
+start_daemon