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 #6895

Merged
merged 1 commit into from
Oct 31, 2019
Merged

Update ELK images #6895

merged 1 commit into from
Oct 31, 2019

Conversation

tianon
Copy link
Member

@tianon tianon commented Oct 31, 2019

elasticsearch:

logstash:

kibana:

elasticsearch:
- docker-library/elasticsearch@d2a9208: Update to 7.4.2

logstash:
- docker-library/logstash@08f0241: Update to 7.4.2

kibana:
- docker-library/kibana@8533a0a: Update to 7.4.2
@tianon
Copy link
Member Author

tianon commented Oct 31, 2019

Upstream diffs: elastic/dockerfiles@v7.4.1...v7.4.2

@yosifkit
Copy link
Member

Diff:
diff --git a/_bashbrew-arches b/_bashbrew-arches
index 4ffbf0b..b15f896 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -1,6 +1,6 @@
 elasticsearch:6.8.4 @ amd64
-elasticsearch:7.4.1 @ amd64
+elasticsearch:7.4.2 @ amd64
 kibana:6.8.4 @ amd64
-kibana:7.4.1 @ amd64
+kibana:7.4.2 @ amd64
 logstash:6.8.4 @ amd64
-logstash:7.4.1 @ amd64
+logstash:7.4.2 @ amd64
diff --git a/_bashbrew-list b/_bashbrew-list
index 5757123..94be535 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,6 +1,6 @@
 elasticsearch:6.8.4
-elasticsearch:7.4.1
+elasticsearch:7.4.2
 kibana:6.8.4
-kibana:7.4.1
+kibana:7.4.2
 logstash:6.8.4
-logstash:7.4.1
+logstash:7.4.2
diff --git a/elasticsearch_7.4.1/Dockerfile b/elasticsearch_7.4.2/Dockerfile
similarity index 65%
rename from elasticsearch_7.4.1/Dockerfile
rename to elasticsearch_7.4.2/Dockerfile
index 5b704b2..f499f5d 100644
--- a/elasticsearch_7.4.1/Dockerfile
+++ b/elasticsearch_7.4.2/Dockerfile
@@ -1,10 +1,10 @@
-# Elasticsearch 7.4.1
+# Elasticsearch 7.4.2
 
 # This image re-bundles the Docker image from the upstream provider, Elastic.
-FROM docker.elastic.co/elasticsearch/elasticsearch:7.4.1@sha256:88c2ee30115f378b8f7e66662ec26bca0c8778c69096bee6b161128ce833585f
+FROM docker.elastic.co/elasticsearch/elasticsearch:7.4.2@sha256:ef0cdf17f8d00d8d90a7872b6672bc44283c6204e86bdf0067f93e9f637aad2a
 
 # The upstream image was built by:
-#   https://github.com/elastic/dockerfiles/tree/v7.4.1/elasticsearch
+#   https://github.com/elastic/dockerfiles/tree/v7.4.2/elasticsearch
 
 # For a full list of supported images and tags visit https://www.docker.elastic.co
 
diff --git a/kibana_7.4.1/Dockerfile b/kibana_7.4.2/Dockerfile
similarity index 65%
rename from kibana_7.4.1/Dockerfile
rename to kibana_7.4.2/Dockerfile
index 9b329af..cab178b 100644
--- a/kibana_7.4.1/Dockerfile
+++ b/kibana_7.4.2/Dockerfile
@@ -1,10 +1,10 @@
-# Kibana 7.4.1
+# Kibana 7.4.2
 
 # This image re-bundles the Docker image from the upstream provider, Elastic.
-FROM docker.elastic.co/kibana/kibana:7.4.1@sha256:f59ae13bbc36225b1c6ec024e4d388019a081f0c63c99739dee04bc4c29a130d
+FROM docker.elastic.co/kibana/kibana:7.4.2@sha256:d91852c480e53b3649731416bc425fa114013a3d3da2002440b4de0030f6ad47
 
 # The upstream image was built by:
-#   https://github.com/elastic/dockerfiles/tree/v7.4.1/kibana
+#   https://github.com/elastic/dockerfiles/tree/v7.4.2/kibana
 
 # For a full list of supported images and tags visit https://www.docker.elastic.co
 
diff --git a/logstash_7.4.1/Dockerfile b/logstash_7.4.2/Dockerfile
similarity index 65%
rename from logstash_7.4.1/Dockerfile
rename to logstash_7.4.2/Dockerfile
index e65e48f..918ae52 100644
--- a/logstash_7.4.1/Dockerfile
+++ b/logstash_7.4.2/Dockerfile
@@ -1,10 +1,10 @@
-# Logstash 7.4.1
+# Logstash 7.4.2
 
 # This image re-bundles the Docker image from the upstream provider, Elastic.
-FROM docker.elastic.co/logstash/logstash:7.4.1@sha256:c050ce2f4606c9090b1720c0f3644d6e4f4e7dd8a28e1d400b383b53da88d019
+FROM docker.elastic.co/logstash/logstash:7.4.2@sha256:cc470a0462ec05edc227ba14f26c72571b2245e2c64b82fd325036cf0a1b4254
 
 # The upstream image was built by:
-#   https://github.com/elastic/dockerfiles/tree/v7.4.1/logstash
+#   https://github.com/elastic/dockerfiles/tree/v7.4.2/logstash
 
 # For a full list of supported images and tags visit https://www.docker.elastic.co
 

@yosifkit
Copy link
Member

Build test of #6895; 960c054; amd64 (elasticsearch, kibana, logstash):

$ bashbrew build elasticsearch:7.4.2
Pulling docker.elastic.co/elasticsearch/elasticsearch:7.4.2@sha256:ef0cdf17f8d00d8d90a7872b6672bc44283c6204e86bdf0067f93e9f637aad2a (elasticsearch:7.4.2)
Building bashbrew/cache:daf6abe81871b0b1fc161777c9128e6e316858cb0ffe5c6931461b8d5611c150 (elasticsearch:7.4.2)
Tagging elasticsearch:7.4.2

$ test/run.sh elasticsearch:7.4.2
testing elasticsearch:7.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:6.8.4
Using bashbrew/cache:db8f9217627decc0dd19ff8fb73f379737c3dd64bca91ee4a7bff71056cefd63 (elasticsearch:6.8.4)
Tagging elasticsearch:6.8.4

$ test/run.sh elasticsearch:6.8.4
testing elasticsearch:6.8.4
	'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 kibana:7.4.2
Pulling docker.elastic.co/kibana/kibana:7.4.2@sha256:d91852c480e53b3649731416bc425fa114013a3d3da2002440b4de0030f6ad47 (kibana:7.4.2)
Building bashbrew/cache:4990e94894f7d8f4fbad8147d991126f906c7df01ffc08f3accacfc107beb127 (kibana:7.4.2)
Tagging kibana:7.4.2

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


$ bashbrew build kibana:6.8.4
Using bashbrew/cache:bc2a53da6c2f23ce54cc5862e88153f02f78e39d04483ca3d33a5dc904f6abba (kibana:6.8.4)
Tagging kibana:6.8.4

$ test/run.sh kibana:6.8.4
testing kibana:6.8.4
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...warning: garbage password detected for 'root': 'locked'
passed
	'override-cmd' [4/4]...passed
$ bashbrew build logstash:7.4.2
Pulling docker.elastic.co/logstash/logstash:7.4.2@sha256:cc470a0462ec05edc227ba14f26c72571b2245e2c64b82fd325036cf0a1b4254 (logstash:7.4.2)
Building bashbrew/cache:3d850407edd3fe339bf600a580d9b963f4cb52a06bbcfee756ac24b8c62e7e7d (logstash:7.4.2)
Tagging logstash:7.4.2

$ test/run.sh logstash:7.4.2
testing logstash:7.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
	'logstash-basics' [5/5]............passed


$ bashbrew build logstash:6.8.4
Using bashbrew/cache:6d424b8697e0b35e63467460ad0957fe3b7c55510313a7cb7ca08fc5d9fd8ea7 (logstash:6.8.4)
Tagging logstash:6.8.4

$ test/run.sh logstash:6.8.4
testing logstash:6.8.4
	'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
	'logstash-basics' [5/5]...............passed

@yosifkit yosifkit merged commit 5541b68 into docker-library:master Oct 31, 2019
@yosifkit yosifkit deleted the elk branch October 31, 2019 22:27
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