-
Notifications
You must be signed in to change notification settings - Fork 2.4k
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 5.0.0-rc1, logstash 5.0.0-rc1 and kibana 5.0.0-rc1 #2240
Merged
yosifkit
merged 1 commit into
docker-library:master
from
gerardorochin:update_elk_5.0.0-rc1
Oct 11, 2016
Merged
Update elasticsearch 5.0.0-rc1, logstash 5.0.0-rc1 and kibana 5.0.0-rc1 #2240
yosifkit
merged 1 commit into
docker-library:master
from
gerardorochin:update_elk_5.0.0-rc1
Oct 11, 2016
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
diff --git a/elasticsearch_5/Dockerfile b/elasticsearch_5/Dockerfile
index fe9e945..b686edc 100644
--- a/elasticsearch_5/Dockerfile
+++ b/elasticsearch_5/Dockerfile
@@ -12,12 +12,15 @@ RUN set -x \
&& chmod +x /usr/local/bin/gosu \
&& gosu nobody true
-# https://www.elastic.co/guide/en/elasticsearch/reference/current/setup-repositories.html
-# https://packages.elasticsearch.org/GPG-KEY-elasticsearch
-RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 46095ACC8548582C1A2699A9D27D666CD88E42B4
-
-ENV ELASTICSEARCH_VERSION 5.0.0-alpha5
-ENV ELASTICSEARCH_REPO_BASE http://packages.elasticsearch.org/elasticsearch/5.x/debian
+# https://www.elastic.co/guide/en/elasticsearch/reference/5.0/deb.html
+# https://artifacts.elastic.co/GPG-KEY-elasticsearch
+RUN apt-get update \
+ && apt-get install -y --no-install-recommends apt-transport-https \
+ && apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 46095ACC8548582C1A2699A9D27D666CD88E42B4 \
+ && rm -rf /var/lib/apt/lists/*
+
+ENV ELASTICSEARCH_VERSION 5.0.0-rc1
+ENV ELASTICSEARCH_REPO_BASE https://artifacts.elastic.co/packages/5.x-prerelease/apt
RUN echo "deb $ELASTICSEARCH_REPO_BASE stable main" > /etc/apt/sources.list.d/elasticsearch.list
diff --git a/elasticsearch_5/config/log4j2.properties b/elasticsearch_5/config/log4j2.properties
new file mode 100644
index 0000000..46877d0
--- /dev/null
+++ b/elasticsearch_5/config/log4j2.properties
@@ -0,0 +1,9 @@
+status = error
+
+appender.console.type = Console
+appender.console.name = console
+appender.console.layout.type = PatternLayout
+appender.console.layout.pattern = [%d{ISO8601}][%-5p][%-25c{1.}] %marker%m%n
+
+rootLogger.level = info
+rootLogger.appenderRef.console.ref = console
diff --git a/elasticsearch_5/config/logging.yml b/elasticsearch_5/config/logging.yml
deleted file mode 100644
index c2681ac..0000000
diff --git a/kibana_5/Dockerfile b/kibana_5/Dockerfile
index 7e6d4d5..7003892 100644
--- a/kibana_5/Dockerfile
+++ b/kibana_5/Dockerfile
@@ -4,6 +4,7 @@ FROM debian:jessie
RUN groupadd -r kibana && useradd -r -m -g kibana kibana
RUN apt-get update && apt-get install -y \
+ apt-transport-https \
ca-certificates \
wget \
--no-install-recommends && rm -rf /var/lib/apt/lists/*
@@ -37,10 +38,10 @@ RUN set -x \
RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 46095ACC8548582C1A2699A9D27D666CD88E42B4
ENV KIBANA_MAJOR 5.0
-ENV KIBANA_VERSION 5.0.0-alpha5
+ENV KIBANA_VERSION 5.0.0-rc1
#RUN echo "deb http://packages.elastic.co/kibana/${KIBANA_MAJOR}/debian stable main" > /etc/apt/sources.list.d/kibana.list
-RUN echo 'deb http://packages.elastic.co/kibana/5.0.0-alpha/debian stable main' > /etc/apt/sources.list.d/kibana.list
+RUN echo 'deb https://artifacts.elastic.co/packages/5.x-prerelease/apt stable main' > /etc/apt/sources.list.d/kibana.list
# TODO figure out what's going on here and what it'll settle to for 5.0 GA
RUN set -x \
diff --git a/logstash_5/Dockerfile b/logstash_5/Dockerfile
index c60187d..69c68df 100644
--- a/logstash_5/Dockerfile
+++ b/logstash_5/Dockerfile
@@ -2,6 +2,7 @@ FROM openjdk:8-jre
# install plugin dependencies
RUN apt-get update && apt-get install -y --no-install-recommends \
+ apt-transport-https \
libzmq3 \
&& rm -rf /var/lib/apt/lists/*
@@ -21,14 +22,14 @@ RUN set -x \
&& chmod +x /usr/local/bin/gosu \
&& gosu nobody true
-# https://www.elastic.co/guide/en/logstash/2.3/package-repositories.html
-# https://packages.elastic.co/GPG-KEY-elasticsearch
+# https://www.elastic.co/guide/en/logstash/5.0/installing-logstash.html
+# https://artifacts.elastic.co/GPG-KEY-elasticsearch
RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 46095ACC8548582C1A2699A9D27D666CD88E42B4
-ENV LOGSTASH_MAJOR 5.0
-ENV LOGSTASH_VERSION 1:5.0.0~alpha5-1
+ENV LOGSTASH_MAJOR 5.x
+ENV LOGSTASH_VERSION 1:5.0.0~rc1-1
-RUN echo "deb http://packages.elastic.co/logstash/${LOGSTASH_MAJOR}/debian stable main" > /etc/apt/sources.list.d/logstash.list
+RUN echo "deb https://artifacts.elastic.co/packages/${LOGSTASH_MAJOR}-prerelease/apt stable main" > /etc/apt/sources.list.d/logstash.list
RUN set -x \
&& apt-get update \ |
yosifkit
approved these changes
Oct 11, 2016
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Build test of #2240; afb4b84 (elasticsearch
, kibana
, logstash
):
$ bashbrew build elasticsearch:1.5.2
Using bashbrew/cache:b9d62bed29024bd2b73e4372772f2a4bd2b41292d824857e957db7c52d39289c (elasticsearch:1.5.2)
Tagging elasticsearch:1.5.2
Tagging elasticsearch:1.5
$ test/run.sh elasticsearch:1.5.2
testing elasticsearch:1.5.2
'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:1.6.2
Using bashbrew/cache:9f7f2d29f0301ddbbdd7205cce5e0bbcff9bb788ba59eacea5196cdf476efbdf (elasticsearch:1.6.2)
Tagging elasticsearch:1.6.2
Tagging elasticsearch:1.6
$ test/run.sh elasticsearch:1.6.2
testing elasticsearch:1.6.2
'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:1.7.5
Using bashbrew/cache:6bcb180b95b1672d4cb89b066ef23007920b9df9e1805486637c9b83c72fd064 (elasticsearch:1.7.5)
Tagging elasticsearch:1.7.5
Tagging elasticsearch:1.7
Tagging elasticsearch:1
$ test/run.sh elasticsearch:1.7.5
testing elasticsearch:1.7.5
'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:2.0.2
Using bashbrew/cache:77ee29802b8767ea7576b0d3c915bd5794fbaba3de1de9f2d2e2c092c19be511 (elasticsearch:2.0.2)
Tagging elasticsearch:2.0.2
Tagging elasticsearch:2.0
$ test/run.sh elasticsearch:2.0.2
testing elasticsearch:2.0.2
'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:2.1.2
Using bashbrew/cache:4103d80d044eb39a64c0138a568d57c21af6a744257261657573d559e545779d (elasticsearch:2.1.2)
Tagging elasticsearch:2.1.2
Tagging elasticsearch:2.1
$ test/run.sh elasticsearch:2.1.2
testing elasticsearch:2.1.2
'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:2.2.2
Using bashbrew/cache:d6fb7eb2167789304b22535fca6be14d51a8b463a3cef0666f915633fb39cc93 (elasticsearch:2.2.2)
Tagging elasticsearch:2.2.2
Tagging elasticsearch:2.2
$ test/run.sh elasticsearch:2.2.2
testing elasticsearch:2.2.2
'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:2.3.5
Using bashbrew/cache:44965db88ce00c7520ce7d25b6cbec825ea558fabdb31f34877046d5b29bf259 (elasticsearch:2.3.5)
Tagging elasticsearch:2.3.5
Tagging elasticsearch:2.3
$ test/run.sh elasticsearch:2.3.5
testing elasticsearch:2.3.5
'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:2.4.1
Using bashbrew/cache:6a5668ee469396d54e480ecad099907a203c223c35bff2b5dae52ce5180fe1a3 (elasticsearch:2.4.1)
Tagging elasticsearch:2.4.1
Tagging elasticsearch:2.4
Tagging elasticsearch:2
Tagging elasticsearch:latest
$ test/run.sh elasticsearch:2.4.1
testing elasticsearch:2.4.1
'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.0.0-rc1
Building bashbrew/cache:f8ee04d7b556f18b946f309902576ff09ced4108cf54e76b4dc3c1ec280432b4 (elasticsearch:5.0.0-rc1)
Tagging elasticsearch:5.0.0-rc1
Tagging elasticsearch:5.0.0
Tagging elasticsearch:5.0
Tagging elasticsearch:5
$ test/run.sh elasticsearch:5.0.0-rc1
testing elasticsearch:5.0.0-rc1
'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].....docker: Error response from daemon: Cannot link to a non running container: /cocky_paultag AS /gloomy_torvalds/es.
failed
$ bashbrew build kibana:4.1.11
Building bashbrew/cache:cda49ae602a05c8e443a1b431d6e2bfc1e74c35bc1d159800c2a3867cbc42337 (kibana:4.1.11)
Tagging kibana:4.1.11
Tagging kibana:4.1
$ test/run.sh kibana:4.1.11
testing kibana:4.1.11
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build kibana:4.2.2
Building bashbrew/cache:57d9e05ee616d5e34795c89973f100c9ab7b3c353dfd2c87947a986f641193cc (kibana:4.2.2)
Tagging kibana:4.2.2
Tagging kibana:4.2
$ test/run.sh kibana:4.2.2
testing kibana:4.2.2
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build kibana:4.3.3
Building bashbrew/cache:b50f7547e46a48bae89d17e3f3c4e75b98c8de2eb616ecde00eabe3859d30f04 (kibana:4.3.3)
Tagging kibana:4.3.3
Tagging kibana:4.3
$ test/run.sh kibana:4.3.3
testing kibana:4.3.3
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build kibana:4.4.2
Building bashbrew/cache:da18a7957c9efa69248e32ac629333ed6dfbd0ee4cc62c9f165e06c2922e7a1d (kibana:4.4.2)
Tagging kibana:4.4.2
Tagging kibana:4.4
$ test/run.sh kibana:4.4.2
testing kibana:4.4.2
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build kibana:4.5.4
Building bashbrew/cache:b5ee2d59bbf0de8f596f10c9747edbd640d0536e00c3d1f78430a8b8526a359e (kibana:4.5.4)
Tagging kibana:4.5.4
Tagging kibana:4.5
$ test/run.sh kibana:4.5.4
testing kibana:4.5.4
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build kibana:4.6.1
Building bashbrew/cache:14be8e4d651c8f8cf8c3521a33fc27d6ab0af8b6886c762bb90c56bfed1c237f (kibana:4.6.1)
Tagging kibana:4.6.1
Tagging kibana:4.6
Tagging kibana:4
Tagging kibana:latest
$ test/run.sh kibana:4.6.1
testing kibana:4.6.1
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build kibana:5.0.0-rc1
Building bashbrew/cache:417649999ba5699068fc37cae7ee627af37aa599238620b664bd7a230354e1ab (kibana:5.0.0-rc1)
Tagging kibana:5.0.0-rc1
Tagging kibana:5.0.0
Tagging kibana:5.0
Tagging kibana:5
$ test/run.sh kibana:5.0.0-rc1
testing kibana:5.0.0-rc1
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build logstash:1.5.6-1
Using bashbrew/cache:7c4d2722b59c57fee78de60e765549c75b3605eff63423782d64dc6d32f0191f (logstash:1.5.6-1)
Tagging logstash:1.5.6-1
Tagging logstash:1.5.6
Tagging logstash:1.5
Tagging logstash:1
$ test/run.sh logstash:1.5.6-1
testing logstash:1.5.6-1
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'logstash-basics' [5/5]......passed
$ bashbrew build logstash:2.0.0-1
Using bashbrew/cache:514ea30fa1220ca0835cbff651d208a267920436f26e8ce81b08fcfd829e7f3c (logstash:2.0.0-1)
Tagging logstash:2.0.0-1
Tagging logstash:2.0.0
Tagging logstash:2.0
$ test/run.sh logstash:2.0.0-1
testing logstash:2.0.0-1
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'logstash-basics' [5/5]......passed
$ bashbrew build logstash:2.1.3-1
Using bashbrew/cache:2013a1c2d81a40fc925f26b86e3c2e4bb0b84230eea35894820d87c1d35ceeab (logstash:2.1.3-1)
Tagging logstash:2.1.3-1
Tagging logstash:2.1.3
Tagging logstash:2.1
$ test/run.sh logstash:2.1.3-1
testing logstash:2.1.3-1
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'logstash-basics' [5/5].....passed
$ bashbrew build logstash:2.2.4-1
Using bashbrew/cache:2a1dbf71e52931f6425674ba3353942b063273d04a5fa26e9c2d168e1d682aa9 (logstash:2.2.4-1)
Tagging logstash:2.2.4-1
Tagging logstash:2.2.4
Tagging logstash:2.2
$ test/run.sh logstash:2.2.4-1
testing logstash:2.2.4-1
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'logstash-basics' [5/5]..........passed
$ bashbrew build logstash:2.3.4-1
Using bashbrew/cache:fabfe8dd501acec20f10e62513bddaae5439502386ac9b4086e8dfe0a3eb3b5c (logstash:2.3.4-1)
Tagging logstash:2.3.4-1
Tagging logstash:2.3.4
Tagging logstash:2.3
$ test/run.sh logstash:2.3.4-1
testing logstash:2.3.4-1
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'logstash-basics' [5/5].........passed
$ bashbrew build logstash:2.4.0-1
Using bashbrew/cache:13ca035a296c481d206881c14ac0e21e2faabac2337cf7ecdc6d75978ac881a1 (logstash:2.4.0-1)
Tagging logstash:2.4.0-1
Tagging logstash:2.4.0
Tagging logstash:2.4
Tagging logstash:2
Tagging logstash:latest
$ test/run.sh logstash:2.4.0-1
testing logstash:2.4.0-1
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'logstash-basics' [5/5].........passed
$ bashbrew build logstash:5.0.0-rc1-1
Building bashbrew/cache:85b2ec27d58fa8a6aaa8e84fb705a5a1886997489d6ebba70bcd87ba57f8a291 (logstash:5.0.0-rc1-1)
Tagging logstash:5.0.0-rc1-1
Tagging logstash:5.0.0-rc1
Tagging logstash:5.0.0
Tagging logstash:5.0
Tagging logstash:5
$ test/run.sh logstash:5.0.0-rc1-1
testing logstash:5.0.0-rc1-1
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'logstash-basics' [5/5].........passed
The following images failed at least one test: elasticsearch:5.0.0-rc1
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.
PR's:
docker-library/elasticsearch/pull/123
docker-library/logstash/pull/62
docker-library/kibana/pull/57