DB: mysql 5.5/5.6/5.7/8.0 prevent re-start at start-up #3449463

db/mysql-5.5/Dockerfile

@@ -4,13 +4,15 @@ MAINTAINER drupalci
 
 # Packages.
 RUN apt-get update && \
-    apt-get install -qy mysql-server netcat && \
+    apt-get install -qy mysql-server netcat procps && \
     rm -rf /var/lib/apt/lists/*
 
 COPY --chmod=644 ./conf/my.cnf /etc/mysql/my.cnf
 
 RUN rm -rf /var/lib/mysql/*
 
+EXPOSE 3306
+
 USER root
 
 COPY ./conf/startup.sh /opt/startup.sh

db/mysql-5.5/conf/startup.sh

 #!/bin/bash
 
+terminate() {
+    echo "Caught termination signal, shutting down..."
+    if [ -n "${PID}" ]; then
+        kill -TERM "$(pgrep -P ${PID} -x mysqld)"
+        wait "${PID}"
+    fi
+    echo "Shutdown complete."
+    exit 0
+}
+
+trap terminate SIGTERM SIGINT
+
 if [ ! -f /var/lib/mysql/ibdata1 ];
     then
     echo "rebuilding /var/lib/mysql/ibdata1"
@@ -11,10 +23,12 @@ if [ ! -f /var/lib/mysql/ibdata1 ];
     mysql -e "CREATE USER 'drupaltestbot'@'%' IDENTIFIED BY 'drupaltestbotpw';"
     mysql -e "GRANT ALL PRIVILEGES ON *.* TO 'drupaltestbot'@'%' WITH GRANT OPTION; SELECT User FROM mysql.user; FLUSH PRIVILEGES;"
     echo "Grants added"
-    killall mysqld
-    wait ${PID}
 fi
 
-/usr/bin/mysqld_safe;
-echo "mysql died at $(date)";
-
+# Start MySQL server if container restart and data is ready
+if [ -z "${PID}" ]; then
+    /usr/bin/mysqld_safe &
+    PID="${!}"
+fi
+wait ${PID}
+echo "mysql exited at $(date)";

db/mysql-5.6/Dockerfile

-#
+##
 FROM       docker.io/mysql:5.6
 MAINTAINER drupalci
 
@@ -9,7 +9,7 @@ RUN set -xe && \
     echo "deb http://archive.debian.org/debian-security/ stretch/updates main" >> /etc/apt/sources.list && \
     \
     apt-get -y update && \
-    apt-get -y install netcat-traditional && \
+    apt-get -y install netcat-traditional procps && \
     rm -rf /var/lib/apt/lists/*
 
 COPY --chmod=644 ./conf/my.cnf /etc/mysql/my.cnf

db/mysql-5.6/conf/startup.sh

 #!/bin/bash
 
+terminate() {
+    echo "Caught termination signal, shutting down..."
+    if [ -n "${PID}" ]; then
+        kill -TERM "$(pgrep -P ${PID} -x mysqld)"
+        wait "${PID}"
+    fi
+    echo "Shutdown complete."
+    exit 0
+}
+
+trap terminate SIGTERM SIGINT
+
 if [ ! -f /var/lib/mysql/ibdata1 ];
     then
     echo "rebuilding /var/lib/mysql/ibdata1"
@@ -11,10 +23,12 @@ if [ ! -f /var/lib/mysql/ibdata1 ];
     mysql -e "CREATE USER 'drupaltestbot'@'%' IDENTIFIED BY 'drupaltestbotpw';"
     mysql -e "GRANT ALL PRIVILEGES ON *.* TO 'drupaltestbot'@'%' WITH GRANT OPTION; SELECT User FROM mysql.user; FLUSH PRIVILEGES;"
     echo "Grants added"
-    killall mysqld
-    wait ${PID}
 fi
 
-/usr/bin/mysqld_safe;
-echo "mysql died at $(date)";
-
+# Start MySQL server if container restart and data is ready
+if [ -z "${PID}" ]; then
+    /usr/bin/mysqld_safe &
+    PID="${!}"
+fi
+wait ${PID}
+echo "mysql exited at $(date)";

db/mysql-5.7/Dockerfile

-#
+##
 FROM       docker.io/mysql:5.7
 MAINTAINER drupalci
 

db/mysql-5.7/conf/startup.sh

 #!/bin/bash
 
+terminate() {
+    echo "Caught termination signal, shutting down..."
+    if [ -n "${PID}" ]; then
+        kill -TERM "${PID}"
+        wait "${PID}"
+    fi
+    echo "Shutdown complete."
+    exit 0
+}
+
+trap terminate SIGTERM SIGINT
+
 if [ ! -f /var/lib/mysql/ibdata1 ];
     then
     echo "rebuilding /var/lib/mysql/ibdata1"
@@ -12,10 +24,12 @@ if [ ! -f /var/lib/mysql/ibdata1 ];
     mysql -e "CREATE USER 'drupaltestbot'@'%' IDENTIFIED BY 'drupaltestbotpw';"
     mysql -e "GRANT ALL PRIVILEGES ON *.* TO 'drupaltestbot'@'%' WITH GRANT OPTION; SELECT User FROM mysql.user; FLUSH PRIVILEGES;"
     echo "Grants added"
-    killall mysqld
-    wait ${PID}
 fi
 
-/usr/sbin/mysqld;
-echo "mysql died at $(date)";
-
+# Start MySQL server if container restart and data is ready
+if [ -z "${PID}" ]; then
+    /usr/sbin/mysqld &
+    PID="${!}"
+fi
+wait ${PID}
+echo "mysql exited at $(date)";

db/mysql-8/Dockerfile

-#
+###
 FROM       docker.io/mysql:8.0-debian
 MAINTAINER drupalci
 
 # Packages.
 RUN apt-get -y update && \
-    apt-get -y install netcat-traditional psmisc --no-install-recommends && \
+    apt-get -y install netcat-traditional procps psmisc --no-install-recommends && \
     rm -rf /var/lib/apt/lists/*
 
 COPY --chmod=644 ./conf/my.cnf /etc/mysql/conf.d/drupalci.cnf

db/mysql-8/conf/startup.sh

 #!/bin/bash
 
+terminate() {
+    echo "Caught termination signal, shutting down..."
+    if [ -n "${PID}" ]; then
+        kill -TERM "$(pgrep -P ${PID} -x mysqld)"
+        wait "${PID}"
+    fi
+    echo "Shutdown complete."
+    exit 0
+}
+
+trap terminate SIGTERM SIGINT
+
 if [ ! -f /var/lib/mysql/ibdata1 ];
     then
     echo "rebuilding /var/lib/mysql/ibdata1"
@@ -12,10 +24,12 @@ if [ ! -f /var/lib/mysql/ibdata1 ];
     mysql -e "CREATE USER 'drupaltestbot'@'%' IDENTIFIED BY 'drupaltestbotpw';"
     mysql -e "GRANT ALL PRIVILEGES ON *.* TO 'drupaltestbot'@'%' WITH GRANT OPTION; SELECT User FROM mysql.user; FLUSH PRIVILEGES;"
     echo "Grants added"
-    killall mysqld
-    wait ${PID}
 fi
 
-/usr/bin/mysqld_safe;
-echo "mysql died at $(date)";
-
+# Start MySQL server if container restart and data is ready
+if [ -z "${PID}" ]; then
+    /usr/bin/mysqld_safe &
+    PID="${!}"
+fi
+wait ${PID}
+echo "mysql exited at $(date)";