Update ELK images #9758
Merged
Update ELK images #9758
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
elasticsearch: - docker-library/elasticsearch@4ac154b: Update to 7.11.1 - docker-library/elasticsearch@29bc2ab: Update to 6.8.14 - docker-library/elasticsearch@db67263: Update to 7.11.0 - docker-library/elasticsearch@9043b04: Update to 7.10.2 logstash: - docker-library/logstash@2b17ad4: Update to 7.11.1 - docker-library/logstash@4a715b5: Update to 6.8.14 - docker-library/logstash@c4aa9b9: Update to 7.11.0 - docker-library/logstash@5ae8fc1: Update to 7.10.2 kibana: - docker-library/kibana@877c966: Update to 7.11.1 - docker-library/kibana@a813600: Update to 6.8.14 - docker-library/kibana@89b7f10: Update to 7.11.0 - docker-library/kibana@2282b15: Update to 7.10.2
Diff for e87887f:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 85ac5e9..6f42b83 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -2,13 +2,13 @@
Maintainers: Tianon Gravi <admwiggin@gmail.com> (@tianon), Joseph Ferguson <yosifkit@gmail.com> (@yosifkit)
GitRepo: https://github.com/docker-library/elasticsearch.git
-Tags: 6.8.13
-GitCommit: 008dd9ddffa1881494e32f6c09763e5097293964
+Tags: 6.8.14
+GitCommit: 29bc2aba27cf15e72e0fd05fbfca2f6ac6d07606
Directory: 6
-Tags: 7.10.1
+Tags: 7.11.1
Architectures: amd64, arm64v8
-GitCommit: 38f3a55628528582a5a951e2fab6c01878af163c
+GitCommit: 4ac154b859d306286cf240607fe2bdefa0a1caab
Directory: 7
@@ -16,12 +16,12 @@ Directory: 7
Maintainers: Tianon Gravi <admwiggin@gmail.com> (@tianon), Joseph Ferguson <yosifkit@gmail.com> (@yosifkit)
GitRepo: https://github.com/docker-library/kibana.git
-Tags: 6.8.13
-GitCommit: fc4b5ff0a085e951ea59036fc358f669fd3c437a
+Tags: 6.8.14
+GitCommit: a813600132694cac07a88cc664e9514fe182707d
Directory: 6
-Tags: 7.10.1
-GitCommit: 87f688d33b13dfb010749eae424f273e7a10ec95
+Tags: 7.11.1
+GitCommit: 877c9667aa8ee261416bb5a23ac16f59e0a21232
Directory: 7
@@ -29,10 +29,10 @@ Directory: 7
Maintainers: Tianon Gravi <admwiggin@gmail.com> (@tianon), Joseph Ferguson <yosifkit@gmail.com> (@yosifkit)
GitRepo: https://github.com/docker-library/logstash.git
-Tags: 6.8.13
-GitCommit: 2da1d2dadb1fdb07166f190d82d891393dc3d234
+Tags: 6.8.14
+GitCommit: 4a715b5d08700e32cd60b7b38d09eaa46bdf8587
Directory: 6
-Tags: 7.10.1
-GitCommit: 8178ceb29afa653f2ee0e4e4cf8c99d76e97a7b3
+Tags: 7.11.1
+GitCommit: 2b17ad49cce713524f1442b4fe35494d81ae27dc
Directory: 7
diff --git a/_bashbrew-list b/_bashbrew-list
index 79fe516..2163677 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,6 +1,6 @@
-elasticsearch:6.8.13
-elasticsearch:7.10.1
-kibana:6.8.13
-kibana:7.10.1
-logstash:6.8.13
-logstash:7.10.1
+elasticsearch:6.8.14
+elasticsearch:7.11.1
+kibana:6.8.14
+kibana:7.11.1
+logstash:6.8.14
+logstash:7.11.1
diff --git a/elasticsearch_6.8.13/Dockerfile b/elasticsearch_6.8.14/Dockerfile
similarity index 70%
rename from elasticsearch_6.8.13/Dockerfile
rename to elasticsearch_6.8.14/Dockerfile
index 90ec4eb..6198f9e 100644
--- a/elasticsearch_6.8.13/Dockerfile
+++ b/elasticsearch_6.8.14/Dockerfile
@@ -1,14 +1,14 @@
-# Elasticsearch 6.8.13
+# Elasticsearch 6.8.14
# This image re-bundles the Docker image from the upstream provider, Elastic.
-FROM docker.elastic.co/elasticsearch/elasticsearch:6.8.13@sha256:dca6a75fb0db7ff2ca7d1e18797f0936ef7e2e7e02ad253ae648292639c1ff82
+FROM docker.elastic.co/elasticsearch/elasticsearch:6.8.14@sha256:25f5adbc8ce11f60bb099631db5c33e2508b2991406e16cb03879fbdd26a76fd
# Supported Bashbrew Architectures: amd64
# The upstream image was built by:
-# https://github.com/elastic/dockerfiles/tree/v6.8.13/elasticsearch
+# https://github.com/elastic/dockerfiles/tree/v6.8.14/elasticsearch
# The build can be reproduced locally via:
-# docker build 'https://github.com/elastic/dockerfiles.git#v6.8.13:elasticsearch'
+# docker build 'https://github.com/elastic/dockerfiles.git#v6.8.14:elasticsearch'
# For a full list of supported images and tags visit https://www.docker.elastic.co
diff --git a/elasticsearch_7.10.1/Dockerfile b/elasticsearch_7.11.1/Dockerfile
similarity index 70%
rename from elasticsearch_7.10.1/Dockerfile
rename to elasticsearch_7.11.1/Dockerfile
index 34314f5..5e1227f 100644
--- a/elasticsearch_7.10.1/Dockerfile
+++ b/elasticsearch_7.11.1/Dockerfile
@@ -1,14 +1,14 @@
-# Elasticsearch 7.10.1
+# Elasticsearch 7.11.1
# This image re-bundles the Docker image from the upstream provider, Elastic.
-FROM docker.elastic.co/elasticsearch/elasticsearch:7.10.1@sha256:5d8f1962907ef60746a8cf61c8a7f2b8755510ee36bdee0f65417f90a38a0139
+FROM docker.elastic.co/elasticsearch/elasticsearch:7.11.1@sha256:bff764c6dcc1241288698722a83e72d54fbaa336fd447c5a78f23c5cf159435b
# Supported Bashbrew Architectures: amd64 arm64v8
# The upstream image was built by:
-# https://github.com/elastic/dockerfiles/tree/v7.10.1/elasticsearch
+# https://github.com/elastic/dockerfiles/tree/v7.11.1/elasticsearch
# The build can be reproduced locally via:
-# docker build 'https://github.com/elastic/dockerfiles.git#v7.10.1:elasticsearch'
+# docker build 'https://github.com/elastic/dockerfiles.git#v7.11.1:elasticsearch'
# For a full list of supported images and tags visit https://www.docker.elastic.co
diff --git a/kibana_6.8.13/Dockerfile b/kibana_6.8.14/Dockerfile
similarity index 69%
rename from kibana_6.8.13/Dockerfile
rename to kibana_6.8.14/Dockerfile
index 2cc1ea2..d6ad3f8 100644
--- a/kibana_6.8.13/Dockerfile
+++ b/kibana_6.8.14/Dockerfile
@@ -1,13 +1,13 @@
-# Kibana 6.8.13
+# Kibana 6.8.14
# This image re-bundles the Docker image from the upstream provider, Elastic.
-FROM docker.elastic.co/kibana/kibana:6.8.13@sha256:fe5d181d7fa0523005538c986215aa9fe31e88712828194bc0d13a8f3a5c4714
+FROM docker.elastic.co/kibana/kibana:6.8.14@sha256:c4cf5cf0a6f61a6f650a827ff1115540ceb187bd83455788a15392fb1b65be7d
# The upstream image was built by:
-# https://github.com/elastic/dockerfiles/tree/v6.8.13/kibana
+# https://github.com/elastic/dockerfiles/tree/v6.8.14/kibana
# The build can be reproduced locally via:
-# docker build 'https://github.com/elastic/dockerfiles.git#v6.8.13:kibana'
+# docker build 'https://github.com/elastic/dockerfiles.git#v6.8.14:kibana'
# For a full list of supported images and tags visit https://www.docker.elastic.co
diff --git a/kibana_7.10.1/Dockerfile b/kibana_7.11.1/Dockerfile
similarity index 69%
rename from kibana_7.10.1/Dockerfile
rename to kibana_7.11.1/Dockerfile
index 3917a24..8318220 100644
--- a/kibana_7.10.1/Dockerfile
+++ b/kibana_7.11.1/Dockerfile
@@ -1,13 +1,13 @@
-# Kibana 7.10.1
+# Kibana 7.11.1
# This image re-bundles the Docker image from the upstream provider, Elastic.
-FROM docker.elastic.co/kibana/kibana:7.10.1@sha256:e6488b7cdd9733ece70903f5fd587e04810f9f5115ac31b35cb44569f0b408bb
+FROM docker.elastic.co/kibana/kibana:7.11.1@sha256:fbc1f4807090f044397cf7d5d5c0272075b9ead9657043f5c1d467bb9a7ea81e
# The upstream image was built by:
-# https://github.com/elastic/dockerfiles/tree/v7.10.1/kibana
+# https://github.com/elastic/dockerfiles/tree/v7.11.1/kibana
# The build can be reproduced locally via:
-# docker build 'https://github.com/elastic/dockerfiles.git#v7.10.1:kibana'
+# docker build 'https://github.com/elastic/dockerfiles.git#v7.11.1:kibana'
# For a full list of supported images and tags visit https://www.docker.elastic.co
diff --git a/logstash_6.8.13/Dockerfile b/logstash_6.8.14/Dockerfile
similarity index 69%
rename from logstash_6.8.13/Dockerfile
rename to logstash_6.8.14/Dockerfile
index 02c4069..c27358e 100644
--- a/logstash_6.8.13/Dockerfile
+++ b/logstash_6.8.14/Dockerfile
@@ -1,13 +1,13 @@
-# Logstash 6.8.13
+# Logstash 6.8.14
# This image re-bundles the Docker image from the upstream provider, Elastic.
-FROM docker.elastic.co/logstash/logstash:6.8.13@sha256:ca64f0246ae07cfa47e0d1f3c0992e9af8cb67528acb9f1f47f357a3f5422a35
+FROM docker.elastic.co/logstash/logstash:6.8.14@sha256:f2ef5dee9451c014822318bc91ff78aed54280d99f244b1e03f6999ccbcf48a7
# The upstream image was built by:
-# https://github.com/elastic/dockerfiles/tree/v6.8.13/logstash
+# https://github.com/elastic/dockerfiles/tree/v6.8.14/logstash
# The build can be reproduced locally via:
-# docker build 'https://github.com/elastic/dockerfiles.git#v6.8.13:logstash'
+# docker build 'https://github.com/elastic/dockerfiles.git#v6.8.14:logstash'
# For a full list of supported images and tags visit https://www.docker.elastic.co
diff --git a/logstash_7.10.1/Dockerfile b/logstash_7.11.1/Dockerfile
similarity index 69%
rename from logstash_7.10.1/Dockerfile
rename to logstash_7.11.1/Dockerfile
index 7a6f0e6..8e80a81 100644
--- a/logstash_7.10.1/Dockerfile
+++ b/logstash_7.11.1/Dockerfile
@@ -1,13 +1,13 @@
-# Logstash 7.10.1
+# Logstash 7.11.1
# This image re-bundles the Docker image from the upstream provider, Elastic.
-FROM docker.elastic.co/logstash/logstash:7.10.1@sha256:a9ac93266b783eb26b7ebf1d4635f3f0a8ab094f12ef7faf138f8d7d248aa339
+FROM docker.elastic.co/logstash/logstash:7.11.1@sha256:e5190d2c877b8163c20681794c5f22cd93c40f9db84b9f1afe377d67cddf23c3
# The upstream image was built by:
-# https://github.com/elastic/dockerfiles/tree/v7.10.1/logstash
+# https://github.com/elastic/dockerfiles/tree/v7.11.1/logstash
# The build can be reproduced locally via:
-# docker build 'https://github.com/elastic/dockerfiles.git#v7.10.1:logstash'
+# docker build 'https://github.com/elastic/dockerfiles.git#v7.11.1:logstash'
# For a full list of supported images and tags visit https://www.docker.elastic.co
|
|
Upstream Diffs: (I have not fully reviewed these yet) |
It seems strange to commit a compiled file to the git repository, even if it is only used in an earlier stage. 🤷♂️
Not good, but for now, I'll assume that upstream Elastic Co are not going to build |
🤦 that was me. We build a tool from source when we build the Docker image in our Gradle build, but I forgot that when create the image via this repo we need to fetch or compile it instead. I'll file an issue to fix this in a subsequent release, if that's OK? Thanks also for your comments re: architecture. We intend to move away from a CentOS base, but haven't yet decided what we'll move to. We have no plans to support 32-bit architectures right now. |
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
elasticsearch:
logstash:
kibana: