From 33f2d556fd92606eb9c105c9448c5d2ae125e1b0 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 12 Jun 2023 07:33:45 +0200
Subject: [PATCH] refs #5701 fix(db/dockerFile): fix docker-temp-stop

---
 db/Dockerfile                 |  3 +++
 db/docker/docker-init.sh      |  2 --
 db/docker/docker-structure.sh | 15 ++-------------
 db/docker/docker-temp-stop.sh |  7 +++++++
 4 files changed, 12 insertions(+), 15 deletions(-)
 create mode 100644 db/docker/docker-temp-stop.sh

diff --git a/db/Dockerfile b/db/Dockerfile
index 15f947e083..448b8b03af 100644
--- a/db/Dockerfile
+++ b/db/Dockerfile
@@ -7,6 +7,9 @@ ARG DEBIAN_FRONTEND=noninteractive
 
 COPY docker/docker.cnf /etc/mysql/conf.d/
 COPY \
+    docker/docker-start.sh \
+    docker/docker-init.sh \
+    docker/docker-temp-stop.sh \
     docker/docker-dump.sh \
     docker/docker-structure.sh \
     docker/docker-fixtures.sh \
diff --git a/db/docker/docker-init.sh b/db/docker/docker-init.sh
index b585104361..ccd14283ef 100755
--- a/db/docker/docker-init.sh
+++ b/db/docker/docker-init.sh
@@ -12,5 +12,3 @@ 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
diff --git a/db/docker/docker-structure.sh b/db/docker/docker-structure.sh
index b119e38fd5..75a1c24f3f 100755
--- a/db/docker/docker-structure.sh
+++ b/db/docker/docker-structure.sh
@@ -1,18 +1,7 @@
 #!/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-init.sh
 docker-dump.sh structure
 docker-dump.sh mockDate
 docker-dump.sh dumpedFixtures
-docker_temp_server_stop
+. docker-temp-stop.sh
diff --git a/db/docker/docker-temp-stop.sh b/db/docker/docker-temp-stop.sh
new file mode 100644
index 0000000000..df66959df9
--- /dev/null
+++ b/db/docker/docker-temp-stop.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+. /usr/local/bin/docker-entrypoint.sh
+CMD=mysqld
+
+docker_setup_env "$CMD"
+docker_temp_server_stop