diff --git a/bitnami/git/2/debian-10/Dockerfile b/bitnami/git/2/debian-10/Dockerfile index ffd1d012c6bb..9fe922f40902 100644 --- a/bitnami/git/2/debian-10/Dockerfile +++ b/bitnami/git/2/debian-10/Dockerfile @@ -14,7 +14,7 @@ RUN /build/bitnami-user.sh COPY rootfs / ENV BITNAMI_APP_NAME="git" \ - BITNAMI_IMAGE_VERSION="2.33.0-debian-10-r29" \ + BITNAMI_IMAGE_VERSION="2.33.0-debian-10-r30" \ NSS_WRAPPER_LIB="/opt/bitnami/common/lib/libnss_wrapper.so" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/git/bin:$PATH" diff --git a/bitnami/git/2/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/git/2/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh index a8323db72d93..4265aae0a673 100644 --- a/bitnami/git/2/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/git/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/git/README.md b/bitnami/git/README.md index e6f8cf3affe5..eaa4b0807479 100644 --- a/bitnami/git/README.md +++ b/bitnami/git/README.md @@ -28,7 +28,7 @@ $ docker run --name git bitnami/git:latest 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.33.0`, `2.33.0-debian-10-r29`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-git/blob/2.33.0-debian-10-r29/2/debian-10/Dockerfile) +* [`2`, `2-debian-10`, `2.33.0`, `2.33.0-debian-10-r30`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-git/blob/2.33.0-debian-10-r30/2/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/git GitHub repo](https://github.com/bitnami/bitnami-docker-git).