diff --git a/bitnami/kafka/3.4/debian-12/Dockerfile b/bitnami/kafka/3.4/debian-12/Dockerfile index f7697736b0ea..9af904ec1292 100644 --- a/bitnami/kafka/3.4/debian-12/Dockerfile +++ b/bitnami/kafka/3.4/debian-12/Dockerfile @@ -9,11 +9,11 @@ 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-09T21:23:47Z" \ + org.opencontainers.image.created="2024-12-09T21:46:28Z" \ org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/kafka/README.md" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="3.4.1-debian-12-r38" \ + org.opencontainers.image.ref.name="3.4.1-debian-12-r39" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/kafka" \ org.opencontainers.image.title="kafka" \ org.opencontainers.image.vendor="Broadcom, Inc." \ @@ -30,8 +30,8 @@ SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] RUN install_packages ca-certificates curl procps zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "wait-for-port-1.0.8-7-linux-${OS_ARCH}-debian-12" \ - "render-template-1.0.7-7-linux-${OS_ARCH}-debian-12" \ + "wait-for-port-1.0.8-8-linux-${OS_ARCH}-debian-12" \ + "render-template-1.0.7-8-linux-${OS_ARCH}-debian-12" \ "java-17.0.13-12-1-linux-${OS_ARCH}-debian-12" \ "kafka-3.4.1-8-linux-${OS_ARCH}-debian-12" \ ) ; \ diff --git a/bitnami/kafka/3.4/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/kafka/3.4/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json index 7fe1de38b70b..3f89c6a2d346 100644 --- a/bitnami/kafka/3.4/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/kafka/3.4/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json @@ -15,12 +15,12 @@ "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "1.0.7-7" + "version": "1.0.7-8" }, "wait-for-port": { "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "1.0.8-7" + "version": "1.0.8-8" } } \ No newline at end of file diff --git a/bitnami/kafka/3.4/debian-12/rootfs/opt/bitnami/scripts/java/entrypoint.sh b/bitnami/kafka/3.4/debian-12/rootfs/opt/bitnami/scripts/java/entrypoint.sh index 8557631d2549..38802fc0bfe9 100755 --- a/bitnami/kafka/3.4/debian-12/rootfs/opt/bitnami/scripts/java/entrypoint.sh +++ b/bitnami/kafka/3.4/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/kafka/3.4/debian-12/rootfs/opt/bitnami/scripts/kafka-env.sh b/bitnami/kafka/3.4/debian-12/rootfs/opt/bitnami/scripts/kafka-env.sh index f58958279ce8..e1621b93e808 100644 --- a/bitnami/kafka/3.4/debian-12/rootfs/opt/bitnami/scripts/kafka-env.sh +++ b/bitnami/kafka/3.4/debian-12/rootfs/opt/bitnami/scripts/kafka-env.sh @@ -49,6 +49,7 @@ kafka_env_vars=( KAFKA_CLIENT_USERS KAFKA_CLIENT_PASSWORDS KAFKA_HEAP_OPTS + JAVA_TOOL_OPTIONS ) for env_var in "${kafka_env_vars[@]}"; do file_env_var="${env_var}_FILE" @@ -114,4 +115,7 @@ export KAFKA_CLIENT_PASSWORDS="${KAFKA_CLIENT_PASSWORDS:-bitnami}" # Java settings export KAFKA_HEAP_OPTS="${KAFKA_HEAP_OPTS:--Xmx1024m -Xms1024m}" +# Java settings +export JAVA_TOOL_OPTIONS="${JAVA_TOOL_OPTIONS:-}" + # Custom environment variables may be defined below diff --git a/bitnami/kafka/README.md b/bitnami/kafka/README.md index 5feaf8ba11e0..a75ae8335e04 100644 --- a/bitnami/kafka/README.md +++ b/bitnami/kafka/README.md @@ -32,11 +32,11 @@ Bitnami containers can be used with [Kubeapps](https://kubeapps.dev/) for deploy ## Why use a non-root container? -Non-root container images add an extra layer of security and are generally recommended for production environments. However, because they run as a non-root user, privileged tasks are typically off-limits. Learn more about non-root containers [in our docs](https://docs.vmware.com/en/VMware-Tanzu-Application-Catalog/services/tutorials/GUID-work-with-non-root-containers-index.html). +Non-root container images add an extra layer of security and are generally recommended for production environments. However, because they run as a non-root user, privileged tasks are typically off-limits. Learn more about non-root containers [in our docs](https://techdocs.broadcom.com/us/en/vmware-tanzu/application-catalog/tanzu-application-catalog/services/tac-doc/apps-tutorials-work-with-non-root-containers-index.html). ## Supported tags and respective `Dockerfile` links -Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.vmware.com/en/VMware-Tanzu-Application-Catalog/services/tutorials/GUID-understand-rolling-tags-containers-index.html). +Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://techdocs.broadcom.com/us/en/vmware-tanzu/application-catalog/tanzu-application-catalog/services/tac-doc/apps-tutorials-understand-rolling-tags-containers-index.html). You can see the equivalence between the different tags by taking a look at the `tags-info.yaml` file present in the branch folder, i.e `bitnami/ASSET/BRANCH/DISTRO/tags-info.yaml`. @@ -203,6 +203,7 @@ docker-compose up -d | `KAFKA_CLIENT_USERS` | List of additional users to `KAFKA_CLIENT_USER` that will be created into Zookeeper when using `SASL_SCRAM` for client communications. Separated by commas, semicolons or whitespaces. | `user` | | `KAFKA_CLIENT_PASSWORDS` | Passwords for the users specified at `KAFKA_CLIENT_USERS`. Separated by commas, semicolons or whitespaces. | `bitnami` | | `KAFKA_HEAP_OPTS` | Kafka heap options for Java. | `-Xmx1024m -Xms1024m` | +| `JAVA_TOOL_OPTIONS` | Java tool options. | `nil` | #### Read-only environment variables