From 3644a0189c3bbb0a0c9640fec3eb88afee1711ed Mon Sep 17 00:00:00 2001
From: Tianon Gravi <admwiggin@gmail.com>
Date: Tue, 29 Dec 2020 13:47:43 -0800
Subject: [PATCH] If the provided rabbitmq.conf is missing a newline at EOF,
 add one before appending to it

---
 3.8-rc/alpine/docker-entrypoint.sh | 1 +
 3.8-rc/ubuntu/docker-entrypoint.sh | 1 +
 3.8/alpine/docker-entrypoint.sh    | 1 +
 3.8/ubuntu/docker-entrypoint.sh    | 1 +
 docker-entrypoint.sh               | 1 +
 5 files changed, 5 insertions(+)

diff --git a/3.8-rc/alpine/docker-entrypoint.sh b/3.8-rc/alpine/docker-entrypoint.sh
index e1685c06..69093e3a 100755
--- a/3.8-rc/alpine/docker-entrypoint.sh
+++ b/3.8-rc/alpine/docker-entrypoint.sh
@@ -246,6 +246,7 @@ rabbit_set_config() {
 		"s/^[[:space:]]*(${sedKey}[[:space:]]*=[[:space:]]*)\S.*\$/\1${sedVal}/" \
 		"$newConfigFile"
 	if ! grep -qE "^${sedKey}[[:space:]]*=" "$newConfigFile"; then
+		sed -i -e '$a\' "$newConfigFile" # https://github.com/docker-library/rabbitmq/issues/456#issuecomment-752251872 (https://unix.stackexchange.com/a/31955/153467)
 		echo "$key = $val" >> "$newConfigFile"
 	fi
 }
diff --git a/3.8-rc/ubuntu/docker-entrypoint.sh b/3.8-rc/ubuntu/docker-entrypoint.sh
index a06e7099..da789b92 100755
--- a/3.8-rc/ubuntu/docker-entrypoint.sh
+++ b/3.8-rc/ubuntu/docker-entrypoint.sh
@@ -246,6 +246,7 @@ rabbit_set_config() {
 		"s/^[[:space:]]*(${sedKey}[[:space:]]*=[[:space:]]*)\S.*\$/\1${sedVal}/" \
 		"$newConfigFile"
 	if ! grep -qE "^${sedKey}[[:space:]]*=" "$newConfigFile"; then
+		sed -i -e '$a\' "$newConfigFile" # https://github.com/docker-library/rabbitmq/issues/456#issuecomment-752251872 (https://unix.stackexchange.com/a/31955/153467)
 		echo "$key = $val" >> "$newConfigFile"
 	fi
 }
diff --git a/3.8/alpine/docker-entrypoint.sh b/3.8/alpine/docker-entrypoint.sh
index e1685c06..69093e3a 100755
--- a/3.8/alpine/docker-entrypoint.sh
+++ b/3.8/alpine/docker-entrypoint.sh
@@ -246,6 +246,7 @@ rabbit_set_config() {
 		"s/^[[:space:]]*(${sedKey}[[:space:]]*=[[:space:]]*)\S.*\$/\1${sedVal}/" \
 		"$newConfigFile"
 	if ! grep -qE "^${sedKey}[[:space:]]*=" "$newConfigFile"; then
+		sed -i -e '$a\' "$newConfigFile" # https://github.com/docker-library/rabbitmq/issues/456#issuecomment-752251872 (https://unix.stackexchange.com/a/31955/153467)
 		echo "$key = $val" >> "$newConfigFile"
 	fi
 }
diff --git a/3.8/ubuntu/docker-entrypoint.sh b/3.8/ubuntu/docker-entrypoint.sh
index a06e7099..da789b92 100755
--- a/3.8/ubuntu/docker-entrypoint.sh
+++ b/3.8/ubuntu/docker-entrypoint.sh
@@ -246,6 +246,7 @@ rabbit_set_config() {
 		"s/^[[:space:]]*(${sedKey}[[:space:]]*=[[:space:]]*)\S.*\$/\1${sedVal}/" \
 		"$newConfigFile"
 	if ! grep -qE "^${sedKey}[[:space:]]*=" "$newConfigFile"; then
+		sed -i -e '$a\' "$newConfigFile" # https://github.com/docker-library/rabbitmq/issues/456#issuecomment-752251872 (https://unix.stackexchange.com/a/31955/153467)
 		echo "$key = $val" >> "$newConfigFile"
 	fi
 }
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index a06e7099..da789b92 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -246,6 +246,7 @@ rabbit_set_config() {
 		"s/^[[:space:]]*(${sedKey}[[:space:]]*=[[:space:]]*)\S.*\$/\1${sedVal}/" \
 		"$newConfigFile"
 	if ! grep -qE "^${sedKey}[[:space:]]*=" "$newConfigFile"; then
+		sed -i -e '$a\' "$newConfigFile" # https://github.com/docker-library/rabbitmq/issues/456#issuecomment-752251872 (https://unix.stackexchange.com/a/31955/153467)
 		echo "$key = $val" >> "$newConfigFile"
 	fi
 }