From eeba37469cca81ba195819af8f29f57167b49864 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Tue, 2 Nov 2021 19:19:33 +0000 Subject: [PATCH] 2.4.0-debian-10-r5 release --- .../harbor-jobservice/2/debian-10/Dockerfile | 2 +- .../prebuildfs/opt/bitnami/scripts/libfs.sh | 49 ++++++++++--------- bitnami/harbor-jobservice/README.md | 2 +- 3 files changed, 27 insertions(+), 26 deletions(-) diff --git a/bitnami/harbor-jobservice/2/debian-10/Dockerfile b/bitnami/harbor-jobservice/2/debian-10/Dockerfile index 79aedee79122..eb88e36e6dcb 100644 --- a/bitnami/harbor-jobservice/2/debian-10/Dockerfile +++ b/bitnami/harbor-jobservice/2/debian-10/Dockerfile @@ -17,7 +17,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/harbor-jobservice/postunpack.sh ENV BITNAMI_APP_NAME="harbor-jobservice" \ - BITNAMI_IMAGE_VERSION="2.4.0-debian-10-r4" \ + BITNAMI_IMAGE_VERSION="2.4.0-debian-10-r5" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/harbor-jobservice/bin:$PATH" VOLUME [ "/etc/jobservice", "/var/log/jobs" ] diff --git a/bitnami/harbor-jobservice/2/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh b/bitnami/harbor-jobservice/2/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh index ae5e2459c377..b438c913341d 100644 --- a/bitnami/harbor-jobservice/2/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh +++ b/bitnami/harbor-jobservice/2/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh @@ -50,8 +50,9 @@ ensure_dir_exists() { # boolean ######################### is_dir_empty() { - local dir="${1:?missing directory}" - + local -r path="${1:?missing directory}" + # Calculate real path in order to avoid issues with symlinks + local -r dir="$(realpath "$path")" if [[ ! -e "$dir" ]] || [[ -z "$(ls -A "$dir")" ]]; then true else @@ -88,7 +89,7 @@ is_file_writable() { local dir dir="$(dirname "$file")" - if [[ ( -f "$file" && -w "$file" ) || ( ! -f "$file" && -d "$dir" && -w "$dir" ) ]]; then + if [[ (-f "$file" && -w "$file") || (! -f "$file" && -d "$dir" && -w "$dir") ]]; then true else false @@ -136,31 +137,31 @@ configure_permissions_ownership() { shift 1 while [ "$#" -gt 0 ]; do case "$1" in - -f|--file-mode) - shift - file_mode="${1:?missing mode for files}" - ;; - -d|--dir-mode) - shift - dir_mode="${1:?missing mode for directories}" - ;; - -u|--user) - shift - user="${1:?missing user}" - ;; - -g|--group) - shift - group="${1:?missing group}" - ;; - *) - echo "Invalid command line flag $1" >&2 - return 1 - ;; + -f | --file-mode) + shift + file_mode="${1:?missing mode for files}" + ;; + -d | --dir-mode) + shift + dir_mode="${1:?missing mode for directories}" + ;; + -u | --user) + shift + user="${1:?missing user}" + ;; + -g | --group) + shift + group="${1:?missing group}" + ;; + *) + echo "Invalid command line flag $1" >&2 + return 1 + ;; esac shift done - read -r -a filepaths <<< "$paths" + read -r -a filepaths <<<"$paths" for p in "${filepaths[@]}"; do if [[ -e "$p" ]]; then if [[ -n $dir_mode ]]; then diff --git a/bitnami/harbor-jobservice/README.md b/bitnami/harbor-jobservice/README.md index a2eab77df3a7..491ab7523572 100644 --- a/bitnami/harbor-jobservice/README.md +++ b/bitnami/harbor-jobservice/README.md @@ -42,7 +42,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`, `2-debian-10`, `2.4.0`, `2.4.0-debian-10-r4`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-harbor-jobservice/blob/2.4.0-debian-10-r4/2/debian-10/Dockerfile) +* [`2`, `2-debian-10`, `2.4.0`, `2.4.0-debian-10-r5`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-harbor-jobservice/blob/2.4.0-debian-10-r5/2/debian-10/Dockerfile) # Configuration