From a44120ee79a8e7a74f92fbf3aa6cfd2eba95e71d Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Thu, 8 Apr 2021 03:58:12 +0000
Subject: [PATCH] 3.4.15-debian-10-r36 release

---
 bitnami/etcd/3/debian-10/Dockerfile                         | 2 +-
 bitnami/etcd/3/debian-10/docker-compose.yml                 | 2 +-
 .../3/debian-10/prebuildfs/opt/bitnami/scripts/liblog.sh    | 2 +-
 .../debian-10/prebuildfs/opt/bitnami/scripts/libversion.sh  | 4 ++--
 .../etcd/3/debian-10/rootfs/opt/bitnami/scripts/etcd/run.sh | 3 +--
 .../etcd/3/debian-10/rootfs/opt/bitnami/scripts/libetcd.sh  | 3 +--
 bitnami/etcd/README.md                                      | 2 +-
 bitnami/etcd/docker-compose-cluster.yml                     | 6 +++---
 bitnami/etcd/docker-compose.yml                             | 2 +-
 9 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/bitnami/etcd/3/debian-10/Dockerfile b/bitnami/etcd/3/debian-10/Dockerfile
index d0611fa5fdf3..a3f88c4e7bba 100644
--- a/bitnami/etcd/3/debian-10/Dockerfile
+++ b/bitnami/etcd/3/debian-10/Dockerfile
@@ -17,7 +17,7 @@ RUN chmod g+rwX /opt/bitnami
 COPY rootfs /
 RUN /opt/bitnami/scripts/etcd/postunpack.sh
 ENV BITNAMI_APP_NAME="etcd" \
-    BITNAMI_IMAGE_VERSION="3.4.15-debian-10-r35" \
+    BITNAMI_IMAGE_VERSION="3.4.15-debian-10-r36" \
     ETCDCTL_API="3"
 
 EXPOSE 2379 2380
diff --git a/bitnami/etcd/3/debian-10/docker-compose.yml b/bitnami/etcd/3/debian-10/docker-compose.yml
index 563021b68be2..97da0b02343a 100644
--- a/bitnami/etcd/3/debian-10/docker-compose.yml
+++ b/bitnami/etcd/3/debian-10/docker-compose.yml
@@ -2,7 +2,7 @@ version: '2'
 
 services:
   etcd:
-    image: docker.io/bitnami/etcd:3-debian-10
+    image: docker.io/bitnami/etcd:3
     environment:
       - ALLOW_NONE_AUTHENTICATION=yes
     volumes:
diff --git a/bitnami/etcd/3/debian-10/prebuildfs/opt/bitnami/scripts/liblog.sh b/bitnami/etcd/3/debian-10/prebuildfs/opt/bitnami/scripts/liblog.sh
index 60ec4cbfc32a..cfc824f5ec83 100644
--- a/bitnami/etcd/3/debian-10/prebuildfs/opt/bitnami/scripts/liblog.sh
+++ b/bitnami/etcd/3/debian-10/prebuildfs/opt/bitnami/scripts/liblog.sh
@@ -106,5 +106,5 @@ indent() {
     for ((i = 0; i < num; i++)); do
         indent_unit="${indent_unit}${char}"
     done
-    echo "$string" | sed "s/^/${indent_unit}/"
+    echo "${string//^/${indent_unit}}"
 }
diff --git a/bitnami/etcd/3/debian-10/prebuildfs/opt/bitnami/scripts/libversion.sh b/bitnami/etcd/3/debian-10/prebuildfs/opt/bitnami/scripts/libversion.sh
index 66d4f457bdd2..f3bc7568bfa5 100644
--- a/bitnami/etcd/3/debian-10/prebuildfs/opt/bitnami/scripts/libversion.sh
+++ b/bitnami/etcd/3/debian-10/prebuildfs/opt/bitnami/scripts/libversion.sh
@@ -9,7 +9,7 @@
 
 # Functions
 ########################
-# Gets semantic version 
+# Gets semantic version
 # Arguments:
 #   $1 - version: string to extract major.minor.patch
 #   $2 - section: 1 to extract major, 2 to extract minor, 3 to extract patch
@@ -38,7 +38,7 @@ get_sematic_version () {
         done
 
         local number_regex='^[0-9]+$'
-        if [[ "$section" =~ $number_regex ]] && (( $section > 0 )) && (( $section <= 3 )); then
+        if [[ "$section" =~ $number_regex ]] && (( section > 0 )) && (( section <= 3 )); then
              echo "${version_sections[$section]}"
              return
         else
diff --git a/bitnami/etcd/3/debian-10/rootfs/opt/bitnami/scripts/etcd/run.sh b/bitnami/etcd/3/debian-10/rootfs/opt/bitnami/scripts/etcd/run.sh
index 88072d6e0be2..0c922c441de9 100755
--- a/bitnami/etcd/3/debian-10/rootfs/opt/bitnami/scripts/etcd/run.sh
+++ b/bitnami/etcd/3/debian-10/rootfs/opt/bitnami/scripts/etcd/run.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 
-# shellcheck disable=SC1090
-# shellcheck disable=SC1091
+# shellcheck disable=SC1090,SC1091
 
 set -o errexit
 set -o nounset
diff --git a/bitnami/etcd/3/debian-10/rootfs/opt/bitnami/scripts/libetcd.sh b/bitnami/etcd/3/debian-10/rootfs/opt/bitnami/scripts/libetcd.sh
index 71aa93676d21..c82c5aed4661 100644
--- a/bitnami/etcd/3/debian-10/rootfs/opt/bitnami/scripts/libetcd.sh
+++ b/bitnami/etcd/3/debian-10/rootfs/opt/bitnami/scripts/libetcd.sh
@@ -2,8 +2,7 @@
 #
 # Bitnami etcd library
 
-# shellcheck disable=SC1090
-# shellcheck disable=SC1091
+# shellcheck disable=SC1090,SC1091
 
 # Load Generic Libraries
 . /opt/bitnami/scripts/libfile.sh
diff --git a/bitnami/etcd/README.md b/bitnami/etcd/README.md
index e34c09f93365..067080dbea32 100644
--- a/bitnami/etcd/README.md
+++ b/bitnami/etcd/README.md
@@ -44,7 +44,7 @@ Non-root container images add an extra layer of security and are generally recom
 Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/).
 
 
-* [`3`, `3-debian-10`, `3.4.15`, `3.4.15-debian-10-r35`, `latest` (3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-etcd/blob/3.4.15-debian-10-r35/3/debian-10/Dockerfile)
+* [`3`, `3-debian-10`, `3.4.15`, `3.4.15-debian-10-r36`, `latest` (3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-etcd/blob/3.4.15-debian-10-r36/3/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/etcd GitHub repo](https://github.com/bitnami/bitnami-docker-etcd).
 
diff --git a/bitnami/etcd/docker-compose-cluster.yml b/bitnami/etcd/docker-compose-cluster.yml
index 9d77f2a1ae59..2c2e62ad8c56 100644
--- a/bitnami/etcd/docker-compose-cluster.yml
+++ b/bitnami/etcd/docker-compose-cluster.yml
@@ -2,7 +2,7 @@ version: '2'
 
 services:
   etcd1:
-    image: docker.io/bitnami/etcd:3-debian-10
+    image: docker.io/bitnami/etcd:3
     environment:
       - ALLOW_NONE_AUTHENTICATION=yes
       - ETCD_NAME=etcd1
@@ -14,7 +14,7 @@ services:
       - ETCD_INITIAL_CLUSTER=etcd1=http://etcd1:2380,etcd2=http://etcd2:2380,etcd3=http://etcd3:2380
       - ETCD_INITIAL_CLUSTER_STATE=new
   etcd2:
-    image: docker.io/bitnami/etcd:3-debian-10
+    image: docker.io/bitnami/etcd:3
     environment:
       - ALLOW_NONE_AUTHENTICATION=yes
       - ETCD_NAME=etcd2
@@ -26,7 +26,7 @@ services:
       - ETCD_INITIAL_CLUSTER=etcd1=http://etcd1:2380,etcd2=http://etcd2:2380,etcd3=http://etcd3:2380
       - ETCD_INITIAL_CLUSTER_STATE=new
   etcd3:
-    image: docker.io/bitnami/etcd:3-debian-10
+    image: docker.io/bitnami/etcd:3
     environment:
       - ALLOW_NONE_AUTHENTICATION=yes
       - ETCD_NAME=etcd3
diff --git a/bitnami/etcd/docker-compose.yml b/bitnami/etcd/docker-compose.yml
index 563021b68be2..97da0b02343a 100644
--- a/bitnami/etcd/docker-compose.yml
+++ b/bitnami/etcd/docker-compose.yml
@@ -2,7 +2,7 @@ version: '2'
 
 services:
   etcd:
-    image: docker.io/bitnami/etcd:3-debian-10
+    image: docker.io/bitnami/etcd:3
     environment:
       - ALLOW_NONE_AUTHENTICATION=yes
     volumes: