diff --git a/bitnami/postgresql/14/debian-10/Dockerfile b/bitnami/postgresql/14/debian-10/Dockerfile index 4b6533853a4e..9c04bfabc310 100644 --- a/bitnami/postgresql/14/debian-10/Dockerfile +++ b/bitnami/postgresql/14/debian-10/Dockerfile @@ -22,7 +22,7 @@ COPY rootfs / RUN /opt/bitnami/scripts/postgresql/postunpack.sh RUN /opt/bitnami/scripts/locales/add-extra-locales.sh ENV BITNAMI_APP_NAME="postgresql" \ - BITNAMI_IMAGE_VERSION="14.0.0-debian-10-r11" \ + BITNAMI_IMAGE_VERSION="14.0.0-debian-10-r12" \ LANG="en_US.UTF-8" \ LANGUAGE="en_US:en" \ NSS_WRAPPER_LIB="/opt/bitnami/common/lib/libnss_wrapper.so" \ diff --git a/bitnami/postgresql/14/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh b/bitnami/postgresql/14/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh index ae5e2459c377..b438c913341d 100644 --- a/bitnami/postgresql/14/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh +++ b/bitnami/postgresql/14/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/postgresql/README.md b/bitnami/postgresql/README.md index fcc2e21d1709..af4f4e32624a 100644 --- a/bitnami/postgresql/README.md +++ b/bitnami/postgresql/README.md @@ -44,7 +44,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/). -* [`14`, `14-debian-10`, `14.0.0`, `14.0.0-debian-10-r11` (14/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/14.0.0-debian-10-r11/14/debian-10/Dockerfile) +* [`14`, `14-debian-10`, `14.0.0`, `14.0.0-debian-10-r12` (14/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/14.0.0-debian-10-r12/14/debian-10/Dockerfile) * [`13`, `13-debian-10`, `13.4.0`, `13.4.0-debian-10-r80` (13/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/13.4.0-debian-10-r80/13/debian-10/Dockerfile) * [`12`, `12-debian-10`, `12.8.0`, `12.8.0-debian-10-r82` (12/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/12.8.0-debian-10-r82/12/debian-10/Dockerfile) * [`11`, `11-debian-10`, `11.13.0`, `11.13.0-debian-10-r81`, `latest` (11/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/11.13.0-debian-10-r81/11/debian-10/Dockerfile)