From 2f045be5f18afd9fdbb8844c19398ed2374dbf5e Mon Sep 17 00:00:00 2001 From: osgn422w Date: Mon, 2 Sep 2019 17:56:55 +0200 Subject: use oss version need to use oss version of base image with corresponding config Issue-ID: CLAMP-489 Change-Id: I7577c5e8840d0b769784d2de103e9d087ccbd8d8 Signed-off-by: osgn422w --- src/main/docker/elasticsearch/Dockerfile | 2 +- src/main/docker/elasticsearch/config/elasticsearch.yml | 4 ++-- src/main/docker/kibana/conf/kibana.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/docker/elasticsearch/Dockerfile b/src/main/docker/elasticsearch/Dockerfile index 41252be15..24352429e 100644 --- a/src/main/docker/elasticsearch/Dockerfile +++ b/src/main/docker/elasticsearch/Dockerfile @@ -1,5 +1,5 @@ # https://github.com/elastic/elasticsearch-docker -FROM docker.elastic.co/elasticsearch/elasticsearch:6.6.2 +FROM docker.elastic.co/elasticsearch/elasticsearch-oss:6.6.2 COPY config/sg/ config/sg/ COPY config/ config/ diff --git a/src/main/docker/elasticsearch/config/elasticsearch.yml b/src/main/docker/elasticsearch/config/elasticsearch.yml index 72ce137ab..4d46ca01e 100644 --- a/src/main/docker/elasticsearch/config/elasticsearch.yml +++ b/src/main/docker/elasticsearch/config/elasticsearch.yml @@ -18,8 +18,8 @@ discovery.type: single-node ## X-Pack settings ## see https://www.elastic.co/guide/en/elasticsearch/reference/current/setup-xpack.html # -xpack.license.self_generated.type: basic -xpack.security.enabled: false +#xpack.license.self_generated.type: basic +#xpack.security.enabled: false ## Search Guard # diff --git a/src/main/docker/kibana/conf/kibana.yml b/src/main/docker/kibana/conf/kibana.yml index 2edcb803f..cfec41e3b 100644 --- a/src/main/docker/kibana/conf/kibana.yml +++ b/src/main/docker/kibana/conf/kibana.yml @@ -10,7 +10,7 @@ server.ssl.certificate: /usr/share/kibana/config/keystore/org.onap.clamp.crt.pem ## Search Guard # -xpack.security.enabled: false +#xpack.security.enabled: false elasticsearch.username: kibanaserver elasticsearch.password: kibanaserver -- cgit 1.2.3-korg