diff --git a/bitnami/git/2/debian-10/Dockerfile b/bitnami/git/2/debian-10/Dockerfile index 5f4cbb6955b9..8fcdecb3ce31 100644 --- a/bitnami/git/2/debian-10/Dockerfile +++ b/bitnami/git/2/debian-10/Dockerfile @@ -15,7 +15,7 @@ RUN apt-get update && apt-get upgrade -y && \ RUN /build/bitnami-user.sh ENV BITNAMI_APP_NAME="git" \ - BITNAMI_IMAGE_VERSION="2.27.0-debian-10-r19" \ + BITNAMI_IMAGE_VERSION="2.27.0-debian-10-r20" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/git/bin:$PATH" ENTRYPOINT [ "git" ] 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 fab3aed61bd5..17309d011b4f 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 @@ -102,12 +102,28 @@ get_total_memory() { # Globals: # None # Arguments: -# $1 - memory size (optional) +# None +# Flags: +# --memory - memory size (optional) # Returns: # Detected instance size ######################### get_machine_size() { - local memory="${1:-}" + local memory="" + # Validate arguments + while [[ "$#" -gt 0 ]]; do + case "$1" in + --memory) + shift + memory="${1:?missing memory}" + ;; + *) + echo "Invalid command line flag $1" >&2 + return 1 + ;; + esac + shift + done if [[ -z "$memory" ]]; then debug "Memory was not specified, detecting available memory automatically" memory="$(get_total_memory)" @@ -152,10 +168,10 @@ get_supported_machine_sizes() { ######################### convert_to_mb() { local amount="${1:-}" - if [[ $amount =~ ^([0-9]+)(M|G) ]]; then + if [[ $amount =~ ^([0-9]+)(m|M|g|G) ]]; then size="${BASH_REMATCH[1]}" unit="${BASH_REMATCH[2]}" - if [[ "$unit" = "G" ]]; then + if [[ "$unit" = "g" || "$unit" = "G" ]]; then amount="$((size * 1024))" else amount="$size" diff --git a/bitnami/git/README.md b/bitnami/git/README.md index e97b3f7ae640..4ea10c4e9e57 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-debian-10`, `2.27.0-debian-10-r19`, `2`, `2.27.0`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-git/blob/2.27.0-debian-10-r19/2/debian-10/Dockerfile) +* [`2-debian-10`, `2.27.0-debian-10-r20`, `2`, `2.27.0`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-git/blob/2.27.0-debian-10-r20/2/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/git GitHub repo](https://github.com/bitnami/bitnami-docker-git).