diff --git a/bitnami/git/2/debian-10/Dockerfile b/bitnami/git/2/debian-10/Dockerfile index b1f6b22107f7..c0730f1d7c3e 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-r6" \ + BITNAMI_IMAGE_VERSION="2.33.0-debian-10-r7" \ 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/libfile.sh b/bitnami/git/2/debian-10/prebuildfs/opt/bitnami/scripts/libfile.sh index dd47f25e4e45..41ebaf7464f6 100644 --- a/bitnami/git/2/debian-10/prebuildfs/opt/bitnami/scripts/libfile.sh +++ b/bitnami/git/2/debian-10/prebuildfs/opt/bitnami/scripts/libfile.sh @@ -10,7 +10,7 @@ # Functions ######################## -# Replace a regex in a file +# Replace a regex-matching string in a file # Arguments: # $1 - filename # $2 - match regex @@ -30,7 +30,7 @@ replace_in_file() { # We should avoid using 'sed in-place' substitutions # 1) They are not compatible with files mounted from ConfigMap(s) # 2) We found incompatibility issues with Debian10 and "in-place" substitutions - del=$'\001' # Use a non-printable character as a 'sed' delimiter to avoid issues + local -r del=$'\001' # Use a non-printable character as a 'sed' delimiter to avoid issues if [[ $posix_regex = true ]]; then result="$(sed -E "s${del}${match_regex}${del}${substitute_regex}${del}g" "$filename")" else @@ -39,6 +39,26 @@ replace_in_file() { echo "$result" > "$filename" } +######################## +# Replace a regex-matching multiline string in a file +# Arguments: +# $1 - filename +# $2 - match regex +# $3 - substitute regex +# Returns: +# None +######################### +replace_in_file_multiline() { + local filename="${1:?filename is required}" + local match_regex="${2:?match regex is required}" + local substitute_regex="${3:?substitute regex is required}" + + local result + local -r del=$'\001' # Use a non-printable character as a 'sed' delimiter to avoid issues + result="$(perl -pe "BEGIN{undef $/;} s${del}${match_regex}${del}${substitute_regex}${del}sg" "$filename")" + echo "$result" > "$filename" +} + ######################## # Remove a line in a file based on a regex # Arguments: diff --git a/bitnami/git/README.md b/bitnami/git/README.md index 1031001f21ea..5bdcef38191d 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-r6`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-git/blob/2.33.0-debian-10-r6/2/debian-10/Dockerfile) +* [`2`, `2-debian-10`, `2.33.0`, `2.33.0-debian-10-r7`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-git/blob/2.33.0-debian-10-r7/2/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/git GitHub repo](https://github.com/bitnami/bitnami-docker-git).