public_git
/
bitnami-containers
mirror of https://github.com/bitnami/containers.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

2.4.2-debian-10-r2 release

This commit is contained in:
Bitnami Bot 2020-06-27 07:29:12 +00:00
parent a53d80efa3
commit c821b9122e
4 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bitnami/spring-cloud-skipper/2/debian-10/Dockerfile
View File

@ -19,7 +19,7 @@ RUN apt-get update && apt-get upgrade -y && \
COPY rootfs /
RUN /opt/bitnami/scripts/spring-cloud-skipper/postunpack.sh
ENV BITNAMI_APP_NAME="spring-cloud-skipper" \
BITNAMI_IMAGE_VERSION="2.4.2-debian-10-r1" \
BITNAMI_IMAGE_VERSION="2.4.2-debian-10-r2" \
PATH="/opt/bitnami/java/bin:/opt/bitnami/common/bin:$PATH"
USER 1001

16
bitnami/spring-cloud-skipper/2/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh
View File

@ -95,6 +95,22 @@ is_file_writable() {
fi
}
########################
# Relativize a path
# arguments:
# $1 - path
# $2 - base
# returns:
# None
#########################
relativize() {
local -r path="${1:?missing path}"
local -r base="${2:?missing base}"
pushd / >/dev/null
realpath -q --no-symlinks --relative-base="$base" "$path" | sed -e 's|^/$|.|' -e 's|^/||'
popd >/dev/null
}
########################
# Configure permisions and ownership recursively
# Globals:

18
bitnami/spring-cloud-skipper/2/debian-10/prebuildfs/opt/bitnami/scripts/libpersistence.sh
View File

@ -36,16 +36,17 @@ persist_app() {
return
fi
pushd "$install_dir" >/dev/null
local file_to_persist_destination file_to_persist_destination_folder
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
file_to_persist_destination="${persist_dir}/${file_to_persist}"
file_to_persist_relative="$(relativize "$file_to_persist" "$install_dir")"
file_to_persist_destination="${persist_dir}/${file_to_persist_relative}"
file_to_persist_destination_folder="$(dirname "$file_to_persist_destination")"
# 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"
find "$file_to_persist_relative" | 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"
cp -Lr --preserve=links "$file_to_persist_relative" "$file_to_persist_destination_folder"
# Restore permissions
pushd "$persist_dir" >/dev/null
if am_i_root; then
@ -84,11 +85,12 @@ restore_persisted_app() {
warn "No persisted files are configured to be restored"
return
fi
local file_to_restore_origin file_to_restore_destination
local file_to_restore_relative file_to_restore_origin file_to_restore_destination
for file_to_restore in "${files_to_restore[@]}"; do
# We use realpath to ensure that the case of '.' is covered and the directory is removed
file_to_restore_origin="$(realpath "${install_dir}/${file_to_restore}")"
file_to_restore_destination="$(realpath "${persist_dir}/${file_to_restore}")"
file_to_restore_relative="$(relativize "$file_to_restore" "$install_dir")"
# We use 'realpath --no-symlinks' to ensure that the case of '.' is covered and the directory is removed
file_to_restore_origin="$(realpath --no-symlinks "${install_dir}/${file_to_restore_relative}")"
file_to_restore_destination="$(realpath --no-symlinks "${persist_dir}/${file_to_restore_relative}")"
rm -rf "$file_to_restore_origin"
ln -sfn "$file_to_restore_destination" "$file_to_restore_origin"
done

2
bitnami/spring-cloud-skipper/README.md
View File

@ -39,7 +39,7 @@ Non-root container images add an extra layer of security and are generally recom
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.4.2-debian-10-r1`, `2`, `2.4.2`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-spring-cloud-skipper/blob/2.4.2-debian-10-r1/2/debian-10/Dockerfile)
* [`2-debian-10`, `2.4.2-debian-10-r2`, `2`, `2.4.2`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-spring-cloud-skipper/blob/2.4.2-debian-10-r2/2/debian-10/Dockerfile)
Subscribe to project updates by watching the [bitnami/spring-cloud-skipper GitHub repo](https://github.com/bitnami/bitnami-docker-spring-cloud-skipper).