Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update elasticsearch #4916

Merged
merged 1 commit into from
Oct 5, 2018
Merged

Conversation

jethr0null
Copy link
Contributor

In the interest of providing the best and most reliable support for the official Elasticsearch Docker images, Elastic performs a rigorous set of automated and manual tests as part of the Elasticsearch release process. Beyond testing our own software, these tests have historically uncovered other items such as JVM issues and OS-dependent issues that the Elasticsearch software relied on.

In order to provide the Docker Library community with the same level of support for any Elastic images which are pulled from Docker Hub, it is necessary that these images are equivalent with those which come from the Elastic build system. This equivalence allows us to address issues in a specific version of Elasticsearch with a full understanding of exactly what exists in that version, allowing us to support and troubleshoot any issues effectively and efficiently. It also allows Elastic to respond to issues with any necessary updates rapidly, and without the risk of divergent image content.

After extensive discussions and collaboration with Docker, it has been determined that the easiest, fastest, and most stable way to accomplish this is to use the Elastic images directly rather than rely on setting up an exact replica of Elastic’s build and testing systems. The code contained within this image is open (references to the code and the referenced image can be viewed within the image Dockerfile).

@@ -1,21 +1,25 @@
# this file is generated via https://github.com/docker-library/elasticsearch/blob/47a72b6f1962df04a62616b1c3c32e85b5410639/generate-stackbrew-library.sh
# this file is generated via https://github.com/docker-library/elasticsearch/blob/d22dc8b36939ab325763fa92e4e6ee3059aaea59/generate-stackbrew-library.sh

Maintainers: Tianon Gravi <admwiggin@gmail.com> (@tianon),
Joseph Ferguson <yosifkit@gmail.com> (@yosifkit)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We'll probably want to update this field at some point. 😄 ❤️

(IMO, not worth holding this up for that.)

@tianon
Copy link
Member

tianon commented Oct 5, 2018

Diff:
diff --git a/_bashbrew-arches b/_bashbrew-arches
index af1407d..9874b3e 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -1,4 +1,5 @@
-elasticsearch:2 @ amd64
-elasticsearch:2-alpine @ amd64
+elasticsearch:6.4.0 @ amd64
+elasticsearch:6.4.1 @ amd64
+elasticsearch:6.4.2 @ amd64
 elasticsearch:alpine @ amd64
 elasticsearch:latest @ amd64
diff --git a/_bashbrew-list b/_bashbrew-list
index 507381a..a91ec68 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,14 +1,11 @@
-elasticsearch:2
-elasticsearch:2-alpine
-elasticsearch:2.4
-elasticsearch:2.4-alpine
-elasticsearch:2.4.6
-elasticsearch:2.4.6-alpine
 elasticsearch:5
 elasticsearch:5-alpine
 elasticsearch:5.6
 elasticsearch:5.6-alpine
 elasticsearch:5.6.12
 elasticsearch:5.6.12-alpine
+elasticsearch:6.4.0
+elasticsearch:6.4.1
+elasticsearch:6.4.2
 elasticsearch:alpine
 elasticsearch:latest
diff --git a/elasticsearch_2-alpine/Dockerfile b/elasticsearch_2-alpine/Dockerfile
deleted file mode 100644
index b059983..0000000
diff --git a/elasticsearch_2-alpine/config/elasticsearch.yml b/elasticsearch_2-alpine/config/elasticsearch.yml
deleted file mode 100644
index 5108c77..0000000
diff --git a/elasticsearch_2-alpine/config/logging.yml b/elasticsearch_2-alpine/config/logging.yml
deleted file mode 100644
index c2681ac..0000000
diff --git a/elasticsearch_2-alpine/docker-entrypoint.sh b/elasticsearch_2-alpine/docker-entrypoint.sh
deleted file mode 100755
index 5d3abd7..0000000
diff --git a/elasticsearch_2/Dockerfile b/elasticsearch_2/Dockerfile
deleted file mode 100644
index 4dae7f8..0000000
diff --git a/elasticsearch_2/config/elasticsearch.yml b/elasticsearch_2/config/elasticsearch.yml
deleted file mode 100644
index 5108c77..0000000
diff --git a/elasticsearch_2/config/logging.yml b/elasticsearch_2/config/logging.yml
deleted file mode 100644
index c2681ac..0000000
diff --git a/elasticsearch_2/docker-entrypoint.sh b/elasticsearch_2/docker-entrypoint.sh
deleted file mode 100755
index c9a3a92..0000000
diff --git a/elasticsearch_6.4.0/Dockerfile b/elasticsearch_6.4.0/Dockerfile
new file mode 100644
index 0000000..3f12ae9
--- /dev/null
+++ b/elasticsearch_6.4.0/Dockerfile
@@ -0,0 +1,11 @@
+# Elasticsearch 6.4.0
+
+# This image re-bundles the Docker image from the upstream provider, Elastic. 
+FROM docker.elastic.co/elasticsearch/elasticsearch:6.4.0@sha256:2244676001fa9b12012ec1f7a51526a8d7384fcb02674e5ae29b6e637e363908
+
+# The upstream image was built by:
+#   https://github.com/elastic/elasticsearch-docker/tree/6.4.0
+
+# For a full list of supported images and tags visit https://www.docker.elastic.co
+
+# For Elasticsearch documentation visit https://www.elastic.co/guide/en/elasticsearch/reference/current/docker.html
diff --git a/elasticsearch_6.4.1/Dockerfile b/elasticsearch_6.4.1/Dockerfile
new file mode 100644
index 0000000..9dd6e82
--- /dev/null
+++ b/elasticsearch_6.4.1/Dockerfile
@@ -0,0 +1,11 @@
+# Elasticsearch 6.4.1
+
+# This image re-bundles the Docker image from the upstream provider, Elastic. 
+FROM docker.elastic.co/elasticsearch/elasticsearch:6.4.1@sha256:38a820e5cce4f6c9a3a5a135e8c1f0936655cb8934dcc03bfcb28c1450d5c457
+
+# The upstream image was built by:
+#   https://github.com/elastic/elasticsearch-docker/tree/6.4.1
+
+# For a full list of supported images and tags visit https://www.docker.elastic.co
+
+# For Elasticsearch documentation visit https://www.elastic.co/guide/en/elasticsearch/reference/current/docker.html
diff --git a/elasticsearch_6.4.2/Dockerfile b/elasticsearch_6.4.2/Dockerfile
new file mode 100644
index 0000000..59766b6
--- /dev/null
+++ b/elasticsearch_6.4.2/Dockerfile
@@ -0,0 +1,11 @@
+# Elasticsearch 6.4.2
+
+# This image re-bundles the Docker image from the upstream provider, Elastic. 
+FROM docker.elastic.co/elasticsearch/elasticsearch:6.4.2@sha256:3da16b2f3b1d4e151c44f1a54f4f29d8be64884a64504b24ebcbdb4e14c80aa1
+
+# The upstream image was built by:
+#   https://github.com/elastic/elasticsearch-docker/tree/6.4.2
+
+# For a full list of supported images and tags visit https://www.docker.elastic.co
+
+# For Elasticsearch documentation visit https://www.elastic.co/guide/en/elasticsearch/reference/current/docker.html

@tianon
Copy link
Member

tianon commented Oct 5, 2018

So to summarize:

  1. these images have the same level of build transparency we provide (one can go inspect the exact commit contents which resulted in the built image, and even reproduce the build -- see the links in the Dockerfile to trace that backwards)

  2. these images have deeper testing than we provide (our elasticsearch testing is very surface-level)

  3. these images have proper open-source and commercial support from Elastic

  4. they'll still be updated via this same PR/review process as all other official images

👍 ❤️

@tianon
Copy link
Member

tianon commented Oct 5, 2018

LGTM

Build test of #4916; 5810996; amd64 (elasticsearch):

$ bashbrew build elasticsearch:6.4.1
Pulling docker.elastic.co/elasticsearch/elasticsearch:6.4.1@sha256:38a820e5cce4f6c9a3a5a135e8c1f0936655cb8934dcc03bfcb28c1450d5c457 (elasticsearch:6.4.1)
Building bashbrew/cache:45d17b123c5519258ff6726c793e71e2884e0f7c070f1db896c77d4d9fe855e2 (elasticsearch:6.4.1)
Tagging elasticsearch:6.4.1

$ test/run.sh elasticsearch:6.4.1
testing elasticsearch:6.4.1
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...warning: garbage password detected for 'root': 'locked'
passed
	'override-cmd' [4/5]...passed
	'elasticsearch-basics' [5/5].......passed


$ bashbrew build elasticsearch:6.4.0
Pulling docker.elastic.co/elasticsearch/elasticsearch:6.4.0@sha256:2244676001fa9b12012ec1f7a51526a8d7384fcb02674e5ae29b6e637e363908 (elasticsearch:6.4.0)
Building bashbrew/cache:22ff9b9372f0f874b9d207242f61ccf7a172ae8c44713fc91aeb87512dccac35 (elasticsearch:6.4.0)
Tagging elasticsearch:6.4.0

$ test/run.sh elasticsearch:6.4.0
testing elasticsearch:6.4.0
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...warning: garbage password detected for 'root': 'locked'
passed
	'override-cmd' [4/5]...passed
	'elasticsearch-basics' [5/5].......passed


$ bashbrew build elasticsearch:6.4.2
Pulling docker.elastic.co/elasticsearch/elasticsearch:6.4.2@sha256:3da16b2f3b1d4e151c44f1a54f4f29d8be64884a64504b24ebcbdb4e14c80aa1 (elasticsearch:6.4.2)
Building bashbrew/cache:a4cda029f71517b1ab966f13ba7f4963bb256f9bc70ba601d7d9359503ac7c4a (elasticsearch:6.4.2)
Tagging elasticsearch:6.4.2

$ test/run.sh elasticsearch:6.4.2
testing elasticsearch:6.4.2
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...warning: garbage password detected for 'root': 'locked'
passed
	'override-cmd' [4/5]...passed
	'elasticsearch-basics' [5/5]......passed


$ bashbrew build elasticsearch:5.6.12
Using bashbrew/cache:239bdce67d580aca05f5710d17630ad704d2944adc047e962e4281ab94d87a98 (elasticsearch:5.6.12)
Tagging elasticsearch:5.6.12
Tagging elasticsearch:5.6
Tagging elasticsearch:5
Tagging elasticsearch:latest

$ test/run.sh elasticsearch:5.6.12
testing elasticsearch:5.6.12
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'elasticsearch-basics' [5/5]......passed


$ bashbrew build elasticsearch:5.6.12-alpine
Using bashbrew/cache:b4c2896014e4de321e792285c4401a0d6cf04c8d54236bc5ea8ae4a75ecb24b5 (elasticsearch:5.6.12-alpine)
Tagging elasticsearch:5.6.12-alpine
Tagging elasticsearch:5.6-alpine
Tagging elasticsearch:5-alpine
Tagging elasticsearch:alpine

$ test/run.sh elasticsearch:5.6.12-alpine
testing elasticsearch:5.6.12-alpine
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'elasticsearch-basics' [5/5]......passed

@tianon tianon merged commit 14814a6 into docker-library:master Oct 5, 2018
@tianon tianon mentioned this pull request Oct 5, 2018
@jethr0null jethr0null deleted the update_elasticsearch branch October 5, 2018 23:31
tianon added a commit to docker-library/elasticsearch that referenced this pull request Oct 17, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants