diff --git a/bitnami/elasticsearch/7/debian-12/Dockerfile b/bitnami/elasticsearch/7/debian-12/Dockerfile index 5d192fe9a33a..ac00d8f9672b 100644 --- a/bitnami/elasticsearch/7/debian-12/Dockerfile +++ b/bitnami/elasticsearch/7/debian-12/Dockerfile @@ -10,15 +10,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-25T00:24:24Z" \ + org.opencontainers.image.created="2024-12-03T14:58:34Z" \ org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/elasticsearch/README.md" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="7.17.25-debian-12-r3" \ + org.opencontainers.image.ref.name="7.17.26-debian-12-r0" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/elasticsearch" \ org.opencontainers.image.title="elasticsearch" \ org.opencontainers.image.vendor="Broadcom, Inc." \ - org.opencontainers.image.version="7.17.25" + org.opencontainers.image.version="7.17.26" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -29,12 +29,12 @@ ENV HOME="/" \ COPY prebuildfs / SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies -RUN install_packages ca-certificates curl libasound2-dev libc6 libfreetype6 libfreetype6-dev libgcc1 procps zlib1g +RUN install_packages ca-certificates curl libasound2-dev libc6 libfreetype6 libfreetype6-dev libgcc-s1 libgcc1 libstdc++6 procps zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ "yq-4.44.5-0-linux-${OS_ARCH}-debian-12" \ "java-17.0.13-12-1-linux-${OS_ARCH}-debian-12" \ - "elasticsearch-7.17.25-2-linux-${OS_ARCH}-debian-12" \ + "elasticsearch-7.17.26-0-linux-${OS_ARCH}-debian-12" \ ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ @@ -53,7 +53,7 @@ RUN find / -perm /6000 -type f -exec chmod a-s {} \; || true COPY rootfs / RUN /opt/bitnami/scripts/elasticsearch/postunpack.sh RUN /opt/bitnami/scripts/java/postunpack.sh -ENV APP_VERSION="7.17.25" \ +ENV APP_VERSION="7.17.26" \ BITNAMI_APP_NAME="elasticsearch" \ ES_JAVA_HOME="/opt/bitnami/java" \ JAVA_HOME="/opt/bitnami/java" \ diff --git a/bitnami/elasticsearch/7/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/elasticsearch/7/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json index 0c896fa635b8..f9367dfbd1f2 100644 --- a/bitnami/elasticsearch/7/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/elasticsearch/7/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,7 +3,7 @@ "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "7.17.25-2" + "version": "7.17.26-0" }, "java": { "arch": "amd64", diff --git a/bitnami/elasticsearch/7/debian-12/rootfs/opt/bitnami/scripts/java/entrypoint.sh b/bitnami/elasticsearch/7/debian-12/rootfs/opt/bitnami/scripts/java/entrypoint.sh index 8557631d2549..38802fc0bfe9 100755 --- a/bitnami/elasticsearch/7/debian-12/rootfs/opt/bitnami/scripts/java/entrypoint.sh +++ b/bitnami/elasticsearch/7/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/elasticsearch/7/debian-12/tags-info.yaml b/bitnami/elasticsearch/7/debian-12/tags-info.yaml index 022b8b24fd80..ece0cc84d23a 100644 --- a/bitnami/elasticsearch/7/debian-12/tags-info.yaml +++ b/bitnami/elasticsearch/7/debian-12/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "7" - 7-debian-12 -- 7.17.25 +- 7.17.26