diff --git a/bitnami/scylladb/6.1/debian-12/Dockerfile b/bitnami/scylladb/6.1/debian-12/Dockerfile index eecd47309028b..b7fc20c99e4c2 100644 --- a/bitnami/scylladb/6.1/debian-12/Dockerfile +++ b/bitnami/scylladb/6.1/debian-12/Dockerfile @@ -9,15 +9,15 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \ - org.opencontainers.image.created="2024-11-09T23:52:23Z" \ + org.opencontainers.image.created="2024-12-01T15:04:42Z" \ org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/scylladb/README.md" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="6.1.3-debian-12-r1" \ + org.opencontainers.image.ref.name="6.1.4-debian-12-r0" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/scylladb" \ org.opencontainers.image.title="scylladb" \ org.opencontainers.image.vendor="Broadcom, Inc." \ - org.opencontainers.image.version="6.1.3" + org.opencontainers.image.version="6.1.4" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -30,9 +30,9 @@ SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] RUN install_packages ca-certificates curl libatomic1 libblkid1 libbrotli1 libbz2-1.0 libcap2 libcom-err2 libcrypt1 libffi8 libgcc-s1 libgcrypt20 libgmp10 libgnutls30 libgpg-error0 libgssapi-krb5-2 libhogweed6 libidn2-0 libjsoncpp25 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblz4-1 liblzma5 libmount1 libmpfr6 libncursesw6 libnettle8 libnsl2 libp11-kit0 libpcre2-8-0 libreadline8 libselinux1 libsmartcols1 libsqlite3-0 libssl3 libstdc++6 libsystemd0 libtasn1-6 libtinfo6 libtirpc3 libudev1 libunistring2 libxxhash0 libzstd1 procps rsyslog zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "python-3.12.7-4-linux-${OS_ARCH}-debian-12" \ + "python-3.12.7-7-linux-${OS_ARCH}-debian-12" \ "java-11.0.25-11-1-linux-${OS_ARCH}-debian-12" \ - "scylladb-6.1.3-0-linux-${OS_ARCH}-debian-12" \ + "scylladb-6.1.4-0-linux-${OS_ARCH}-debian-12" \ ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ @@ -52,7 +52,7 @@ RUN find / -perm /6000 -type f -exec chmod a-s {} \; || true COPY rootfs / RUN /opt/bitnami/scripts/scylladb/postunpack.sh RUN /opt/bitnami/scripts/java/postunpack.sh -ENV APP_VERSION="6.1.3" \ +ENV APP_VERSION="6.1.4" \ BITNAMI_APP_NAME="scylladb" \ JAVA_HOME="/opt/bitnami/java" \ PATH="/opt/bitnami/python/bin:/opt/bitnami/java/bin:/opt/bitnami/scylladb/bin:/opt/bitnami/scylladb/python3/bin:/opt/bitnami/scylladb/sbin:/opt/bitnami/scylladb/share/cassandra/bin:/opt/bitnami/supervisor/bin:$PATH" diff --git a/bitnami/scylladb/6.1/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/scylladb/6.1/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json index 62033bbf582d2..0af0a40fc3b20 100644 --- a/bitnami/scylladb/6.1/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/scylladb/6.1/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json @@ -9,12 +9,12 @@ "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "3.12.7-4" + "version": "3.12.7-7" }, "scylladb": { "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "6.1.3-0" + "version": "6.1.4-0" } } \ No newline at end of file diff --git a/bitnami/scylladb/6.1/debian-12/rootfs/opt/bitnami/scripts/java/entrypoint.sh b/bitnami/scylladb/6.1/debian-12/rootfs/opt/bitnami/scripts/java/entrypoint.sh index 8557631d25490..38802fc0bfe91 100755 --- a/bitnami/scylladb/6.1/debian-12/rootfs/opt/bitnami/scripts/java/entrypoint.sh +++ b/bitnami/scylladb/6.1/debian-12/rootfs/opt/bitnami/scripts/java/entrypoint.sh @@ -13,6 +13,11 @@ set -o pipefail . /opt/bitnami/scripts/libbitnami.sh . /opt/bitnami/scripts/liblog.sh +if [[ "$OS_FLAVOUR" =~ photon && "$APP_VERSION" =~ ^1.8 ]]; then + # Option --module-path is not supported by JAVA 1.8 since modules were added in version 1.9 + unset JAVA_TOOL_OPTIONS +fi + print_welcome_page echo "" diff --git a/bitnami/scylladb/6.1/debian-12/tags-info.yaml b/bitnami/scylladb/6.1/debian-12/tags-info.yaml index 09917a1db3329..0b9a2d4a954ff 100644 --- a/bitnami/scylladb/6.1/debian-12/tags-info.yaml +++ b/bitnami/scylladb/6.1/debian-12/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "6.1" - 6.1-debian-12 -- 6.1.3 +- 6.1.4