From bdeac4c0619cfb4fd46a31bbf755c875dabf76dc Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 8 Apr 2021 05:37:39 +0000 Subject: [PATCH] 2.31.1-debian-10-r11 release --- bitnami/git/2/debian-10/Dockerfile | 2 +- bitnami/git/2/debian-10/docker-compose.yml | 2 +- .../git/2/debian-10/prebuildfs/opt/bitnami/scripts/liblog.sh | 2 +- .../2/debian-10/prebuildfs/opt/bitnami/scripts/libversion.sh | 4 ++-- .../2/debian-10/rootfs/opt/bitnami/scripts/git/entrypoint.sh | 1 + bitnami/git/README.md | 2 +- bitnami/git/docker-compose.yml | 2 +- 7 files changed, 8 insertions(+), 7 deletions(-) diff --git a/bitnami/git/2/debian-10/Dockerfile b/bitnami/git/2/debian-10/Dockerfile index 107bc9e786a5..c1e6ebc36aa3 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.31.1-debian-10-r10" \ + BITNAMI_IMAGE_VERSION="2.31.1-debian-10-r11" \ 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/docker-compose.yml b/bitnami/git/2/debian-10/docker-compose.yml index 3d2e37411eeb..ec19cb69b3f5 100644 --- a/bitnami/git/2/debian-10/docker-compose.yml +++ b/bitnami/git/2/debian-10/docker-compose.yml @@ -1,4 +1,4 @@ version: '2' services: git: - image: docker.io/bitnami/git:2-debian-10 + image: docker.io/bitnami/git:2 diff --git a/bitnami/git/2/debian-10/prebuildfs/opt/bitnami/scripts/liblog.sh b/bitnami/git/2/debian-10/prebuildfs/opt/bitnami/scripts/liblog.sh index 60ec4cbfc32a..cfc824f5ec83 100644 --- a/bitnami/git/2/debian-10/prebuildfs/opt/bitnami/scripts/liblog.sh +++ b/bitnami/git/2/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/git/2/debian-10/prebuildfs/opt/bitnami/scripts/libversion.sh b/bitnami/git/2/debian-10/prebuildfs/opt/bitnami/scripts/libversion.sh index 66d4f457bdd2..f3bc7568bfa5 100644 --- a/bitnami/git/2/debian-10/prebuildfs/opt/bitnami/scripts/libversion.sh +++ b/bitnami/git/2/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/git/2/debian-10/rootfs/opt/bitnami/scripts/git/entrypoint.sh b/bitnami/git/2/debian-10/rootfs/opt/bitnami/scripts/git/entrypoint.sh index c8232bdea516..7ac049b05735 100755 --- a/bitnami/git/2/debian-10/rootfs/opt/bitnami/scripts/git/entrypoint.sh +++ b/bitnami/git/2/debian-10/rootfs/opt/bitnami/scripts/git/entrypoint.sh @@ -1,5 +1,6 @@ #!/bin/bash + set -o errexit set -o nounset set -o pipefail diff --git a/bitnami/git/README.md b/bitnami/git/README.md index 78a007700b43..71576542f450 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.31.1`, `2.31.1-debian-10-r10`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-git/blob/2.31.1-debian-10-r10/2/debian-10/Dockerfile) +* [`2`, `2-debian-10`, `2.31.1`, `2.31.1-debian-10-r11`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-git/blob/2.31.1-debian-10-r11/2/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/git GitHub repo](https://github.com/bitnami/bitnami-docker-git). diff --git a/bitnami/git/docker-compose.yml b/bitnami/git/docker-compose.yml index 3d2e37411eeb..ec19cb69b3f5 100644 --- a/bitnami/git/docker-compose.yml +++ b/bitnami/git/docker-compose.yml @@ -1,4 +1,4 @@ version: '2' services: git: - image: docker.io/bitnami/git:2-debian-10 + image: docker.io/bitnami/git:2