diff --git a/bitnami/cassandra/3.11/debian-10/Dockerfile b/bitnami/cassandra/3.11/debian-10/Dockerfile index 474f04944d90..fff91d49effc 100644 --- a/bitnami/cassandra/3.11/debian-10/Dockerfile +++ b/bitnami/cassandra/3.11/debian-10/Dockerfile @@ -24,7 +24,7 @@ COPY rootfs / RUN /opt/bitnami/scripts/cassandra/postunpack.sh RUN /opt/bitnami/scripts/java/postunpack.sh ENV BITNAMI_APP_NAME="cassandra" \ - BITNAMI_IMAGE_VERSION="3.11.11-debian-10-r123" \ + BITNAMI_IMAGE_VERSION="3.11.11-debian-10-r124" \ JAVA_HOME="/opt/bitnami/java" \ PATH="/opt/bitnami/python/bin:/opt/bitnami/java/bin:/opt/bitnami/common/bin:/opt/bitnami/cassandra/bin:$PATH" diff --git a/bitnami/cassandra/3.11/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh b/bitnami/cassandra/3.11/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh index b438c913341d..1b504b1df458 100644 --- a/bitnami/cassandra/3.11/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh +++ b/bitnami/cassandra/3.11/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh @@ -20,8 +20,13 @@ owned_by() { local path="${1:?path is missing}" local owner="${2:?owner is missing}" + local group="${3:-}" - chown "$owner":"$owner" "$path" + if [[ -n $group ]]; then + chown "$owner":"$group" "$path" + else + chown "$owner":"$owner" "$path" + fi } ######################## @@ -34,11 +39,12 @@ owned_by() { ######################### ensure_dir_exists() { local dir="${1:?directory is missing}" - local owner="${2:-}" + local owner_user="${2:-}" + local owner_group="${3:-}" mkdir -p "${dir}" - if [[ -n $owner ]]; then - owned_by "$dir" "$owner" + if [[ -n $owner_user ]]; then + owned_by "$dir" "$owner_user" "$owner_group" fi } diff --git a/bitnami/cassandra/3.11/debian-10/rootfs/opt/bitnami/scripts/libcassandra.sh b/bitnami/cassandra/3.11/debian-10/rootfs/opt/bitnami/scripts/libcassandra.sh index 48a9dfa27f22..d5379d1ce3a4 100644 --- a/bitnami/cassandra/3.11/debian-10/rootfs/opt/bitnami/scripts/libcassandra.sh +++ b/bitnami/cassandra/3.11/debian-10/rootfs/opt/bitnami/scripts/libcassandra.sh @@ -148,7 +148,8 @@ cassandra_validate() { check_allowed_port() { local validate_port_args=() ! am_i_root && validate_port_args+=("-unprivileged") - if ! err=$(validate_port "${validate_port_args[@]}" "${!1}"); then + validate_port_args+=("${!1}") + if ! err=$(validate_port "${validate_port_args[@]}"); then print_validation_error "An invalid port was specified in the environment variable $1: $err" fi } diff --git a/bitnami/cassandra/README.md b/bitnami/cassandra/README.md index 5d30e6626937..a437b464834b 100644 --- a/bitnami/cassandra/README.md +++ b/bitnami/cassandra/README.md @@ -51,7 +51,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t * [`4.0`, `4.0-debian-10`, `4.0.1`, `4.0.1-debian-10-r89`, `latest` (4.0/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-cassandra/blob/4.0.1-debian-10-r89/4.0/debian-10/Dockerfile) -* [`3.11`, `3.11-debian-10`, `3.11.11`, `3.11.11-debian-10-r123` (3.11/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-cassandra/blob/3.11.11-debian-10-r123/3.11/debian-10/Dockerfile) +* [`3.11`, `3.11-debian-10`, `3.11.11`, `3.11.11-debian-10-r124` (3.11/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-cassandra/blob/3.11.11-debian-10-r124/3.11/debian-10/Dockerfile) * [`3.0`, `3.0-debian-10`, `3.0.25`, `3.0.25-debian-10-r63` (3.0/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-cassandra/blob/3.0.25-debian-10-r63/3.0/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/cassandra GitHub repo](https://github.com/bitnami/bitnami-docker-cassandra).