From 4728a30ee297a369dd5d770aaff43b9da547e71d Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Thu, 5 Aug 2021 02:31:04 +0000
Subject: [PATCH] 10.17.0-debian-10-r61 release

---
 bitnami/postgresql-repmgr/10/debian-10/Dockerfile               | 2 +-
 .../10/debian-10/rootfs/opt/bitnami/scripts/librepmgr.sh        | 2 +-
 bitnami/postgresql-repmgr/README.md                             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bitnami/postgresql-repmgr/10/debian-10/Dockerfile b/bitnami/postgresql-repmgr/10/debian-10/Dockerfile
index df1baad03a42..bd87b2ec4d02 100644
--- a/bitnami/postgresql-repmgr/10/debian-10/Dockerfile
+++ b/bitnami/postgresql-repmgr/10/debian-10/Dockerfile
@@ -22,7 +22,7 @@ COPY rootfs /
 RUN /opt/bitnami/scripts/postgresql-repmgr/postunpack.sh
 RUN /opt/bitnami/scripts/locales/add-extra-locales.sh
 ENV BITNAMI_APP_NAME="postgresql-repmgr" \
-    BITNAMI_IMAGE_VERSION="10.17.0-debian-10-r60" \
+    BITNAMI_IMAGE_VERSION="10.17.0-debian-10-r61" \
     LANG="en_US.UTF-8" \
     LANGUAGE="en_US:en" \
     NSS_WRAPPER_LIB="/opt/bitnami/common/lib/libnss_wrapper.so" \
diff --git a/bitnami/postgresql-repmgr/10/debian-10/rootfs/opt/bitnami/scripts/librepmgr.sh b/bitnami/postgresql-repmgr/10/debian-10/rootfs/opt/bitnami/scripts/librepmgr.sh
index 5f7aa9dc181e..be6c758af6ba 100644
--- a/bitnami/postgresql-repmgr/10/debian-10/rootfs/opt/bitnami/scripts/librepmgr.sh
+++ b/bitnami/postgresql-repmgr/10/debian-10/rootfs/opt/bitnami/scripts/librepmgr.sh
@@ -473,7 +473,7 @@ EOF
 
     if [[ -f "${REPMGR_MOUNTED_CONF_DIR}/repmgr.conf" ]]; then
         # remove from default the overrided keys, and append the desired conf
-        grep -v -f "${REPMGR_CONF_FILE}.tmp" "${REPMGR_MOUNTED_CONF_DIR}/repmgr.conf" | awk -F"=" '{print $1;}' > "${REPMGR_CONF_FILE}.keys" && grep -v -f "${REPMGR_CONF_FILE}.keys" "${REPMGR_CONF_FILE}.tmp" > "$REPMGR_CONF_FILE" && cat "${REPMGR_MOUNTED_CONF_DIR}/repmgr.conf" >> "$REPMGR_CONF_FILE"
+        grep -xvFf "${REPMGR_CONF_FILE}.tmp" "${REPMGR_MOUNTED_CONF_DIR}/repmgr.conf" | awk -F"=" '{print $1;}' > "${REPMGR_CONF_FILE}.keys" && grep -v -f "${REPMGR_CONF_FILE}.keys" "${REPMGR_CONF_FILE}.tmp" > "$REPMGR_CONF_FILE" && cat "${REPMGR_MOUNTED_CONF_DIR}/repmgr.conf" >> "$REPMGR_CONF_FILE"
     else
         cp "${REPMGR_CONF_FILE}.tmp" "${REPMGR_CONF_FILE}"
     fi
diff --git a/bitnami/postgresql-repmgr/README.md b/bitnami/postgresql-repmgr/README.md
index 225bbbd34532..c225f45a8e78 100644
--- a/bitnami/postgresql-repmgr/README.md
+++ b/bitnami/postgresql-repmgr/README.md
@@ -46,7 +46,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 * [`13`, `13-debian-10`, `13.3.0`, `13.3.0-debian-10-r68` (13/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/13.3.0-debian-10-r68/13/debian-10/Dockerfile)
 * [`12`, `12-debian-10`, `12.7.0`, `12.7.0-debian-10-r73` (12/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/12.7.0-debian-10-r73/12/debian-10/Dockerfile)
 * [`11`, `11-debian-10`, `11.12.0`, `11.12.0-debian-10-r71`, `latest` (11/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/11.12.0-debian-10-r71/11/debian-10/Dockerfile)
-* [`10`, `10-debian-10`, `10.17.0`, `10.17.0-debian-10-r60` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/10.17.0-debian-10-r60/10/debian-10/Dockerfile)
+* [`10`, `10-debian-10`, `10.17.0`, `10.17.0-debian-10-r61` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/10.17.0-debian-10-r61/10/debian-10/Dockerfile)
 * [`9.6`, `9.6-debian-10`, `9.6.22`, `9.6.22-debian-10-r71` (9.6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/9.6.22-debian-10-r71/9.6/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/postgresql-repmgr GitHub repo](https://github.com/bitnami/bitnami-docker-postgresql-repmgr).