From a93f7439ce5cea785380d85b9314066da071ba3c Mon Sep 17 00:00:00 2001 From: Toby McLaughlin Date: Mon, 26 Nov 2018 14:53:31 +1100 Subject: [PATCH 1/2] [DOCS] Remove "platinum" references for Docker TLS These docs explicitly reference Docker images with a `-platinum` suffix but they do not exist for current versions of Elasticsearch. Fixes #7918 --- .../securing-communications/configuring-tls-docker.asciidoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/reference/security/securing-communications/configuring-tls-docker.asciidoc b/docs/reference/security/securing-communications/configuring-tls-docker.asciidoc index 49913382482bd..b32c4c901e18c 100644 --- a/docs/reference/security/securing-communications/configuring-tls-docker.asciidoc +++ b/docs/reference/security/securing-communications/configuring-tls-docker.asciidoc @@ -66,7 +66,7 @@ version: '2.2' services: create_certs: container_name: create_certs - image: docker.elastic.co/elasticsearch/elasticsearch-platinum:{version} + image: docker.elastic.co/elasticsearch/elasticsearch:{version} command: > bash -c ' if [[ ! -d config/certificates/certs ]]; then @@ -103,7 +103,7 @@ version: '2.2' services: es01: container_name: es01 - image: docker.elastic.co/elasticsearch/elasticsearch-platinum:{version} + image: docker.elastic.co/elasticsearch/elasticsearch:{version} environment: - node.name=es01 - discovery.zen.minimum_master_nodes=2 From 40aa198a84829acd9f0cfea95e7c2a8ad8421ecd Mon Sep 17 00:00:00 2001 From: Toby McLaughlin Date: Tue, 27 Nov 2018 12:30:17 +1100 Subject: [PATCH 2/2] [DOCS] Use docker-image attribute for TLS docs --- .../configuring-tls-docker.asciidoc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/reference/security/securing-communications/configuring-tls-docker.asciidoc b/docs/reference/security/securing-communications/configuring-tls-docker.asciidoc index b32c4c901e18c..e7e1a00208adc 100644 --- a/docs/reference/security/securing-communications/configuring-tls-docker.asciidoc +++ b/docs/reference/security/securing-communications/configuring-tls-docker.asciidoc @@ -66,7 +66,7 @@ version: '2.2' services: create_certs: container_name: create_certs - image: docker.elastic.co/elasticsearch/elasticsearch:{version} + image: {docker-image} command: > bash -c ' if [[ ! -d config/certificates/certs ]]; then @@ -103,7 +103,7 @@ version: '2.2' services: es01: container_name: es01 - image: docker.elastic.co/elasticsearch/elasticsearch:{version} + image: {docker-image} environment: - node.name=es01 - discovery.zen.minimum_master_nodes=2 @@ -128,7 +128,7 @@ services: es02: container_name: es02 - image: docker.elastic.co/elasticsearch/elasticsearch:{version} + image: {docker-image} environment: - node.name=es02 - discovery.zen.minimum_master_nodes=2 @@ -146,7 +146,7 @@ services: volumes: ['esdata_02:/usr/share/elasticsearch/data', './certs:$CERTS_DIR'] wait_until_ready: - image: docker.elastic.co/elasticsearch/elasticsearch:{version} + image: {docker-image} command: /usr/bin/true depends_on: {"es01": {"condition": "service_healthy"}}