From 8d00a81aec482f45f59e88b9456bb09cddd1742f Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Thu, 16 Sep 2021 04:12:58 +0000
Subject: [PATCH] 6.15.2-6-debian-10-r355 release

---
 bitnami/ejbca/6/debian-10/Dockerfile          |  2 +-
 .../prebuildfs/opt/bitnami/scripts/libos.sh   | 43 ++++++++++++++++++-
 bitnami/ejbca/README.md                       |  2 +-
 3 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/bitnami/ejbca/6/debian-10/Dockerfile b/bitnami/ejbca/6/debian-10/Dockerfile
index f642bea4e0e9..743ae38eeef5 100644
--- a/bitnami/ejbca/6/debian-10/Dockerfile
+++ b/bitnami/ejbca/6/debian-10/Dockerfile
@@ -20,7 +20,7 @@ COPY rootfs /
 RUN /opt/bitnami/scripts/ejbca/postunpack.sh
 ENV ALLOW_EMPTY_PASSWORD="no" \
     BITNAMI_APP_NAME="ejbca" \
-    BITNAMI_IMAGE_VERSION="6.15.2-6-debian-10-r354" \
+    BITNAMI_IMAGE_VERSION="6.15.2-6-debian-10-r355" \
     MARIADB_HOST="mariadb" \
     MARIADB_PORT_NUMBER="3306" \
     MARIADB_ROOT_PASSWORD="" \
diff --git a/bitnami/ejbca/6/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/ejbca/6/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh
index a8323db72d93..4265aae0a673 100644
--- a/bitnami/ejbca/6/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh
+++ b/bitnami/ejbca/6/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh
@@ -141,10 +141,51 @@ am_i_root() {
     if [[ "$(id -u)" = "0" ]]; then
         true
     else
-	false
+        false
     fi
 }
 
+########################
+# Print OS metadata
+# Arguments:
+#   $1 - Flag name
+# Flags:
+#   --id - Distro ID
+#   --version - Distro version
+#   --branch - Distro branch
+#   --codename - Distro codename
+# Returns:
+#   String
+#########################
+get_os_metadata() {
+    local -r flag_name="${1:?missing flag}"
+    # Helper function
+    get_os_release_metadata() {
+        local -r env_name="${1:?missing environment variable name}"
+        (
+            . /etc/os-release
+            echo "${!env_name}"
+        )
+    }
+    case "$flag_name" in
+        --id)
+            get_os_release_metadata ID
+            ;;
+        --version)
+            get_os_release_metadata VERSION_ID
+            ;;
+        --branch)
+            get_os_release_metadata VERSION_ID | sed 's/\..*//'
+            ;;
+        --codename)
+            get_os_release_metadata VERSION_CODENAME
+            ;;
+        *)
+            error "Unknown flag ${flag_name}"
+            return 1
+    esac
+}
+
 ########################
 # Get total memory available
 # Arguments:
diff --git a/bitnami/ejbca/README.md b/bitnami/ejbca/README.md
index 2509e51f0e6c..b5513a868592 100644
--- a/bitnami/ejbca/README.md
+++ b/bitnami/ejbca/README.md
@@ -37,7 +37,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/containers/how-to/understand-rolling-tags-containers/).
 
 
-* [`6`, `6-debian-10`, `6.15.2-6`, `6.15.2-6-debian-10-r354`, `latest` (6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-ejbca/blob/6.15.2-6-debian-10-r354/6/debian-10/Dockerfile)
+* [`6`, `6-debian-10`, `6.15.2-6`, `6.15.2-6-debian-10-r355`, `latest` (6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-ejbca/blob/6.15.2-6-debian-10-r355/6/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/ejbca GitHub repo](https://github.com/bitnami/bitnami-docker-ejbca).