From 193cfb81ac5373f52529033d72057e768826a329 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 25 Jun 2020 17:17:06 +0000 Subject: [PATCH] 2.27.0-debian-10-r21 release --- bitnami/git/2/debian-10/Dockerfile | 8 +++---- .../opt/bitnami/scripts/libpersistence.sh | 23 +++++++++++++++---- bitnami/git/README.md | 2 +- 3 files changed, 24 insertions(+), 9 deletions(-) diff --git a/bitnami/git/2/debian-10/Dockerfile b/bitnami/git/2/debian-10/Dockerfile index 8fcdecb3ce31..4b5786468b95 100644 --- a/bitnami/git/2/debian-10/Dockerfile +++ b/bitnami/git/2/debian-10/Dockerfile @@ -7,15 +7,15 @@ ENV OS_ARCH="amd64" \ COPY prebuildfs / # Install required system packages and dependencies -RUN install_packages ca-certificates curl gzip libc6 libcom-err2 libcurl4 libffi6 libgcrypt20 libgmp10 libgnutls30 libgpg-error0 libgssapi-krb5-2 libhogweed4 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 libnettle6 libnghttp2-14 libp11-kit0 libpsl5 librtmp1 libsasl2-2 libssh2-1 libssl1.1 libtasn1-6 libunistring2 procps ssh sudo tar zlib1g -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.12.0-0" --checksum 582d501eeb6b338a24f417fededbf14295903d6be55c52d66c52e616c81bcd8c -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "git" "2.27.0-0" --checksum f0f67107dfcff03691f1267a7b7812921082bb88c5bc66e2948152fa3b330491 +RUN install_packages acl ca-certificates curl gzip libc6 libcom-err2 libcurl4 libffi6 libgcrypt20 libgmp10 libgnutls30 libgpg-error0 libgssapi-krb5-2 libhogweed4 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 libnettle6 libnghttp2-14 libp11-kit0 libpsl5 librtmp1 libsasl2-2 libssh2-1 libssl1.1 libtasn1-6 libunistring2 procps ssh sudo tar zlib1g +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.12.0-1" --checksum 51cfb1b7fd7b05b8abd1df0278c698103a9b1a4964bdacd87ca1d5c01631d59c +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "git" "2.27.0-1" --checksum 8d31650a86d07490247771e216e064819564452a7e2c2fe69ffbffdb9c079b0a RUN apt-get update && apt-get upgrade -y && \ rm -r /var/lib/apt/lists /var/cache/apt/archives RUN /build/bitnami-user.sh ENV BITNAMI_APP_NAME="git" \ - BITNAMI_IMAGE_VERSION="2.27.0-debian-10-r20" \ + BITNAMI_IMAGE_VERSION="2.27.0-debian-10-r21" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/git/bin:$PATH" ENTRYPOINT [ "git" ] diff --git a/bitnami/git/2/debian-10/prebuildfs/opt/bitnami/scripts/libpersistence.sh b/bitnami/git/2/debian-10/prebuildfs/opt/bitnami/scripts/libpersistence.sh index d4a0b32e1132..a7e977516d3a 100644 --- a/bitnami/git/2/debian-10/prebuildfs/opt/bitnami/scripts/libpersistence.sh +++ b/bitnami/git/2/debian-10/prebuildfs/opt/bitnami/scripts/libpersistence.sh @@ -7,6 +7,7 @@ # Load Generic Libraries . /opt/bitnami/scripts/libfs.sh +. /opt/bitnami/scripts/libos.sh . /opt/bitnami/scripts/liblog.sh . /opt/bitnami/scripts/libversion.sh @@ -34,14 +35,28 @@ persist_app() { warn "No files are configured to be persisted" return fi - local file_to_persist_origin file_to_persist_destination file_to_persist_destination_folder + pushd "$install_dir" >/dev/null + local file_to_persist_destination file_to_persist_destination_folder + local -r tmp_file="/tmp/perms.acl" for file_to_persist in "${files_to_persist[@]}"; do - file_to_persist_origin="${install_dir}/${file_to_persist}" file_to_persist_destination="${persist_dir}/${file_to_persist}" file_to_persist_destination_folder="$(dirname "$file_to_persist_destination")" - mkdir -p "$file_to_persist_destination_folder" - cp -Lr "$file_to_persist_origin" "$file_to_persist_destination_folder" + # Get original permissions (except for the root directory, to avoid issues with volumes) + find "$file_to_persist" | grep -E -v '^\.$' | xargs getfacl -R > "$tmp_file" + # Copy directories to the volume + ensure_dir_exists "$file_to_persist_destination_folder" + cp -Lr --preserve=links "$file_to_persist" "$file_to_persist_destination_folder" + # Restore permissions + pushd "$persist_dir" >/dev/null + if am_i_root; then + setfacl --restore="$tmp_file" + else + # When running as non-root, don't change ownership + setfacl --restore=<(grep -E -v '^# (owner|group):' "$tmp_file") + fi + popd >/dev/null done + popd >/dev/null # Install the persisted files into the installation directory, via symlinks restore_persisted_app "$@" } diff --git a/bitnami/git/README.md b/bitnami/git/README.md index 4ea10c4e9e57..1392eafaecf2 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-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) +* [`2-debian-10`, `2.27.0-debian-10-r21`, `2`, `2.27.0`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-git/blob/2.27.0-debian-10-r21/2/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/git GitHub repo](https://github.com/bitnami/bitnami-docker-git).