From dd26e48474f3ce4c5844463c3eee58b5d981e031 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Tue, 4 Feb 2020 16:47:29 +0000
Subject: [PATCH] 1.5.22-debian-10-r2 release

---
 bitnami/memcached/1/debian-10/Dockerfile      |  2 +-
 .../1/debian-10/prebuildfs/libfile.sh         | 52 ++++++++++++++++---
 bitnami/memcached/README.md                   |  2 +-
 3 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/bitnami/memcached/1/debian-10/Dockerfile b/bitnami/memcached/1/debian-10/Dockerfile
index 70643fc5444b..0278ca1cb74e 100644
--- a/bitnami/memcached/1/debian-10/Dockerfile
+++ b/bitnami/memcached/1/debian-10/Dockerfile
@@ -17,7 +17,7 @@ RUN /build/install-gosu.sh
 COPY rootfs /
 RUN /postunpack.sh
 ENV BITNAMI_APP_NAME="memcached" \
-    BITNAMI_IMAGE_VERSION="1.5.22-debian-10-r1" \
+    BITNAMI_IMAGE_VERSION="1.5.22-debian-10-r2" \
     PATH="/opt/bitnami/memcached/bin:$PATH"
 
 EXPOSE 11211
diff --git a/bitnami/memcached/1/debian-10/prebuildfs/libfile.sh b/bitnami/memcached/1/debian-10/prebuildfs/libfile.sh
index 12010f043e49..337e2e779701 100644
--- a/bitnami/memcached/1/debian-10/prebuildfs/libfile.sh
+++ b/bitnami/memcached/1/debian-10/prebuildfs/libfile.sh
@@ -5,18 +5,56 @@
 # Functions
 
 ########################
-# Ensure a line exists in the file by replacing a matching line.
+# Replace a regex in a file
 # Arguments:
 #   $1 - filename
-#   $2 - line
-#   $3 - match
+#   $2 - match regex
+#   $3 - substitute regex
+#   $4 - use POSIX regex. Default: true
 # Returns:
 #   None
 #########################
-file_contains_line() {
+replace_in_file() {
     local filename="${1:?filename is required}"
-    local line="${2:?line is required}"
-    local match="${3:?match is required}"
+    local match_regex="${2:?match regex is required}"
+    local substitute_regex="${3:?substitute regex is required}"
+    local posix_regex=${4:-true}
 
-    sed --in-place "s/^$match\$/$line/" "$filename"
+    local result
+
+    # We should avoid using 'sed in-place' substitutions
+    # 1) They are not compatible with files mounted from ConfigMap(s)
+    # 2) We found incompatibility issues with Debian10 and "in-place" substitutions
+    if [[ $posix_regex = true ]]; then
+        result="$(sed -E "s@$match_regex@$substitute_regex@g" "$filename")"
+    else
+        result="$(sed "s@$match_regex@$substitute_regex@g" "$filename")"
+    fi
+    echo "$result" > "$filename"
+}
+
+########################
+# Remove a line in a file based on a regex
+# Arguments:
+#   $1 - filename
+#   $2 - match regex
+#   $3 - use POSIX regex. Default: true
+# Returns:
+#   None
+#########################
+remove_in_file() {
+    local filename="${1:?filename is required}"
+    local match_regex="${2:?match regex is required}"
+    local posix_regex=${3:-true}
+    local result
+
+    # We should avoid using 'sed in-place' substitutions
+    # 1) They are not compatible with files mounted from ConfigMap(s)
+    # 2) We found incompatibility issues with Debian10 and "in-place" substitutions
+    if [[ $posix_regex = true ]]; then
+        result="$(sed -E "/$match_regex/d" "$filename")"
+    else
+        result="$(sed "/$match_regex/d" "$filename")"
+    fi
+    echo "$result" > "$filename"
 }
diff --git a/bitnami/memcached/README.md b/bitnami/memcached/README.md
index 873f84655da8..37e1e274ce51 100644
--- a/bitnami/memcached/README.md
+++ b/bitnami/memcached/README.md
@@ -47,7 +47,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 
 
 * [`1-ol-7`, `1.5.22-ol-7-r1` (1/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-memcached/blob/1.5.22-ol-7-r1/1/ol-7/Dockerfile)
-* [`1-debian-10`, `1.5.22-debian-10-r1`, `1`, `1.5.22`, `latest` (1/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-memcached/blob/1.5.22-debian-10-r1/1/debian-10/Dockerfile)
+* [`1-debian-10`, `1.5.22-debian-10-r2`, `1`, `1.5.22`, `latest` (1/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-memcached/blob/1.5.22-debian-10-r2/1/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/memcached GitHub repo](https://github.com/bitnami/bitnami-docker-memcached).