Merge pull request #268 from jdeathe/centos-7-mysql57-community-develop

Release changes for 2.3.1

Author: jdeathe

CHANGELOG.md

@@ -4,6 +4,12 @@
 
 Summary of release changes.
 
+### 2.3.1 - 2019-08-23
+
+- Updates healthcheck script for consistency.
+- Fixes container mount point for emulating and testing secrets.
+- Fixes issue with automatically generated root password initialisation when running with existing datadir volume.
+
 ### 2.3.0 - 2019-07-09
 
 - Updates source image to [2.6.0](https://github.com/jdeathe/centos-ssh/releases/tag/2.6.0).

Dockerfile

@@ -1,6 +1,6 @@
 FROM jdeathe/centos-ssh:2.6.0
 
-ARG RELEASE_VERSION="2.3.0"
+ARG RELEASE_VERSION="2.3.1"
 
 # ------------------------------------------------------------------------------
 # Base install of required packages

README.md

@@ -1,7 +1,7 @@
 ## Tags and respective `Dockerfile` links
 
-- `centos-7-mysql57-community`, [`2.3.0`](https://github.com/jdeathe/centos-ssh-mysql/tree/2.3.0)  [(centos-7-mysql57-community/Dockerfile)](https://github.com/jdeathe/centos-ssh-mysql/blob/centos-7-mysql57-community/Dockerfile)
-- `centos-6`, [`1.11.0`](https://github.com/jdeathe/centos-ssh-mysql/tree/1.11.0) [(centos-6/Dockerfile)](https://github.com/jdeathe/centos-ssh-mysql/blob/centos-6/Dockerfile)
+- `centos-7-mysql57-community`, [`2.3.1`](https://github.com/jdeathe/centos-ssh-mysql/tree/2.3.1)  [(centos-7-mysql57-community/Dockerfile)](https://github.com/jdeathe/centos-ssh-mysql/blob/centos-7-mysql57-community/Dockerfile)
+- `centos-6`, [`1.11.1`](https://github.com/jdeathe/centos-ssh-mysql/tree/1.11.1) [(centos-6/Dockerfile)](https://github.com/jdeathe/centos-ssh-mysql/blob/centos-6/Dockerfile)
 
 ## Overview
 
@@ -25,7 +25,7 @@ $ docker run -d \
   --name mysql.1 \
   -p 3306:3306 \
   -v /var/lib/mysql \
-  jdeathe/centos-ssh-mysql:2.3.0
+  jdeathe/centos-ssh-mysql:2.3.1
 ```
 
 Verify the named container's process status and health.
@@ -60,11 +60,11 @@ $ docker exec -it \
   mysql.1 \
   mysql
 ```
-### Sakila Example
+### Sakila example
 
 Import the Sakila example database from the [MySQL Documentation](https://dev.mysql.com/doc/index-other.html) and view the first 2 records from the film table.
 
-#### Import Schema
+#### Import schema
 
 ```
 $ docker exec -i mysql.1 mysql \
@@ -74,7 +74,7 @@ $ docker exec -i mysql.1 mysql \
   )
 ```
 
-#### Import Data
+#### Import data
 
 ```
 $ docker exec -i mysql.1 mysql \
@@ -83,7 +83,7 @@ $ docker exec -i mysql.1 mysql \
   )
 ```
 
-#### Select Records
+#### Select records
 
 ```
 $ docker exec mysql.1 mysql \
@@ -104,7 +104,7 @@ The following example sets up a custom MySQL database, user and user password on
 
 ```
 $ docker stop mysql.1 && \
-  docker rm mysql.1 && \
+  docker rm mysql.1; \
   docker run \
   --detach \
   --name mysql.1 \
@@ -114,7 +114,7 @@ $ docker stop mysql.1 && \
   --env "MYSQL_USER_PASSWORD=" \
   --env "MYSQL_USER_DATABASE=app-db" \
   --volume mysql.1.data-mysql:/var/lib/mysql \
-  jdeathe/centos-ssh-mysql:2.3.0
+  jdeathe/centos-ssh-mysql:2.3.1
 ```
 
 The environmental variable `MYSQL_SUBNET` is optional but can be used to generate users with access to databases outside the `localhost`, (the default for the root user). In the example, the subnet definition `0.0.0.0/0.0.0.0` allows connections from any network which is equivalent to the wildcard symbol, `%`, in MySQL GRANT definitions.
@@ -125,7 +125,7 @@ Verify it's initialised and running successfully by inspecting the container's l
 $ docker logs mysql.1
 ```
 
-#### Environment Variables
+#### Environment variables
 
 There are several environmental variables defined at runtime these allow the operator to customise the running container.
 

src/etc/supervisord.d/20-mysqld-bootstrap.conf

@@ -3,8 +3,8 @@ autorestart = false
 autostart = %(ENV_ENABLE_MYSQLD_BOOTSTRAP)s
 command = /usr/sbin/mysqld-bootstrap --verbose
 priority = 20
-startsecs = 0
 startretries = 0
+startsecs = 0
 stderr_logfile = /dev/stderr
 stderr_logfile_maxbytes = 0
 stdout_logfile = /dev/stdout

src/usr/bin/healthcheck

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+set -e
+
 function __get_system_timezone ()
 {
 	local -r default_value="${1:-UTC}"
@@ -97,14 +99,14 @@ function __last_check_passed ()
 {
 	local -i status=0
 
-	if [[ ! -f ${STATUS_PATH} ]]
+	if [[ ! -f ${status_path} ]]
 	then
 		return ${status}
 	else
 		read \
 			-n 1 \
 			status \
-		< "${STATUS_PATH}"
+			< "${status_path}"
 
 		if [[ ${status} =~ ^[01]$ ]]
 		then
@@ -130,8 +132,9 @@ function __mysql_get_option ()
 
 function __print_message ()
 {
+	local -r quiet="${quiet:-false}"
 	local -r type="${1:-}"
-	local -r quiet="${QUIET:-false}"
+
 	local message="${2:-}"
 	local prefix
 
@@ -168,10 +171,9 @@ function __print_message ()
 
 function __record_exit_status ()
 {
+	local -r status_directory="${status_path%/*}"
+
 	local -i status=${1:-${?}}
-	local status_directory="$(
-		dirname "${STATUS_PATH}"
-	)"
 
 	if [[ ! -d ${status_directory} ]]
 	then
@@ -183,20 +185,20 @@ function __record_exit_status ()
 			"${status_directory}"
 	fi
 
-	if [[ ! -f ${STATUS_PATH} ]]
+	if [[ ! -f ${status_path} ]]
 	then
 		install \
 			-m 0660 \
 			-o root \
 			-g root \
 			/dev/null \
-			"${STATUS_PATH}"
+			"${status_path}"
 	fi
 
 	printf -- \
 		'%d' \
 		"${status}" \
-	> "${STATUS_PATH}"
+		> "${status_path}"
 
 	trap - \
 		EXIT
@@ -208,8 +210,8 @@ function __usage ()
 {
 	cat <<-USAGE
 	
-	Usage: $(basename ${0}) [OPTIONS]
-	       $(basename ${0}) [-h|--help]
+	Usage: ${0##*/} [OPTIONS]
+	       ${0##*/} [-h|--help]
 	
 	Options:
 	  -i, --interval=<seconds>            After the first successful check the 
@@ -228,18 +230,18 @@ function __usage ()
 
 function main ()
 {
-	local -r STATUS_PATH="/var/lib/healthcheck/status"
 	local -r mysqld="/usr/sbin/mysqld"
 	local -r pattern_seconds_in_minute='^([1-9]|[1-5][0-9]|60)$'
 	local -r redacted_value="********"
+	local -r status_path="/var/lib/healthcheck/status"
 	local -r system_timezone="$(
 		__get_system_timezone
 	)"
 	local -r zone="$(
 		system-timezone -qq
 	)"
 
-	local QUIET="false"
+	local quiet="false"
 	local -i interval=10
 
 	# Trap and record the exit status
@@ -262,7 +264,7 @@ function main ()
 				shift 1
 				;;
 			-q|--quiet)
-				QUIET="true"
+				quiet="true"
 				shift 1
 				;;
 			*)
@@ -296,10 +298,9 @@ function main ()
 		exit 1
 	fi
 
-	# mysqld-bootstrap
 	if [[ ${ENABLE_MYSQLD_BOOTSTRAP} == true ]]
 	then
-		if [[ -e /var/lock/subsys/mysqld-bootstrap ]] \
+		if [[ -f /var/lock/subsys/mysqld-bootstrap ]] \
 			|| ! __is_mysql_data_directory_populated
 		then
 			__print_message \
@@ -309,7 +310,6 @@ function main ()
 		fi
 	fi
 
-	# mysqld-wrapper
 	if [[ ${ENABLE_MYSQLD_WRAPPER} == true ]]
 	then
 		if ! ps axo command \
@@ -338,6 +338,7 @@ function main ()
 		if ! __have_mysql_access
 		then
 			__print_message \
+				"error" \
 				"root@localhost access failed."
 			exit 1
 		fi