diff --git a/bitnami/opensearch/1/debian-11/Dockerfile b/bitnami/opensearch/1/debian-11/Dockerfile index 1eadcb050551..ea3b4a9491fd 100644 --- a/bitnami/opensearch/1/debian-11/Dockerfile +++ b/bitnami/opensearch/1/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-28T03:11:34Z" \ + org.opencontainers.image.created="2023-07-31T05:08:25Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.3.10-debian-11-r13" \ + org.opencontainers.image.ref.name="1.3.10-debian-11-r16" \ org.opencontainers.image.title="opensearch" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="1.3.10" diff --git a/bitnami/opensearch/1/debian-11/rootfs/opt/bitnami/scripts/libopensearch.sh b/bitnami/opensearch/1/debian-11/rootfs/opt/bitnami/scripts/libopensearch.sh index 8f1517807353..ff0bba9258b3 100644 --- a/bitnami/opensearch/1/debian-11/rootfs/opt/bitnami/scripts/libopensearch.sh +++ b/bitnami/opensearch/1/debian-11/rootfs/opt/bitnami/scripts/libopensearch.sh @@ -445,19 +445,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