From 5742097c21b8cafa1434e67fff5f67643e4f80da Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Wed, 6 Sep 2017 07:47:31 +0000 Subject: [PATCH] 5.5.2-r1 release Add support for user customization --- bitnami/elasticsearch/5/Dockerfile | 6 +++--- bitnami/elasticsearch/5/rootfs/app-entrypoint.sh | 1 - bitnami/elasticsearch/README.md | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/bitnami/elasticsearch/5/Dockerfile b/bitnami/elasticsearch/5/Dockerfile index bcb2297b60c7..d9e786dfc833 100644 --- a/bitnami/elasticsearch/5/Dockerfile +++ b/bitnami/elasticsearch/5/Dockerfile @@ -1,15 +1,15 @@ -FROM bitnami/minideb-extras:jessie-r21 +FROM bitnami/minideb-extras:jessie-r22 LABEL maintainer "Bitnami " # Install required system packages and dependencies RUN install_packages libc6 libffi6 libgcc1 libglib2.0-0 liblzma5 libpcre3 libselinux1 libstdc++6 libx11-6 libxau6 libxcb1 libxdmcp6 libxext6 libxml2 zlib1g RUN bitnami-pkg install java-1.8.144-0 --checksum 8b4315727f65780d8223df0aeaf5e3beca10a14aa4e2cdd1f3541ab50b346433 -RUN bitnami-pkg unpack elasticsearch-5.5.2-0 --checksum f243dfd6ed2f9d166d8bb3b1b6cb417ff3e1f696fc3f9a61c07a95b46424b07d +RUN bitnami-pkg unpack elasticsearch-5.5.2-1 --checksum 07de6ecbfbe0d466f29e0f00030884900b698fb6431a052716b3c46f7db078d3 COPY rootfs / ENV BITNAMI_APP_NAME="elasticsearch" \ - BITNAMI_IMAGE_VERSION="5.5.2-r0" \ + BITNAMI_IMAGE_VERSION="5.5.2-r1" \ ELASTICSEARCH_CLIENT_NODE="" \ ELASTICSEARCH_CLUSTER_HOSTS="" \ ELASTICSEARCH_CLUSTER_NAME="elasticsearch-cluster" \ diff --git a/bitnami/elasticsearch/5/rootfs/app-entrypoint.sh b/bitnami/elasticsearch/5/rootfs/app-entrypoint.sh index 4b3582abb799..d63fe906c510 100755 --- a/bitnami/elasticsearch/5/rootfs/app-entrypoint.sh +++ b/bitnami/elasticsearch/5/rootfs/app-entrypoint.sh @@ -4,7 +4,6 @@ . /opt/bitnami/base/helpers print_welcome_page -check_for_updates & if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/init.sh" ]]; then nami_initialize elasticsearch diff --git a/bitnami/elasticsearch/README.md b/bitnami/elasticsearch/README.md index 5d0741a385b3..db46483c3937 100644 --- a/bitnami/elasticsearch/README.md +++ b/bitnami/elasticsearch/README.md @@ -8,7 +8,7 @@ [elastic.co/products/elasticsearch](https://www.elastic.co/products/elasticsearch) -# TL;DR; +# TL;DR ```bash $ docker run --name elasticsearch bitnami/elasticsearch:latest @@ -255,7 +255,7 @@ services: ## Configuration file -The image looks for configurations in `/bitnami/elasticsearch/conf/`. As mentioned in [Persisting your application](#persisting-your-application) you can mount a volume at `/bitnami` and copy/edit the configurations in the `/path/to/elasticsearch-persistence/elasticsearch/conf/`. The default configurations will be populated to the `conf/` directory if it's empty. +The image looks for user-defined configurations in `/bitnami/elasticsearch/conf/elasticsearch_custom.yml`. Create a file named `elasticsearch_custom.yml` and mount it at `/bitnami/elasticsearch/conf/elasticsearch_custom.yml` to extend the default configuration. # Logging