From 794d73d83832eac8cbb1846353a9e7ac5e2f12b4 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Wed, 15 Sep 2021 22:52:53 +0000 Subject: [PATCH] 2.3.2-debian-10-r23 release --- bitnami/harbor-core/2/debian-10/Dockerfile | 2 +- .../prebuildfs/opt/bitnami/scripts/libos.sh | 43 ++++++++++++++++++- bitnami/harbor-core/README.md | 2 +- 3 files changed, 44 insertions(+), 3 deletions(-) diff --git a/bitnami/harbor-core/2/debian-10/Dockerfile b/bitnami/harbor-core/2/debian-10/Dockerfile index 3d8424e5fce8..0e30d541f849 100644 --- a/bitnami/harbor-core/2/debian-10/Dockerfile +++ b/bitnami/harbor-core/2/debian-10/Dockerfile @@ -18,7 +18,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/harbor-core/postunpack.sh ENV BITNAMI_APP_NAME="harbor-core" \ - BITNAMI_IMAGE_VERSION="2.3.2-debian-10-r22" \ + BITNAMI_IMAGE_VERSION="2.3.2-debian-10-r23" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/harbor-core/bin:$PATH" VOLUME [ "/data", "/etc/core" ] diff --git a/bitnami/harbor-core/2/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/harbor-core/2/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh index a8323db72d93..4265aae0a673 100644 --- a/bitnami/harbor-core/2/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/harbor-core/2/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/harbor-core/README.md b/bitnami/harbor-core/README.md index 2862f568e6ae..2b98b702cfdf 100644 --- a/bitnami/harbor-core/README.md +++ b/bitnami/harbor-core/README.md @@ -42,7 +42,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/). -* [`2`, `2-debian-10`, `2.3.2`, `2.3.2-debian-10-r22`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-harbor-core/blob/2.3.2-debian-10-r22/2/debian-10/Dockerfile) +* [`2`, `2-debian-10`, `2.3.2`, `2.3.2-debian-10-r23`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-harbor-core/blob/2.3.2-debian-10-r23/2/debian-10/Dockerfile) # Configuration