From a461ee69bd239e961a9bc7e2341a296290bc600c Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Mon, 11 May 2020 20:11:55 +0000 Subject: [PATCH] 2.26.2-debian-10-r20 release --- bitnami/git/2/debian-10/Dockerfile | 2 +- .../2/debian-10/prebuildfs/opt/bitnami/scripts/libfile.sh | 5 +++-- bitnami/git/README.md | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/bitnami/git/2/debian-10/Dockerfile b/bitnami/git/2/debian-10/Dockerfile index f1e0bc92708a..70c6ae6f7ff6 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.26.2-debian-10-r19" \ + BITNAMI_IMAGE_VERSION="2.26.2-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/libfile.sh b/bitnami/git/2/debian-10/prebuildfs/opt/bitnami/scripts/libfile.sh index 337e2e779701..8cdb3dfd0b7f 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 @@ -25,10 +25,11 @@ 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 if [[ $posix_regex = true ]]; then - result="$(sed -E "s@$match_regex@$substitute_regex@g" "$filename")" + result="$(sed -E "s${del}${match_regex}${del}${substitute_regex}${del}g" "$filename")" else - result="$(sed "s@$match_regex@$substitute_regex@g" "$filename")" + result="$(sed "s${del}${match_regex}${del}${substitute_regex}${del}g" "$filename")" fi echo "$result" > "$filename" } diff --git a/bitnami/git/README.md b/bitnami/git/README.md index 18d967a67452..b8813857fbf2 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.26.2-debian-10-r19`, `2`, `2.26.2`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-git/blob/2.26.2-debian-10-r19/2/debian-10/Dockerfile) +* [`2-debian-10`, `2.26.2-debian-10-r20`, `2`, `2.26.2`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-git/blob/2.26.2-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).