From ddebe3d7ab4f475fd1265d8e6c5119031182efa9 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Mon, 31 Jul 2023 14:54:18 +0200 Subject: [PATCH] [bitnami/elasticsearch] Release 7.17.12-debian-11-r3 (#42938) Signed-off-by: Bitnami Containers --- bitnami/elasticsearch/7/debian-11/Dockerfile | 6 ++--- .../opt/bitnami/.bitnami_components.json | 2 +- .../opt/bitnami/scripts/libelasticsearch.sh | 22 +++++++++++-------- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/bitnami/elasticsearch/7/debian-11/Dockerfile b/bitnami/elasticsearch/7/debian-11/Dockerfile index 7cd30a57a1ba..d0c24047e2e6 100644 --- a/bitnami/elasticsearch/7/debian-11/Dockerfile +++ b/bitnami/elasticsearch/7/debian-11/Dockerfile @@ -9,10 +9,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-07-28T01:40:39Z" \ + org.opencontainers.image.created="2023-07-31T11:30:50Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="7.17.12-debian-11-r2" \ + org.opencontainers.image.ref.name="7.17.12-debian-11-r3" \ org.opencontainers.image.title="elasticsearch" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="7.17.12" @@ -31,7 +31,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ COMPONENTS=( \ "yq-4.34.2-1-linux-${OS_ARCH}-debian-11" \ "java-17.0.8-7-2-linux-${OS_ARCH}-debian-11" \ - "elasticsearch-7.17.12-0-linux-${OS_ARCH}-debian-11" \ + "elasticsearch-7.17.12-1-linux-${OS_ARCH}-debian-11" \ ) && \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ diff --git a/bitnami/elasticsearch/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/elasticsearch/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 1283ac43d91c..b93e75fa559d 100644 --- a/bitnami/elasticsearch/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/elasticsearch/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,7 +3,7 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "7.17.12-0" + "version": "7.17.12-1" }, "java": { "arch": "amd64", diff --git a/bitnami/elasticsearch/7/debian-11/rootfs/opt/bitnami/scripts/libelasticsearch.sh b/bitnami/elasticsearch/7/debian-11/rootfs/opt/bitnami/scripts/libelasticsearch.sh index e8557636724e..ac4bf7d3d1fd 100644 --- a/bitnami/elasticsearch/7/debian-11/rootfs/opt/bitnami/scripts/libelasticsearch.sh +++ b/bitnami/elasticsearch/7/debian-11/rootfs/opt/bitnami/scripts/libelasticsearch.sh @@ -415,19 +415,23 @@ elasticsearch_validate() { print_validation_error "Opensearch does not support plaintext conections (HTTP) when Security is enabled." fi fi - if is_boolean_yes "$DB_TRANSPORT_TLS_USE_PEM"; then - if [[ ! -f "$DB_TRANSPORT_TLS_NODE_CERT_LOCATION" ]] || [[ ! -f "$DB_TRANSPORT_TLS_NODE_KEY_LOCATION" ]] || [[ ! -f "$DB_TRANSPORT_TLS_CA_CERT_LOCATION" ]]; then - print_validation_error "In order to configure the TLS encryption for ${DB_FLAVOR^} Transport you must provide your node key, certificate and a valid certification_authority certificate." + if ! is_boolean_yes "$DB_SKIP_TRANSPORT_TLS"; then + if is_boolean_yes "$DB_TRANSPORT_TLS_USE_PEM"; then + if [[ ! -f "$DB_TRANSPORT_TLS_NODE_CERT_LOCATION" ]] || [[ ! -f "$DB_TRANSPORT_TLS_NODE_KEY_LOCATION" ]] || [[ ! -f "$DB_TRANSPORT_TLS_CA_CERT_LOCATION" ]]; then + print_validation_error "In order to configure the TLS encryption for ${DB_FLAVOR^} Transport you must provide your node key, certificate and a valid certification_authority certificate." + fi + elif [[ ! -f "$DB_TRANSPORT_TLS_KEYSTORE_LOCATION" ]] || [[ ! -f "$DB_TRANSPORT_TLS_TRUSTSTORE_LOCATION" ]]; then + print_validation_error "In order to configure the TLS encryption for ${DB_FLAVOR^} Transport with JKS/PKCS12 certs you must mount a valid keystore and truststore." fi - elif [[ ! -f "$DB_TRANSPORT_TLS_KEYSTORE_LOCATION" ]] || [[ ! -f "$DB_TRANSPORT_TLS_TRUSTSTORE_LOCATION" ]]; then - print_validation_error "In order to configure the TLS encryption for ${DB_FLAVOR^} Transport with JKS/PKCS12 certs you must mount a valid keystore and truststore." fi if is_boolean_yes "$DB_HTTP_TLS_USE_PEM"; then - if [[ ! -f "$DB_HTTP_TLS_NODE_CERT_LOCATION" ]] || [[ ! -f "$DB_HTTP_TLS_NODE_KEY_LOCATION" ]] || [[ ! -f "$DB_HTTP_TLS_CA_CERT_LOCATION" ]]; then - print_validation_error "In order to configure the TLS encryption for ${DB_FLAVOR^} you must provide your node key, certificate and a valid certification_authority certificate." + if is_boolean_yes "$DB_HTTP_TLS_USE_PEM"; then + if [[ ! -f "$DB_HTTP_TLS_NODE_CERT_LOCATION" ]] || [[ ! -f "$DB_HTTP_TLS_NODE_KEY_LOCATION" ]] || [[ ! -f "$DB_HTTP_TLS_CA_CERT_LOCATION" ]]; then + print_validation_error "In order to configure the TLS encryption for ${DB_FLAVOR^} you must provide your node key, certificate and a valid certification_authority certificate." + fi + elif [[ ! -f "$DB_HTTP_TLS_KEYSTORE_LOCATION" ]] || [[ ! -f "$DB_HTTP_TLS_TRUSTSTORE_LOCATION" ]]; then + print_validation_error "In order to configure the TLS encryption for ${DB_FLAVOR^} with JKS/PKCS12 certs you must mount a valid keystore and truststore." fi - elif [[ ! -f "$DB_HTTP_TLS_KEYSTORE_LOCATION" ]] || [[ ! -f "$DB_HTTP_TLS_TRUSTSTORE_LOCATION" ]]; then - print_validation_error "In order to configure the TLS encryption for ${DB_FLAVOR^} with JKS/PKCS12 certs you must mount a valid keystore and truststore." fi fi