6.8.20-debian-10-r38 release
This commit is contained in:
parent
c999703a52
commit
3abca6717d
|
|
@ -16,14 +16,14 @@ RUN install_packages acl ca-certificates curl gzip hostname libc6 procps tar zli
|
|||
RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "yq" "4.14.2-0" --checksum 603824903f6b3aa44fed08caeabf517f26e036319e6686c38effb2d61ec63505
|
||||
RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "java" "11.0.13-0" --checksum 9552e53ccd3b0ec85a82c31c26a1462260e28b7c58770a5c53560afb02ec66d9
|
||||
RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.14.0-0" --checksum 3e6fc37ca073b10a73a804d39c2f0c028947a1a596382a4f8ebe43dfbaa3a25e
|
||||
RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "elasticsearch" "6.8.20-0" --checksum 2bd4d1db9ed08a5d6cd8932f914a6c5c41b5de001263a0bc99fe2b8915a61de6
|
||||
RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "elasticsearch" "6.8.20-1" --checksum 785f1538fce9734e2cd4493aa6f7c36836171db4f3c8eb8a420d12206829c691
|
||||
RUN chmod g+rwX /opt/bitnami
|
||||
|
||||
COPY rootfs /
|
||||
RUN /opt/bitnami/scripts/elasticsearch/postunpack.sh
|
||||
RUN /opt/bitnami/scripts/java/postunpack.sh
|
||||
ENV BITNAMI_APP_NAME="elasticsearch" \
|
||||
BITNAMI_IMAGE_VERSION="6.8.20-debian-10-r37" \
|
||||
BITNAMI_IMAGE_VERSION="6.8.20-debian-10-r38" \
|
||||
JAVA_HOME="/opt/bitnami/java" \
|
||||
LD_LIBRARY_PATH="/opt/bitnami/elasticsearch/jdk/lib:/opt/bitnami/elasticsearch/jdk/lib/server:$LD_LIBRARY_PATH"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
{
|
||||
"elasticsearch": {
|
||||
"arch": "amd64",
|
||||
"digest": "2bd4d1db9ed08a5d6cd8932f914a6c5c41b5de001263a0bc99fe2b8915a61de6",
|
||||
"digest": "785f1538fce9734e2cd4493aa6f7c36836171db4f3c8eb8a420d12206829c691",
|
||||
"distro": "debian-10",
|
||||
"type": "NAMI",
|
||||
"version": "6.8.20-0"
|
||||
"version": "6.8.20-1"
|
||||
},
|
||||
"gosu": {
|
||||
"arch": "amd64",
|
||||
|
|
|
|||
|
|
@ -75,7 +75,6 @@ done
|
|||
unset elasticsearch_env_vars
|
||||
|
||||
# Paths
|
||||
export PATH="/opt/bitnami/elasticsearch/bin:/opt/bitnami/common/bin:$PATH"
|
||||
export ELASTICSEARCH_VOLUME_DIR="/bitnami/elasticsearch"
|
||||
export ELASTICSEARCH_BASE_DIR="/opt/bitnami/elasticsearch"
|
||||
export ELASTICSEARCH_CONF_DIR="${ELASTICSEARCH_BASE_DIR}/config"
|
||||
|
|
@ -95,6 +94,7 @@ export ELASTICSEARCH_TRUSTSTORE_LOCATION="${ELASTICSEARCH_TRUSTSTORE_LOCATION:-$
|
|||
export ELASTICSEARCH_NODE_CERT_LOCATION="${ELASTICSEARCH_NODE_CERT_LOCATION:-${ELASTICSEARCH_CERTS_DIR}/tls.crt}"
|
||||
export ELASTICSEARCH_NODE_KEY_LOCATION="${ELASTICSEARCH_NODE_KEY_LOCATION:-${ELASTICSEARCH_CERTS_DIR}/tls.key}"
|
||||
export ELASTICSEARCH_CA_CERT_LOCATION="${ELASTICSEARCH_CA_CERT_LOCATION:-${ELASTICSEARCH_CERTS_DIR}/ca.crt}"
|
||||
export PATH="${ELASTICSEARCH_BIN_DIR}:${BITNAMI_ROOT_DIR}/common/bin:$PATH"
|
||||
|
||||
# System users (when running with a privileged user)
|
||||
export ELASTICSEARCH_DAEMON_USER="elasticsearch"
|
||||
|
|
|
|||
|
|
@ -493,13 +493,20 @@ elasticsearch_set_heap_size() {
|
|||
# Elasticsearch > 7.10 encourages to customize the heap settings through a file in 'jvm.options.d'
|
||||
# Previous versions need to update the 'jvm.options' file
|
||||
if [[ "$es_major_version" -ge 7 && "$es_minor_version" -gt 10 ]]; then
|
||||
debug "Setting Xmx and Xms options in heap.options file"
|
||||
cat >"${ELASTICSEARCH_CONF_DIR}/jvm.options.d/heap.options" <<EOF
|
||||
-Xms${heap_size}
|
||||
-Xmx${heap_size}
|
||||
EOF
|
||||
else
|
||||
elif [[ -n "$es_major_version" ]]; then
|
||||
# If the version is less than 7.10, set using the legacy approach by updating the 'jvm.options' file
|
||||
debug "Updating Xmx and Xms values in jvm.options file"
|
||||
replace_in_file "${ELASTICSEARCH_CONF_DIR}/jvm.options" "-Xmx[0-9]+[mg]+" "-Xmx${heap_size}"
|
||||
replace_in_file "${ELASTICSEARCH_CONF_DIR}/jvm.options" "-Xms[0-9]+[mg]+" "-Xms${heap_size}"
|
||||
else
|
||||
# This condition should never happen, as it would only trigger when '--version' fails or prints unknown output
|
||||
error "Could not detect Elasticsearch version"
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
||||
|
|
@ -769,7 +776,7 @@ elasticsearch_custom_init_scripts() {
|
|||
# version
|
||||
#########################
|
||||
elasticsearch_get_version() {
|
||||
elasticsearch --version | grep Version: | awk -F "," '{print $1}' | awk -F ":" '{print $2}'
|
||||
ES_JAVA_OPTS="-Xms1m -Xmx10m" elasticsearch --version | grep Version: | awk -F "," '{print $1}' | awk -F ":" '{print $2}'
|
||||
}
|
||||
|
||||
########################
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
|
|||
|
||||
* [`7`, `7-debian-10`, `7.15.2`, `7.15.2-debian-10-r9`, `latest` (7/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-elasticsearch/blob/7.15.2-debian-10-r9/7/debian-10/Dockerfile)
|
||||
* [`7.10.2`, `7.10.2-debian-10`, `7.10.2-debian-10-r285` (7.10.2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-elasticsearch/blob/7.10.2-debian-10-r285/7.10.2/debian-10/Dockerfile)
|
||||
* [`6`, `6-debian-10`, `6.8.20`, `6.8.20-debian-10-r37` (6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-elasticsearch/blob/6.8.20-debian-10-r37/6/debian-10/Dockerfile)
|
||||
* [`6`, `6-debian-10`, `6.8.20`, `6.8.20-debian-10-r38` (6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-elasticsearch/blob/6.8.20-debian-10-r38/6/debian-10/Dockerfile)
|
||||
|
||||
Subscribe to project updates by watching the [bitnami/elasticsearch GitHub repo](https://github.com/bitnami/bitnami-docker-elasticsearch).
|
||||
## Get this image
|
||||
|
|
|
|||
Loading…
Reference in New Issue