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 ELK images #8121

Merged
merged 1 commit into from
Jun 3, 2020
Merged

Update ELK images #8121

merged 1 commit into from
Jun 3, 2020

Conversation

tianon
Copy link
Member

@tianon tianon commented Jun 3, 2020

elasticsearch:

logstash:

kibana:

elasticsearch:
- docker-library/elasticsearch@859c4b2: Update to 6.8.10
- docker-library/elasticsearch@4745359: Update to 7.7.1

logstash:
- docker-library/logstash@4a45fc4: Update to 6.8.10
- docker-library/logstash@fbf2a11: Update to 7.7.1

kibana:
- docker-library/kibana@96976f5: Update to 6.8.10
- docker-library/kibana@293a582: Update to 7.7.1
@tianon
Copy link
Member Author

tianon commented Jun 3, 2020

@github-actions
Copy link

github-actions bot commented Jun 3, 2020

Diff for 8c4e192:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 58785c9..e7b064a 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -2,12 +2,12 @@
 Maintainers: Tianon Gravi <admwiggin@gmail.com> (@tianon), Joseph Ferguson <yosifkit@gmail.com> (@yosifkit)
 GitRepo: https://github.com/docker-library/elasticsearch.git
 
-Tags: 6.8.9
-GitCommit: 9a07fe301328cb6dfc6cc6aeed784bdc51c31eca
+Tags: 6.8.10
+GitCommit: 859c4b22df4b8cec2cc589e0253bfff46d54af9f
 Directory: 6
 
-Tags: 7.7.0
-GitCommit: 9a07fe301328cb6dfc6cc6aeed784bdc51c31eca
+Tags: 7.7.1
+GitCommit: 474535936a32ff1a04aefa197d7ee11e77cd2e21
 Directory: 7
 
 
@@ -15,12 +15,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.9
-GitCommit: f3512f90b2c0be7c3547095a0bd1e607e18e9af3
+Tags: 6.8.10
+GitCommit: 96976f5b4fabedc3fdf052ecdab323d2a08337e9
 Directory: 6
 
-Tags: 7.7.0
-GitCommit: f3512f90b2c0be7c3547095a0bd1e607e18e9af3
+Tags: 7.7.1
+GitCommit: 293a582c8ec9a78ec4c137ddb77d37c6312c97f3
 Directory: 7
 
 
@@ -28,10 +28,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.9
-GitCommit: 0d647982be457e2a1f1910a143eff0778ba09f76
+Tags: 6.8.10
+GitCommit: 4a45fc4bc7159024f8bbe33a0801b6ca8a643c4f
 Directory: 6
 
-Tags: 7.7.0
-GitCommit: 0d647982be457e2a1f1910a143eff0778ba09f76
+Tags: 7.7.1
+GitCommit: fbf2a117c43ddfc581210f3e884fcab4b03213f6
 Directory: 7
diff --git a/_bashbrew-list b/_bashbrew-list
index 85c138b..a379340 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,6 +1,6 @@
-elasticsearch:6.8.9
-elasticsearch:7.7.0
-kibana:6.8.9
-kibana:7.7.0
-logstash:6.8.9
-logstash:7.7.0
+elasticsearch:6.8.10
+elasticsearch:7.7.1
+kibana:6.8.10
+kibana:7.7.1
+logstash:6.8.10
+logstash:7.7.1
diff --git a/elasticsearch_6.8.9/Dockerfile b/elasticsearch_6.8.10/Dockerfile
similarity index 67%
rename from elasticsearch_6.8.9/Dockerfile
rename to elasticsearch_6.8.10/Dockerfile
index 8367bd5..566a9a3 100644
--- a/elasticsearch_6.8.9/Dockerfile
+++ b/elasticsearch_6.8.10/Dockerfile
@@ -1,13 +1,13 @@
-# Elasticsearch 6.8.9
+# Elasticsearch 6.8.10
 
 # This image re-bundles the Docker image from the upstream provider, Elastic.
-FROM docker.elastic.co/elasticsearch/elasticsearch:6.8.9@sha256:593b06516f44fddcaa1078cf67fcf128b603905d2c13efe4809e9b56c6d68351
+FROM docker.elastic.co/elasticsearch/elasticsearch:6.8.10@sha256:f8e21f6b2ef75dcda374da505fcb0ff4bf7e8d025f12096c498123fa4e372c1b
 
 # The upstream image was built by:
-#   https://github.com/elastic/dockerfiles/tree/v6.8.9/elasticsearch
+#   https://github.com/elastic/dockerfiles/tree/v6.8.10/elasticsearch
 
 # The build can be reproduced locally via:
-#   docker build 'https://github.com/elastic/dockerfiles.git#v6.8.9:elasticsearch'
+#   docker build 'https://github.com/elastic/dockerfiles.git#v6.8.10:elasticsearch'
 
 # For a full list of supported images and tags visit https://www.docker.elastic.co
 
diff --git a/elasticsearch_7.7.0/Dockerfile b/elasticsearch_7.7.1/Dockerfile
similarity index 68%
rename from elasticsearch_7.7.0/Dockerfile
rename to elasticsearch_7.7.1/Dockerfile
index db9f434..2fc42ee 100644
--- a/elasticsearch_7.7.0/Dockerfile
+++ b/elasticsearch_7.7.1/Dockerfile
@@ -1,13 +1,13 @@
-# Elasticsearch 7.7.0
+# Elasticsearch 7.7.1
 
 # This image re-bundles the Docker image from the upstream provider, Elastic.
-FROM docker.elastic.co/elasticsearch/elasticsearch:7.7.0@sha256:b4ec018c974d23a796b1d17ddec3863e4e6deff76d25f58027c45b7a697089dc
+FROM docker.elastic.co/elasticsearch/elasticsearch:7.7.1@sha256:506f9988ccfb01949c1893e8a74c41f42e3b1f12dfe342500aa06e4fcaada5bc
 
 # The upstream image was built by:
-#   https://github.com/elastic/dockerfiles/tree/v7.7.0/elasticsearch
+#   https://github.com/elastic/dockerfiles/tree/v7.7.1/elasticsearch
 
 # The build can be reproduced locally via:
-#   docker build 'https://github.com/elastic/dockerfiles.git#v7.7.0:elasticsearch'
+#   docker build 'https://github.com/elastic/dockerfiles.git#v7.7.1:elasticsearch'
 
 # For a full list of supported images and tags visit https://www.docker.elastic.co
 
diff --git a/kibana_6.8.9/Dockerfile b/kibana_6.8.10/Dockerfile
similarity index 69%
rename from kibana_6.8.9/Dockerfile
rename to kibana_6.8.10/Dockerfile
index 48869bc..fda1cf9 100644
--- a/kibana_6.8.9/Dockerfile
+++ b/kibana_6.8.10/Dockerfile
@@ -1,13 +1,13 @@
-# Kibana 6.8.9
+# Kibana 6.8.10
 
 # This image re-bundles the Docker image from the upstream provider, Elastic.
-FROM docker.elastic.co/kibana/kibana:6.8.9@sha256:cf376141e7f543e368055308fa0e64ffe169eb7f8097abc84ba33be4b5c904e4
+FROM docker.elastic.co/kibana/kibana:6.8.10@sha256:3861043b3fbb9bc85581c181d3158a3307e8b51e24f3341c339d2267a2d3b076
 
 # The upstream image was built by:
-#   https://github.com/elastic/dockerfiles/tree/v6.8.9/kibana
+#   https://github.com/elastic/dockerfiles/tree/v6.8.10/kibana
 
 # The build can be reproduced locally via:
-#   docker build 'https://github.com/elastic/dockerfiles.git#v6.8.9:kibana'
+#   docker build 'https://github.com/elastic/dockerfiles.git#v6.8.10:kibana'
 
 # For a full list of supported images and tags visit https://www.docker.elastic.co
 
diff --git a/kibana_7.7.0/Dockerfile b/kibana_7.7.1/Dockerfile
similarity index 70%
rename from kibana_7.7.0/Dockerfile
rename to kibana_7.7.1/Dockerfile
index e1aa1ca..b06886c 100644
--- a/kibana_7.7.0/Dockerfile
+++ b/kibana_7.7.1/Dockerfile
@@ -1,13 +1,13 @@
-# Kibana 7.7.0
+# Kibana 7.7.1
 
 # This image re-bundles the Docker image from the upstream provider, Elastic.
-FROM docker.elastic.co/kibana/kibana:7.7.0@sha256:1682e44eb728e1de2027c2cc8787d206388d9f73391928bdbfbbd24d758dd927
+FROM docker.elastic.co/kibana/kibana:7.7.1@sha256:f9a1a4ac02e17d8a7700ac7641effc198d19e97c33b617e9e44a3f67a705d381
 
 # The upstream image was built by:
-#   https://github.com/elastic/dockerfiles/tree/v7.7.0/kibana
+#   https://github.com/elastic/dockerfiles/tree/v7.7.1/kibana
 
 # The build can be reproduced locally via:
-#   docker build 'https://github.com/elastic/dockerfiles.git#v7.7.0:kibana'
+#   docker build 'https://github.com/elastic/dockerfiles.git#v7.7.1:kibana'
 
 # For a full list of supported images and tags visit https://www.docker.elastic.co
 
diff --git a/logstash_6.8.9/Dockerfile b/logstash_6.8.10/Dockerfile
similarity index 69%
rename from logstash_6.8.9/Dockerfile
rename to logstash_6.8.10/Dockerfile
index 41ffa5e..0205326 100644
--- a/logstash_6.8.9/Dockerfile
+++ b/logstash_6.8.10/Dockerfile
@@ -1,13 +1,13 @@
-# Logstash 6.8.9
+# Logstash 6.8.10
 
 # This image re-bundles the Docker image from the upstream provider, Elastic.
-FROM docker.elastic.co/logstash/logstash:6.8.9@sha256:0ed94c58fd5c706867d19a0b26d769fb9f369ee9a8391b964c39ab388605924d
+FROM docker.elastic.co/logstash/logstash:6.8.10@sha256:705adb4fead8a949f30fc34396369e4ba9d9063918749fab16dc145930ad13a4
 
 # The upstream image was built by:
-#   https://github.com/elastic/dockerfiles/tree/v6.8.9/logstash
+#   https://github.com/elastic/dockerfiles/tree/v6.8.10/logstash
 
 # The build can be reproduced locally via:
-#   docker build 'https://github.com/elastic/dockerfiles.git#v6.8.9:logstash'
+#   docker build 'https://github.com/elastic/dockerfiles.git#v6.8.10:logstash'
 
 # For a full list of supported images and tags visit https://www.docker.elastic.co
 
diff --git a/logstash_7.7.0/Dockerfile b/logstash_7.7.1/Dockerfile
similarity index 69%
rename from logstash_7.7.0/Dockerfile
rename to logstash_7.7.1/Dockerfile
index 8bb80f6..2e69a6a 100644
--- a/logstash_7.7.0/Dockerfile
+++ b/logstash_7.7.1/Dockerfile
@@ -1,13 +1,13 @@
-# Logstash 7.7.0
+# Logstash 7.7.1
 
 # This image re-bundles the Docker image from the upstream provider, Elastic.
-FROM docker.elastic.co/logstash/logstash:7.7.0@sha256:389ba939d3ca1087929215713f811c9ce7d45e5249e3db1aaa7d8c5590b38d56
+FROM docker.elastic.co/logstash/logstash:7.7.1@sha256:2930409e50a09aa1cd156226f9d233158e768e8e9c49e0c2c4cf63d083968c65
 
 # The upstream image was built by:
-#   https://github.com/elastic/dockerfiles/tree/v7.7.0/logstash
+#   https://github.com/elastic/dockerfiles/tree/v7.7.1/logstash
 
 # The build can be reproduced locally via:
-#   docker build 'https://github.com/elastic/dockerfiles.git#v7.7.0:logstash'
+#   docker build 'https://github.com/elastic/dockerfiles.git#v7.7.1:logstash'
 
 # For a full list of supported images and tags visit https://www.docker.elastic.co
 

@yosifkit yosifkit merged commit 45b5808 into docker-library:master Jun 3, 2020
@yosifkit yosifkit deleted the elk branch June 3, 2020 18:26
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