refs #5701 fix dockerFile and sh's

db/Dockerfile

@@ -7,11 +7,9 @@ ARG DEBIAN_FRONTEND=noninteractive
 
 COPY docker/docker.cnf /etc/mysql/conf.d/
 COPY \
-    docker/docker-init.sh \
-    docker/docker-temp-start.sh \
-    docker/docker-temp-stop.sh \
     docker/docker-dump.sh \
-    docker/docker-start.sh \
+    docker/docker-structure.sh \
+    docker/docker-fixtures.sh \
     /usr/local/bin/
 
 RUN mkdir /mysql-data \
@@ -26,20 +24,12 @@ COPY \
     dump/mockDate.sql \
     dump/dumpedFixtures.sql \
     ./
-RUN gosu mysql docker-init.sh \
-    && docker-dump.sh structure \
-    && sed -i -e 's/@mockDate/'"$MOCKDATE"'/g' mockDate.sql \
-    && docker-dump.sh mockDate \
-    && docker-dump.sh dumpedFixtures \
-    && gosu mysql docker-temp-stop.sh
-
+RUN sed -i -e 's/@mockDate/'"$MOCKDATE"'/g' mockDate.sql \
+    && gosu mysql docker-structure.sh
 COPY changes ./changes
 COPY dump/fixtures.sql ./
 ARG STAMP=unknown
-RUN gosu mysql docker-temp-start.sh \
-    && ./import-changes.sh \
-    && docker-dump.sh fixtures \
-    && gosu mysql docker-temp-stop.sh
+RUN gosu mysql docker-fixtures.sh
 
 RUN echo "[INFO] -> Import finished" \
     && rm -rf /docker-boot

db/docker/docker-fixtures.sh

@@ -5,3 +5,6 @@ CMD=mysqld
 
 docker_setup_env "$CMD"
 docker_temp_server_start "$CMD"
+bash import-changes.sh
+docker-dump.sh fixtures
+docker_temp_server_stop

db/docker/docker-init.sh

@@ -12,3 +12,5 @@ docker_init_database_dir "$CMD"
 docker_temp_server_start "$CMD"
 docker_setup_db
 docker_process_init_files /docker-entrypoint-initdb.d/*
+echo $MARIADB_PID
+export MARIADB_PID

db/docker/docker-structure.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+. /usr/local/bin/docker-entrypoint.sh
+CMD=mysqld
+
+mysql_check_config "$CMD"
+docker_setup_env "$CMD"
+docker_create_db_directories
+
+docker_verify_minimum_env
+docker_init_database_dir "$CMD"
+docker_temp_server_start "$CMD"
+docker_setup_db
+docker_process_init_files /docker-entrypoint-initdb.d/*
+docker-dump.sh structure
+docker-dump.sh mockDate
+docker-dump.sh dumpedFixtures
+docker_temp_server_stop

db/docker/docker-temp-stop.sh

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-. /usr/local/bin/docker-entrypoint.sh
-CMD=mysqld
-
-docker_setup_env "$CMD"