Check for mounted config file to copy (#1)

Author: j4mcs

3.7-rc/alpine/docker-entrypoint.sh

@@ -202,7 +202,7 @@ oldConfigFile="$configBase.config"
 newConfigFile="$configBase.conf"
 
 shouldWriteConfig="$haveConfig"
-if [ -n "$shouldWriteConfig" ] && [ -f "$newConfigFile" ] && [ ! -w "$newConfigFile" ]; then
+if [ -n "$shouldWriteConfig" ] && [ -f "$newConfigFile" ] && { [ ! -w "$newConfigFile" ] || [ "$(grep -sq "$newConfigFile" /proc/mounts; echo $?)" -eq 0 ]; }; then
 	# config file exist but it isn't writeable (e.g. Kubernetes v1.9.4+ configMap mount)
 	tmp="/tmp/rabbitmq.conf"
 	cat "$newConfigFile" > "${tmp}"

3.7-rc/ubuntu/docker-entrypoint.sh

@@ -202,7 +202,7 @@ oldConfigFile="$configBase.config"
 newConfigFile="$configBase.conf"
 
 shouldWriteConfig="$haveConfig"
-if [ -n "$shouldWriteConfig" ] && [ -f "$newConfigFile" ] && [ ! -w "$newConfigFile" ]; then
+if [ -n "$shouldWriteConfig" ] && [ -f "$newConfigFile" ] && { [ ! -w "$newConfigFile" ] || [ "$(grep -sq "$newConfigFile" /proc/mounts; echo $?)" -eq 0 ]; }; then
 	# config file exist but it isn't writeable (e.g. Kubernetes v1.9.4+ configMap mount)
 	tmp="/tmp/rabbitmq.conf"
 	cat "$newConfigFile" > "${tmp}"

3.7/alpine/docker-entrypoint.sh

@@ -202,7 +202,7 @@ oldConfigFile="$configBase.config"
 newConfigFile="$configBase.conf"
 
 shouldWriteConfig="$haveConfig"
-if [ -n "$shouldWriteConfig" ] && [ -f "$newConfigFile" ] && [ ! -w "$newConfigFile" ]; then
+if [ -n "$shouldWriteConfig" ] && [ -f "$newConfigFile" ] && { [ ! -w "$newConfigFile" ] || [ "$(grep -sq "$newConfigFile" /proc/mounts; echo $?)" -eq 0 ]; }; then
 	# config file exist but it isn't writeable (e.g. Kubernetes v1.9.4+ configMap mount)
 	tmp="/tmp/rabbitmq.conf"
 	cat "$newConfigFile" > "${tmp}"

3.7/ubuntu/docker-entrypoint.sh

@@ -202,7 +202,7 @@ oldConfigFile="$configBase.config"
 newConfigFile="$configBase.conf"
 
 shouldWriteConfig="$haveConfig"
-if [ -n "$shouldWriteConfig" ] && [ -f "$newConfigFile" ] && [ ! -w "$newConfigFile" ]; then
+if [ -n "$shouldWriteConfig" ] && [ -f "$newConfigFile" ] && { [ ! -w "$newConfigFile" ] || [ "$(grep -sq "$newConfigFile" /proc/mounts; echo $?)" -eq 0 ]; }; then
 	# config file exist but it isn't writeable (e.g. Kubernetes v1.9.4+ configMap mount)
 	tmp="/tmp/rabbitmq.conf"
 	cat "$newConfigFile" > "${tmp}"

3.8-rc/alpine/docker-entrypoint.sh

@@ -202,7 +202,7 @@ oldConfigFile="$configBase.config"
 newConfigFile="$configBase.conf"
 
 shouldWriteConfig="$haveConfig"
-if [ -n "$shouldWriteConfig" ] && [ -f "$newConfigFile" ] && [ ! -w "$newConfigFile" ]; then
+if [ -n "$shouldWriteConfig" ] && [ -f "$newConfigFile" ] && { [ ! -w "$newConfigFile" ] || [ "$(grep -sq "$newConfigFile" /proc/mounts; echo $?)" -eq 0 ]; }; then
 	# config file exist but it isn't writeable (e.g. Kubernetes v1.9.4+ configMap mount)
 	tmp="/tmp/rabbitmq.conf"
 	cat "$newConfigFile" > "${tmp}"

3.8-rc/ubuntu/docker-entrypoint.sh

@@ -202,7 +202,7 @@ oldConfigFile="$configBase.config"
 newConfigFile="$configBase.conf"
 
 shouldWriteConfig="$haveConfig"
-if [ -n "$shouldWriteConfig" ] && [ -f "$newConfigFile" ] && [ ! -w "$newConfigFile" ]; then
+if [ -n "$shouldWriteConfig" ] && [ -f "$newConfigFile" ] && { [ ! -w "$newConfigFile" ] || [ "$(grep -sq "$newConfigFile" /proc/mounts; echo $?)" -eq 0 ]; }; then
 	# config file exist but it isn't writeable (e.g. Kubernetes v1.9.4+ configMap mount)
 	tmp="/tmp/rabbitmq.conf"
 	cat "$newConfigFile" > "${tmp}"

docker-entrypoint.sh

@@ -202,7 +202,7 @@ oldConfigFile="$configBase.config"
 newConfigFile="$configBase.conf"
 
 shouldWriteConfig="$haveConfig"
-if [ -n "$shouldWriteConfig" ] && [ -f "$newConfigFile" ] && [ ! -w "$newConfigFile" ]; then
+if [ -n "$shouldWriteConfig" ] && [ -f "$newConfigFile" ] && { [ ! -w "$newConfigFile" ] || [ "$(grep -sq "$newConfigFile" /proc/mounts; echo $?)" -eq 0 ]; }; then
 	# config file exist but it isn't writeable (e.g. Kubernetes v1.9.4+ configMap mount)
 	tmp="/tmp/rabbitmq.conf"
 	cat "$newConfigFile" > "${tmp}"