2.31.1-debian-10-r3 release

This commit is contained in:
Bitnami Bot
2021-03-30 01:00:19 +00:00
parent 831c0e9455
commit c2e3486d63
4 changed files with 8 additions and 8 deletions

View File

@@ -14,7 +14,7 @@ RUN /build/bitnami-user.sh
COPY rootfs /
ENV BITNAMI_APP_NAME="git" \
BITNAMI_IMAGE_VERSION="2.31.1-debian-10-r2" \
BITNAMI_IMAGE_VERSION="2.31.1-debian-10-r3" \
NSS_WRAPPER_LIB="/opt/bitnami/common/lib/libnss_wrapper.so" \
PATH="/opt/bitnami/common/bin:/opt/bitnami/git/bin:$PATH"

View File

@@ -106,9 +106,9 @@ is_file_writable() {
relativize() {
local -r path="${1:?missing path}"
local -r base="${2:?missing base}"
pushd "$base" >/dev/null
pushd "$base" >/dev/null || exit
realpath -q --no-symlinks --relative-base="$base" "$path" | sed -e 's|^/$|.|' -e 's|^/||'
popd >/dev/null
popd >/dev/null || exit
}
########################

View File

@@ -35,7 +35,7 @@ persist_app() {
warn "No files are configured to be persisted"
return
fi
pushd "$install_dir" >/dev/null
pushd "$install_dir" >/dev/null || exit
local file_to_persist_relative 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
@@ -53,16 +53,16 @@ persist_app() {
ensure_dir_exists "$file_to_persist_destination_folder"
cp -Lr --preserve=links "$file_to_persist_relative" "$file_to_persist_destination_folder"
# Restore permissions
pushd "$persist_dir" >/dev/null
pushd "$persist_dir" >/dev/null || exit
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
popd >/dev/null || exit
done
popd >/dev/null
popd >/dev/null || exit
rm -f "$tmp_file"
# Install the persisted files into the installation directory, via symlinks
restore_persisted_app "$@"