[bitnami/elasticsearch] Release 7.17.21-debian-12-r4 (#67592)
Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
This commit is contained in:
parent
ef8bb9f5a3
commit
bf460c4d69
|
|
@ -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-05-13T18:57:40Z" \
|
||||
org.opencontainers.image.created="2024-06-06T10:59:08Z" \
|
||||
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.21-debian-12-r3" \
|
||||
org.opencontainers.image.ref.name="7.17.21-debian-12-r4" \
|
||||
org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/elasticsearch" \
|
||||
org.opencontainers.image.title="elasticsearch" \
|
||||
org.opencontainers.image.vendor="Broadcom, Inc." \
|
||||
|
|
@ -31,8 +31,8 @@ SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"]
|
|||
RUN install_packages ca-certificates curl libasound2-dev libc6 libfreetype6 libfreetype6-dev libgcc1 procps zlib1g
|
||||
RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \
|
||||
COMPONENTS=( \
|
||||
"yq-4.44.1-0-linux-${OS_ARCH}-debian-12" \
|
||||
"java-17.0.11-10-1-linux-${OS_ARCH}-debian-12" \
|
||||
"yq-4.44.1-2-linux-${OS_ARCH}-debian-12" \
|
||||
"java-17.0.11-12-0-linux-${OS_ARCH}-debian-12" \
|
||||
"elasticsearch-7.17.21-1-linux-${OS_ARCH}-debian-12" \
|
||||
) ; \
|
||||
for COMPONENT in "${COMPONENTS[@]}"; do \
|
||||
|
|
|
|||
|
|
@ -9,12 +9,12 @@
|
|||
"arch": "amd64",
|
||||
"distro": "debian-12",
|
||||
"type": "NAMI",
|
||||
"version": "17.0.11-10-1"
|
||||
"version": "17.0.11-12-0"
|
||||
},
|
||||
"yq": {
|
||||
"arch": "amd64",
|
||||
"distro": "debian-12",
|
||||
"type": "NAMI",
|
||||
"version": "4.44.1-0"
|
||||
"version": "4.44.1-2"
|
||||
}
|
||||
}
|
||||
|
|
@ -8,6 +8,7 @@
|
|||
|
||||
# Load Generic Libraries
|
||||
. /opt/bitnami/scripts/liblog.sh
|
||||
. /opt/bitnami/scripts/libvalidations.sh
|
||||
|
||||
# Functions
|
||||
|
||||
|
|
@ -68,7 +69,12 @@ get_machine_ip() {
|
|||
error "Could not find any IP address associated to hostname ${hostname}"
|
||||
exit 1
|
||||
fi
|
||||
echo "${ip_addresses[0]}"
|
||||
# Check if the first IP address is IPv6 to add brackets
|
||||
if validate_ipv6 "${ip_addresses[0]}" ; then
|
||||
echo "[${ip_addresses[0]}]"
|
||||
else
|
||||
echo "${ip_addresses[0]}"
|
||||
fi
|
||||
}
|
||||
|
||||
########################
|
||||
|
|
|
|||
|
|
@ -693,6 +693,20 @@ elasticsearch_initialize() {
|
|||
am_i_root && is_mounted_dir_empty "$dir" && chown -R "$DB_DAEMON_USER:$DB_DAEMON_GROUP" "$dir"
|
||||
done
|
||||
|
||||
if is_file_writable "${DB_CONF_DIR}/jvm.options" && is_file_writable "${DB_CONF_DIR}/jvm.options.d"; then
|
||||
if is_boolean_yes "$DB_DISABLE_JVM_HEAP_DUMP"; then
|
||||
info "Disabling JVM heap dumps..."
|
||||
replace_in_file "${DB_CONF_DIR}/jvm.options" "-XX:[+]HeapDumpOnOutOfMemoryError" "# -XX:+HeapDumpOnOutOfMemoryError"
|
||||
fi
|
||||
if is_boolean_yes "$DB_DISABLE_GC_LOGS"; then
|
||||
info "Disabling JVM GC logs..."
|
||||
replace_in_file "${DB_CONF_DIR}/jvm.options" "(^.*logs[/]gc.log.*$)" "# \1"
|
||||
fi
|
||||
elasticsearch_set_heap_size
|
||||
else
|
||||
warn "The JVM options configuration files are not writable. Configurations based on environment variables will not be applied"
|
||||
fi
|
||||
|
||||
if [[ -f "$DB_CONF_FILE" ]]; then
|
||||
info "Custom configuration file detected, using it..."
|
||||
else
|
||||
|
|
@ -743,20 +757,6 @@ elasticsearch_initialize() {
|
|||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
if is_file_writable "${DB_CONF_DIR}/jvm.options" && is_file_writable "${DB_CONF_DIR}/jvm.options.d"; then
|
||||
if is_boolean_yes "$DB_DISABLE_JVM_HEAP_DUMP"; then
|
||||
info "Disabling JVM heap dumps..."
|
||||
replace_in_file "${DB_CONF_DIR}/jvm.options" "-XX:[+]HeapDumpOnOutOfMemoryError" "# -XX:+HeapDumpOnOutOfMemoryError"
|
||||
fi
|
||||
if is_boolean_yes "$DB_DISABLE_GC_LOGS"; then
|
||||
info "Disabling JVM GC logs..."
|
||||
replace_in_file "${DB_CONF_DIR}/jvm.options" "(^.*logs[/]gc.log.*$)" "# \1"
|
||||
fi
|
||||
elasticsearch_set_heap_size
|
||||
else
|
||||
warn "The JVM options configuration files are not writable. Configurations based on environment variables will not be applied"
|
||||
fi
|
||||
}
|
||||
|
||||
########################
|
||||
|
|
|
|||
Loading…
Reference in New Issue