search

docker-library / elasticsearch

DEPRECATED; https://github.com/docker-library/official-images/pull/15808
https://www.elastic.co/guide/en/elasticsearch/reference/current/docker.html
Apache License 2.0
485 stars 347 forks source link

Updated Elasticsearch for v 6.x.x official images #180

Closed jethr0null closed 6 years ago

tianon commented 6 years ago

Useful diff:

$ diff -u <(bashbrew cat elasticsearch) <(bashbrew cat <(./generate-stackbrew-library.sh))
--- /dev/fd/63  2018-10-03 11:11:54.896701437 -0700
+++ /dev/fd/62  2018-10-03 11:11:54.896701437 -0700
@@ -1,18 +1,22 @@
 Maintainers: Tianon Gravi <admwiggin@gmail.com> (@tianon), Joseph Ferguson <yosifkit@gmail.com> (@yosifkit)
 GitRepo: https://github.com/docker-library/elasticsearch.git

+Tags: 6.4.1
+GitCommit: 41ec004d537b2d5d1a4bdd5664fbee018f8cb98e
+Directory: 6.4.1
+
+Tags: 6.4.0
+GitCommit: 936f5c437c1509a8ee090868b030ca2f89cc0021
+Directory: 6.4.0
+
+Tags: 6.4.2
+GitCommit: 41ec004d537b2d5d1a4bdd5664fbee018f8cb98e
+Directory: 6
+
 Tags: 5.6.12, 5.6, 5, latest
-GitCommit: b30b4e51e77c6289be522b1d5c3d64918b9d77d9
+GitCommit: d22dc8b36939ab325763fa92e4e6ee3059aaea59
 Directory: 5

 Tags: 5.6.12-alpine, 5.6-alpine, 5-alpine, alpine
-GitCommit: b30b4e51e77c6289be522b1d5c3d64918b9d77d9
+GitCommit: d22dc8b36939ab325763fa92e4e6ee3059aaea59
 Directory: 5/alpine
-
-Tags: 2.4.6, 2.4, 2
-GitCommit: 8e87587ac5d6b44a8382a229162c88e65618c30a
-Directory: 2.4
-
-Tags: 2.4.6-alpine, 2.4-alpine, 2-alpine
-GitCommit: 8e87587ac5d6b44a8382a229162c88e65618c30a
-Directory: 2.4/alpine
tianon commented 6 years ago

And the output of ./update.sh:

$ ./update.sh
+ cp docker-entrypoint.sh 5/
+ sed '
                s!%%ELASTICSEARCH_VERSION%%!5.6.12!g;
                s!%%ELASTICSEARCH_DEB_REPO%%!https://artifacts.elastic.co/packages/5.x/apt!g;
                s!%%ELASTICSEARCH_DEB_VERSION%%!5.6.12!g;
            ' Dockerfile-debian.template
+ cp docker-entrypoint.sh 5/alpine/
+ sed -i s/gosu/su-exec/g 5/alpine/docker-entrypoint.sh
+ sed -e 's!%%ELASTICSEARCH_VERSION%%!5.6.12!g' -e 's!%%ELASTICSEARCH_TARBALL%%!https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.6.12.tar.gz!g' -e 's!%%ELASTICSEARCH_TARBALL_ASC%%!https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.6.12.tar.gz.asc!g' -e 's!%%ELASTICSEARCH_TARBALL_SHA1%%!bc57fb5f089d7859ad2db5b10dc7561c711fd419!g' Dockerfile-alpine.template
+ sed '
                s!%%ELASTICSEARCH_VERSION%%!6.4.2!g;
                s!%%UPSTREAM_IMAGE_DIGEST%%!docker.elastic.co/elasticsearch/elasticsearch:6.4.2@sha256:3da16b2f3b1d4e151c44f1a54f4f29d8be64884a64504b24ebcbdb4e14c80aa1!g;
            ' Dockerfile-upstream.template
+ sed '
                s!%%ELASTICSEARCH_VERSION%%!6.4.0!g;
                s!%%UPSTREAM_IMAGE_DIGEST%%!docker.elastic.co/elasticsearch/elasticsearch:6.4.0@sha256:2244676001fa9b12012ec1f7a51526a8d7384fcb02674e5ae29b6e637e363908!g;
            ' Dockerfile-upstream.template
+ sed '
                s!%%ELASTICSEARCH_VERSION%%!6.4.1!g;
                s!%%UPSTREAM_IMAGE_DIGEST%%!docker.elastic.co/elasticsearch/elasticsearch:6.4.1@sha256:38a820e5cce4f6c9a3a5a135e8c1f0936655cb8934dcc03bfcb28c1450d5c457!g;
            ' Dockerfile-upstream.template

(Which makes no Dockerfile changes.)

tianon commented 6 years ago

(The explanation for why we're doing it this way and why there's an exception being granted here is going to go into the PR to https://github.com/docker-library/official-images, right? :pray: :heart:)

tianon commented 6 years ago

(The explanation for why we're doing it this way and why there's an exception being granted here is going to go into the PR to https://github.com/docker-library/official-images, right? :pray: :heart:)

We discussed offline, and this is exactly the case. :+1:

Fire in the hole!