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 elasticsearch 5.0.0, logstash 5.0.0 and kibana 5.0.0 #2288

Merged
merged 3 commits into from
Oct 26, 2016

Conversation

gerardorochin
Copy link
Contributor

@tianon
Copy link
Member

tianon commented Oct 26, 2016

diff --git a/elasticsearch_1.5/Dockerfile b/elasticsearch_1.5/Dockerfile
index 0e0ba61..cf4d003 100644
--- a/elasticsearch_1.5/Dockerfile
+++ b/elasticsearch_1.5/Dockerfile
@@ -12,7 +12,7 @@ RUN set -x \
    && chmod +x /usr/local/bin/gosu \
    && gosu nobody true

-# https://packages.elasticsearch.org/GPG-KEY-elasticsearch
+# https://artifacts.elastic.co/GPG-KEY-elasticsearch
 RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 46095ACC8548582C1A2699A9D27D666CD88E42B4

 # https://www.elastic.co/guide/en/elasticsearch/reference/current/setup-repositories.html
diff --git a/elasticsearch_1.6/Dockerfile b/elasticsearch_1.6/Dockerfile
index cfdec21..7c9aa74 100644
--- a/elasticsearch_1.6/Dockerfile
+++ b/elasticsearch_1.6/Dockerfile
@@ -12,7 +12,7 @@ RUN set -x \
    && chmod +x /usr/local/bin/gosu \
    && gosu nobody true

-# https://packages.elasticsearch.org/GPG-KEY-elasticsearch
+# https://artifacts.elastic.co/GPG-KEY-elasticsearch
 RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 46095ACC8548582C1A2699A9D27D666CD88E42B4

 # https://www.elastic.co/guide/en/elasticsearch/reference/current/setup-repositories.html
diff --git a/elasticsearch_1/Dockerfile b/elasticsearch_1/Dockerfile
index 37b6bbc..5f5f702 100644
--- a/elasticsearch_1/Dockerfile
+++ b/elasticsearch_1/Dockerfile
@@ -12,7 +12,7 @@ RUN set -x \
    && chmod +x /usr/local/bin/gosu \
    && gosu nobody true

-# https://packages.elasticsearch.org/GPG-KEY-elasticsearch
+# https://artifacts.elastic.co/GPG-KEY-elasticsearch
 RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 46095ACC8548582C1A2699A9D27D666CD88E42B4

 # https://www.elastic.co/guide/en/elasticsearch/reference/current/setup-repositories.html
diff --git a/elasticsearch_2.0/Dockerfile b/elasticsearch_2.0/Dockerfile
index ffafd71..6b53739 100644
--- a/elasticsearch_2.0/Dockerfile
+++ b/elasticsearch_2.0/Dockerfile
@@ -12,7 +12,7 @@ RUN set -x \
    && chmod +x /usr/local/bin/gosu \
    && gosu nobody true

-# https://packages.elasticsearch.org/GPG-KEY-elasticsearch
+# https://artifacts.elastic.co/GPG-KEY-elasticsearch
 RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 46095ACC8548582C1A2699A9D27D666CD88E42B4

 # https://www.elastic.co/guide/en/elasticsearch/reference/current/setup-repositories.html
diff --git a/elasticsearch_2.1/Dockerfile b/elasticsearch_2.1/Dockerfile
index 21abfac..99d5ffd 100644
--- a/elasticsearch_2.1/Dockerfile
+++ b/elasticsearch_2.1/Dockerfile
@@ -12,7 +12,7 @@ RUN set -x \
    && chmod +x /usr/local/bin/gosu \
    && gosu nobody true

-# https://packages.elasticsearch.org/GPG-KEY-elasticsearch
+# https://artifacts.elastic.co/GPG-KEY-elasticsearch
 RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 46095ACC8548582C1A2699A9D27D666CD88E42B4

 # https://www.elastic.co/guide/en/elasticsearch/reference/current/setup-repositories.html
diff --git a/elasticsearch_2.2/Dockerfile b/elasticsearch_2.2/Dockerfile
index d68bc5d..1371ee3 100644
--- a/elasticsearch_2.2/Dockerfile
+++ b/elasticsearch_2.2/Dockerfile
@@ -12,7 +12,7 @@ RUN set -x \
    && chmod +x /usr/local/bin/gosu \
    && gosu nobody true

-# https://packages.elasticsearch.org/GPG-KEY-elasticsearch
+# https://artifacts.elastic.co/GPG-KEY-elasticsearch
 RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 46095ACC8548582C1A2699A9D27D666CD88E42B4

 # https://www.elastic.co/guide/en/elasticsearch/reference/current/setup-repositories.html
diff --git a/elasticsearch_2.3/Dockerfile b/elasticsearch_2.3/Dockerfile
index 7325d80..cd4ce5c 100644
--- a/elasticsearch_2.3/Dockerfile
+++ b/elasticsearch_2.3/Dockerfile
@@ -12,7 +12,7 @@ RUN set -x \
    && chmod +x /usr/local/bin/gosu \
    && gosu nobody true

-# https://packages.elasticsearch.org/GPG-KEY-elasticsearch
+# https://artifacts.elastic.co/GPG-KEY-elasticsearch
 RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 46095ACC8548582C1A2699A9D27D666CD88E42B4

 # https://www.elastic.co/guide/en/elasticsearch/reference/current/setup-repositories.html
diff --git a/elasticsearch_1.5/Dockerfile b/elasticsearch_5.0/Dockerfile
similarity index 88%
copy from elasticsearch_1.5/Dockerfile
copy to elasticsearch_5.0/Dockerfile
index 0e0ba61..da3c672 100644
--- a/elasticsearch_1.5/Dockerfile
+++ b/elasticsearch_5.0/Dockerfile
@@ -12,16 +12,16 @@ RUN set -x \
    && chmod +x /usr/local/bin/gosu \
    && gosu nobody true

-# https://packages.elasticsearch.org/GPG-KEY-elasticsearch
+# https://artifacts.elastic.co/GPG-KEY-elasticsearch
 RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 46095ACC8548582C1A2699A9D27D666CD88E42B4

 # https://www.elastic.co/guide/en/elasticsearch/reference/current/setup-repositories.html
 # https://www.elastic.co/guide/en/elasticsearch/reference/5.0/deb.html
 RUN set -x \
    && apt-get update && apt-get install -y --no-install-recommends apt-transport-https && rm -rf /var/lib/apt/lists/* \
-   && echo 'deb http://packages.elasticsearch.org/elasticsearch/1.5/debian stable main' > /etc/apt/sources.list.d/elasticsearch.list
+   && echo 'deb https://artifacts.elastic.co/packages/5.x/apt stable main' > /etc/apt/sources.list.d/elasticsearch.list

-ENV ELASTICSEARCH_VERSION 1.5.2
+ENV ELASTICSEARCH_VERSION 5.0.0

 RUN set -x \
    && apt-get update \
diff --git a/elasticsearch_5/config/elasticsearch.yml b/elasticsearch_5.0/config/elasticsearch.yml
similarity index 100%
rename from elasticsearch_5/config/elasticsearch.yml
rename to elasticsearch_5.0/config/elasticsearch.yml
diff --git a/elasticsearch_5/config/log4j2.properties b/elasticsearch_5.0/config/log4j2.properties
similarity index 100%
rename from elasticsearch_5/config/log4j2.properties
rename to elasticsearch_5.0/config/log4j2.properties
diff --git a/elasticsearch_5/docker-entrypoint.sh b/elasticsearch_5.0/docker-entrypoint.sh
similarity index 100%
rename from elasticsearch_5/docker-entrypoint.sh
rename to elasticsearch_5.0/docker-entrypoint.sh
diff --git a/elasticsearch_5/Dockerfile b/elasticsearch_5/Dockerfile
deleted file mode 100644
index 6492f56..0000000
diff --git a/elasticsearch_latest/Dockerfile b/elasticsearch_latest/Dockerfile
index 01b1a96..0f07110 100644
--- a/elasticsearch_latest/Dockerfile
+++ b/elasticsearch_latest/Dockerfile
@@ -12,7 +12,7 @@ RUN set -x \
    && chmod +x /usr/local/bin/gosu \
    && gosu nobody true

-# https://packages.elasticsearch.org/GPG-KEY-elasticsearch
+# https://artifacts.elastic.co/GPG-KEY-elasticsearch
 RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 46095ACC8548582C1A2699A9D27D666CD88E42B4

 # https://www.elastic.co/guide/en/elasticsearch/reference/current/setup-repositories.html
diff --git a/kibana_5/Dockerfile b/kibana_5/Dockerfile
index a843b24..6b03024 100644
--- a/kibana_5/Dockerfile
+++ b/kibana_5/Dockerfile
@@ -33,15 +33,15 @@ RUN set -x \
    && chmod +x /usr/local/bin/tini \
    && tini -h

-# https://www.elastic.co/guide/en/kibana/4.4/setup.html#kibana-apt
-# https://packages.elasticsearch.org/GPG-KEY-elasticsearch
+# https://www.elastic.co/guide/en/kibana/5.0/deb.html
+# https://artifacts.elastic.co/GPG-KEY-elasticsearch
 RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 46095ACC8548582C1A2699A9D27D666CD88E42B4

 ENV KIBANA_MAJOR 5.0
-ENV KIBANA_VERSION 5.0.0-rc1
+ENV KIBANA_VERSION 5.0.0

 #RUN echo "deb http://packages.elastic.co/kibana/${KIBANA_MAJOR}/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
+RUN echo 'deb https://artifacts.elastic.co/packages/5.x/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_1/Dockerfile b/logstash_1/Dockerfile
index 2699534..9358231 100644
--- a/logstash_1/Dockerfile
+++ b/logstash_1/Dockerfile
@@ -22,8 +22,8 @@ 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#_apt
+# https://artifacts.elastic.co/GPG-KEY-elasticsearch
 RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 46095ACC8548582C1A2699A9D27D666CD88E42B4

 RUN echo 'deb http://packages.elastic.co/logstash/1.5/debian stable main' > /etc/apt/sources.list.d/logstash.list
diff --git a/logstash_2.0/Dockerfile b/logstash_2.0/Dockerfile
index 553ca02..04802ac 100644
--- a/logstash_2.0/Dockerfile
+++ b/logstash_2.0/Dockerfile
@@ -22,8 +22,8 @@ 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#_apt
+# https://artifacts.elastic.co/GPG-KEY-elasticsearch
 RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 46095ACC8548582C1A2699A9D27D666CD88E42B4

 RUN echo 'deb http://packages.elastic.co/logstash/2.0/debian stable main' > /etc/apt/sources.list.d/logstash.list
diff --git a/logstash_2.1/Dockerfile b/logstash_2.1/Dockerfile
index b7a6de1..2d67e44 100644
--- a/logstash_2.1/Dockerfile
+++ b/logstash_2.1/Dockerfile
@@ -22,8 +22,8 @@ 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#_apt
+# https://artifacts.elastic.co/GPG-KEY-elasticsearch
 RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 46095ACC8548582C1A2699A9D27D666CD88E42B4

 RUN echo 'deb http://packages.elastic.co/logstash/2.1/debian stable main' > /etc/apt/sources.list.d/logstash.list
diff --git a/logstash_2.2/Dockerfile b/logstash_2.2/Dockerfile
index b4d8ec7..5d0d927 100644
--- a/logstash_2.2/Dockerfile
+++ b/logstash_2.2/Dockerfile
@@ -22,8 +22,8 @@ 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#_apt
+# https://artifacts.elastic.co/GPG-KEY-elasticsearch
 RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 46095ACC8548582C1A2699A9D27D666CD88E42B4

 RUN echo 'deb http://packages.elastic.co/logstash/2.2/debian stable main' > /etc/apt/sources.list.d/logstash.list
diff --git a/logstash_2.3/Dockerfile b/logstash_2.3/Dockerfile
index c75cb54..f95cd98 100644
--- a/logstash_2.3/Dockerfile
+++ b/logstash_2.3/Dockerfile
@@ -22,8 +22,8 @@ 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#_apt
+# https://artifacts.elastic.co/GPG-KEY-elasticsearch
 RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 46095ACC8548582C1A2699A9D27D666CD88E42B4

 RUN echo 'deb http://packages.elastic.co/logstash/2.3/debian stable main' > /etc/apt/sources.list.d/logstash.list
diff --git a/logstash_5/Dockerfile b/logstash_5/Dockerfile
index 101c66f..9df7d4e 100644
--- a/logstash_5/Dockerfile
+++ b/logstash_5/Dockerfile
@@ -22,13 +22,13 @@ 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#_apt
+# https://artifacts.elastic.co/GPG-KEY-elasticsearch
 RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 46095ACC8548582C1A2699A9D27D666CD88E42B4

-RUN echo 'deb https://artifacts.elastic.co/packages/5.x-prerelease/apt stable main' > /etc/apt/sources.list.d/logstash.list
+RUN echo 'deb https://artifacts.elastic.co/packages/5.x/apt stable main' > /etc/apt/sources.list.d/logstash.list

-ENV LOGSTASH_VERSION 1:5.0.0~rc1-1
+ENV LOGSTASH_VERSION 1:5.0.0-1

 RUN set -x \
    && apt-get update \
diff --git a/logstash_latest/Dockerfile b/logstash_latest/Dockerfile
index 99673c0..5421e64 100644
--- a/logstash_latest/Dockerfile
+++ b/logstash_latest/Dockerfile
@@ -22,8 +22,8 @@ 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#_apt
+# https://artifacts.elastic.co/GPG-KEY-elasticsearch
 RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 46095ACC8548582C1A2699A9D27D666CD88E42B4

 RUN echo 'deb http://packages.elastic.co/logstash/2.4/debian stable main' > /etc/apt/sources.list.d/logstash.list

@tianon
Copy link
Member

tianon commented Oct 26, 2016

Crap, just realized we ought to update latest on all these (and move the 5 alias on elasticsearch from 5.0-rc over to 5.0). 😞

Want me to just hit all those scripts with a commit real fast, or would you rather make PRs? (I don't really mind either way)

@gerardorochin
Copy link
Contributor Author

Solve this with a commit @tianon not problem.

@tianon
Copy link
Member

tianon commented Oct 26, 2016

@gerardorochin
Copy link
Contributor Author

gerardorochin commented Oct 26, 2016

Thanks 👍

@tianon
Copy link
Member

tianon commented Oct 26, 2016

You're planning to update this with the result of the updated scripts, right? 😅

(If you'd rather, you can just check the box that lets me edit your branch here on the PR and I'd be happy to make the minor addition myself 😇)

@gerardorochin
Copy link
Contributor Author

Done @tianon 👍

@yosifkit
Copy link
Member

Can you add the latest tag changes to logstash and kibana too? 🙏

@gerardorochin
Copy link
Contributor Author

Changes has been applied @yosifkit

@yosifkit
Copy link
Member

Lol, diff is slightly changed since we compare least specific tags, ie new latest to old latest.

diff --git a/elasticsearch_1.5/Dockerfile b/elasticsearch_1.5/Dockerfile
index 0e0ba61..cf4d003 100644
--- a/elasticsearch_1.5/Dockerfile
+++ b/elasticsearch_1.5/Dockerfile
@@ -12,7 +12,7 @@ RUN set -x \
    && chmod +x /usr/local/bin/gosu \
    && gosu nobody true

-# https://packages.elasticsearch.org/GPG-KEY-elasticsearch
+# https://artifacts.elastic.co/GPG-KEY-elasticsearch
 RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 46095ACC8548582C1A2699A9D27D666CD88E42B4

 # https://www.elastic.co/guide/en/elasticsearch/reference/current/setup-repositories.html
diff --git a/elasticsearch_1.6/Dockerfile b/elasticsearch_1.6/Dockerfile
index cfdec21..7c9aa74 100644
--- a/elasticsearch_1.6/Dockerfile
+++ b/elasticsearch_1.6/Dockerfile
@@ -12,7 +12,7 @@ RUN set -x \
    && chmod +x /usr/local/bin/gosu \
    && gosu nobody true

-# https://packages.elasticsearch.org/GPG-KEY-elasticsearch
+# https://artifacts.elastic.co/GPG-KEY-elasticsearch
 RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 46095ACC8548582C1A2699A9D27D666CD88E42B4

 # https://www.elastic.co/guide/en/elasticsearch/reference/current/setup-repositories.html
diff --git a/elasticsearch_1/Dockerfile b/elasticsearch_1/Dockerfile
index 37b6bbc..5f5f702 100644
--- a/elasticsearch_1/Dockerfile
+++ b/elasticsearch_1/Dockerfile
@@ -12,7 +12,7 @@ RUN set -x \
    && chmod +x /usr/local/bin/gosu \
    && gosu nobody true

-# https://packages.elasticsearch.org/GPG-KEY-elasticsearch
+# https://artifacts.elastic.co/GPG-KEY-elasticsearch
 RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 46095ACC8548582C1A2699A9D27D666CD88E42B4

 # https://www.elastic.co/guide/en/elasticsearch/reference/current/setup-repositories.html
diff --git a/elasticsearch_2.0/Dockerfile b/elasticsearch_2.0/Dockerfile
index ffafd71..6b53739 100644
--- a/elasticsearch_2.0/Dockerfile
+++ b/elasticsearch_2.0/Dockerfile
@@ -12,7 +12,7 @@ RUN set -x \
    && chmod +x /usr/local/bin/gosu \
    && gosu nobody true

-# https://packages.elasticsearch.org/GPG-KEY-elasticsearch
+# https://artifacts.elastic.co/GPG-KEY-elasticsearch
 RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 46095ACC8548582C1A2699A9D27D666CD88E42B4

 # https://www.elastic.co/guide/en/elasticsearch/reference/current/setup-repositories.html
diff --git a/elasticsearch_2.1/Dockerfile b/elasticsearch_2.1/Dockerfile
index 21abfac..99d5ffd 100644
--- a/elasticsearch_2.1/Dockerfile
+++ b/elasticsearch_2.1/Dockerfile
@@ -12,7 +12,7 @@ RUN set -x \
    && chmod +x /usr/local/bin/gosu \
    && gosu nobody true

-# https://packages.elasticsearch.org/GPG-KEY-elasticsearch
+# https://artifacts.elastic.co/GPG-KEY-elasticsearch
 RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 46095ACC8548582C1A2699A9D27D666CD88E42B4

 # https://www.elastic.co/guide/en/elasticsearch/reference/current/setup-repositories.html
diff --git a/elasticsearch_2.2/Dockerfile b/elasticsearch_2.2/Dockerfile
index d68bc5d..1371ee3 100644
--- a/elasticsearch_2.2/Dockerfile
+++ b/elasticsearch_2.2/Dockerfile
@@ -12,7 +12,7 @@ RUN set -x \
    && chmod +x /usr/local/bin/gosu \
    && gosu nobody true

-# https://packages.elasticsearch.org/GPG-KEY-elasticsearch
+# https://artifacts.elastic.co/GPG-KEY-elasticsearch
 RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 46095ACC8548582C1A2699A9D27D666CD88E42B4

 # https://www.elastic.co/guide/en/elasticsearch/reference/current/setup-repositories.html
diff --git a/elasticsearch_2.3/Dockerfile b/elasticsearch_2.3/Dockerfile
index 7325d80..cd4ce5c 100644
--- a/elasticsearch_2.3/Dockerfile
+++ b/elasticsearch_2.3/Dockerfile
@@ -12,7 +12,7 @@ RUN set -x \
    && chmod +x /usr/local/bin/gosu \
    && gosu nobody true

-# https://packages.elasticsearch.org/GPG-KEY-elasticsearch
+# https://artifacts.elastic.co/GPG-KEY-elasticsearch
 RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 46095ACC8548582C1A2699A9D27D666CD88E42B4

 # https://www.elastic.co/guide/en/elasticsearch/reference/current/setup-repositories.html
diff --git a/elasticsearch_latest/Dockerfile b/elasticsearch_2/Dockerfile
similarity index 96%
copy from elasticsearch_latest/Dockerfile
copy to elasticsearch_2/Dockerfile
index 01b1a96..0f07110 100644
--- a/elasticsearch_latest/Dockerfile
+++ b/elasticsearch_2/Dockerfile
@@ -12,7 +12,7 @@ RUN set -x \
    && chmod +x /usr/local/bin/gosu \
    && gosu nobody true

-# https://packages.elasticsearch.org/GPG-KEY-elasticsearch
+# https://artifacts.elastic.co/GPG-KEY-elasticsearch
 RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 46095ACC8548582C1A2699A9D27D666CD88E42B4

 # https://www.elastic.co/guide/en/elasticsearch/reference/current/setup-repositories.html
diff --git a/elasticsearch_latest/config/elasticsearch.yml b/elasticsearch_2/config/elasticsearch.yml
similarity index 100%
copy from elasticsearch_latest/config/elasticsearch.yml
copy to elasticsearch_2/config/elasticsearch.yml
diff --git a/elasticsearch_latest/config/logging.yml b/elasticsearch_2/config/logging.yml
similarity index 100%
rename from elasticsearch_latest/config/logging.yml
rename to elasticsearch_2/config/logging.yml
diff --git a/elasticsearch_5/docker-entrypoint.sh b/elasticsearch_2/docker-entrypoint.sh
similarity index 100%
rename from elasticsearch_5/docker-entrypoint.sh
rename to elasticsearch_2/docker-entrypoint.sh
diff --git a/elasticsearch_5/Dockerfile b/elasticsearch_5/Dockerfile
deleted file mode 100644
index 6492f56..0000000
diff --git a/elasticsearch_5/config/elasticsearch.yml b/elasticsearch_5/config/elasticsearch.yml
deleted file mode 100644
index bee2cfe..0000000
diff --git a/elasticsearch_latest/Dockerfile b/elasticsearch_latest/Dockerfile
index 01b1a96..da3c672 100644
--- a/elasticsearch_latest/Dockerfile
+++ b/elasticsearch_latest/Dockerfile
@@ -12,16 +12,16 @@ RUN set -x \
    && chmod +x /usr/local/bin/gosu \
    && gosu nobody true

-# https://packages.elasticsearch.org/GPG-KEY-elasticsearch
+# https://artifacts.elastic.co/GPG-KEY-elasticsearch
 RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 46095ACC8548582C1A2699A9D27D666CD88E42B4

 # https://www.elastic.co/guide/en/elasticsearch/reference/current/setup-repositories.html
 # https://www.elastic.co/guide/en/elasticsearch/reference/5.0/deb.html
 RUN set -x \
    && apt-get update && apt-get install -y --no-install-recommends apt-transport-https && rm -rf /var/lib/apt/lists/* \
-   && echo 'deb http://packages.elasticsearch.org/elasticsearch/2.x/debian stable main' > /etc/apt/sources.list.d/elasticsearch.list
+   && echo 'deb https://artifacts.elastic.co/packages/5.x/apt stable main' > /etc/apt/sources.list.d/elasticsearch.list

-ENV ELASTICSEARCH_VERSION 2.4.1
+ENV ELASTICSEARCH_VERSION 5.0.0

 RUN set -x \
    && apt-get update \
diff --git a/elasticsearch_latest/config/elasticsearch.yml b/elasticsearch_latest/config/elasticsearch.yml
index 5108c77..bee2cfe 100644
--- a/elasticsearch_latest/config/elasticsearch.yml
+++ b/elasticsearch_latest/config/elasticsearch.yml
@@ -1 +1,5 @@
 network.host: 0.0.0.0
+
+# this value is required because we set "network.host"
+# be sure to modify it appropriately for a production cluster deployment
+discovery.zen.minimum_master_nodes: 1
diff --git a/elasticsearch_5/config/log4j2.properties b/elasticsearch_latest/config/log4j2.properties
similarity index 100%
rename from elasticsearch_5/config/log4j2.properties
rename to elasticsearch_latest/config/log4j2.properties
diff --git a/kibana_latest/Dockerfile b/kibana_4/Dockerfile
similarity index 100%
copy from kibana_latest/Dockerfile
copy to kibana_4/Dockerfile
diff --git a/kibana_latest/docker-entrypoint.sh b/kibana_4/docker-entrypoint.sh
similarity index 100%
copy from kibana_latest/docker-entrypoint.sh
copy to kibana_4/docker-entrypoint.sh
diff --git a/kibana_5/Dockerfile b/kibana_5/Dockerfile
deleted file mode 100644
index a843b24..0000000
diff --git a/kibana_5/docker-entrypoint.sh b/kibana_5/docker-entrypoint.sh
deleted file mode 100755
index 2ea1bdb..0000000
diff --git a/kibana_latest/Dockerfile b/kibana_latest/Dockerfile
index bc26c0a..6b03024 100644
--- a/kibana_latest/Dockerfile
+++ b/kibana_latest/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/*
@@ -32,26 +33,31 @@ RUN set -x \
    && chmod +x /usr/local/bin/tini \
    && tini -h

-# https://www.elastic.co/guide/en/kibana/4.4/setup.html#kibana-apt
-# https://packages.elasticsearch.org/GPG-KEY-elasticsearch
+# https://www.elastic.co/guide/en/kibana/5.0/deb.html
+# https://artifacts.elastic.co/GPG-KEY-elasticsearch
 RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 46095ACC8548582C1A2699A9D27D666CD88E42B4

-ENV KIBANA_MAJOR 4.6
-ENV KIBANA_VERSION 4.6.2
+ENV KIBANA_MAJOR 5.0
+ENV KIBANA_VERSION 5.0.0

-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/${KIBANA_MAJOR}/debian stable main" > /etc/apt/sources.list.d/kibana.list
+RUN echo 'deb https://artifacts.elastic.co/packages/5.x/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 \
    && apt-get update \
    && apt-get install -y --no-install-recommends kibana=$KIBANA_VERSION \
-   && chown -R kibana:kibana /opt/kibana \
    && rm -rf /var/lib/apt/lists/* \
    \
+# the default "server.host" is "localhost" in 5+
+   && sed -ri "s!^(\#\s*)?(server\.host:).*!\2 '0.0.0.0'!" /etc/kibana/kibana.yml \
+   && grep -q "^server\.host: '0.0.0.0'\$" /etc/kibana/kibana.yml \
+   \
 # ensure the default configuration is useful when using --link
-   && sed -ri "s!^(\#\s*)?(elasticsearch\.url:).*!\2 'http://elasticsearch:9200'!" /opt/kibana/config/kibana.yml \
-   && grep -q 'elasticsearch:9200' /opt/kibana/config/kibana.yml
+   && sed -ri "s!^(\#\s*)?(elasticsearch\.url:).*!\2 'http://elasticsearch:9200'!" /etc/kibana/kibana.yml \
+   && grep -q "^elasticsearch\.url: 'http://elasticsearch:9200'\$" /etc/kibana/kibana.yml

-ENV PATH /opt/kibana/bin:$PATH
+ENV PATH /usr/share/kibana/bin:$PATH

 COPY docker-entrypoint.sh /

diff --git a/kibana_latest/docker-entrypoint.sh b/kibana_latest/docker-entrypoint.sh
index d0e01b7..2ea1bdb 100755
--- a/kibana_latest/docker-entrypoint.sh
+++ b/kibana_latest/docker-entrypoint.sh
@@ -9,7 +9,7 @@ fi
 # Run as user "kibana" if the command is "kibana"
 if [ "$1" = 'kibana' ]; then
    if [ "$ELASTICSEARCH_URL" ]; then
-       sed -ri "s!^(\#\s*)?(elasticsearch\.url:).*!\2 '$ELASTICSEARCH_URL'!" /opt/kibana/config/kibana.yml
+       sed -ri "s!^(\#\s*)?(elasticsearch\.url:).*!\2 '$ELASTICSEARCH_URL'!" /etc/kibana/kibana.yml
    fi

    set -- gosu kibana tini -- "$@"
diff --git a/logstash_1/Dockerfile b/logstash_1/Dockerfile
index 2699534..9358231 100644
--- a/logstash_1/Dockerfile
+++ b/logstash_1/Dockerfile
@@ -22,8 +22,8 @@ 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#_apt
+# https://artifacts.elastic.co/GPG-KEY-elasticsearch
 RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 46095ACC8548582C1A2699A9D27D666CD88E42B4

 RUN echo 'deb http://packages.elastic.co/logstash/1.5/debian stable main' > /etc/apt/sources.list.d/logstash.list
diff --git a/logstash_2.0/Dockerfile b/logstash_2.0/Dockerfile
index 553ca02..04802ac 100644
--- a/logstash_2.0/Dockerfile
+++ b/logstash_2.0/Dockerfile
@@ -22,8 +22,8 @@ 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#_apt
+# https://artifacts.elastic.co/GPG-KEY-elasticsearch
 RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 46095ACC8548582C1A2699A9D27D666CD88E42B4

 RUN echo 'deb http://packages.elastic.co/logstash/2.0/debian stable main' > /etc/apt/sources.list.d/logstash.list
diff --git a/logstash_2.1/Dockerfile b/logstash_2.1/Dockerfile
index b7a6de1..2d67e44 100644
--- a/logstash_2.1/Dockerfile
+++ b/logstash_2.1/Dockerfile
@@ -22,8 +22,8 @@ 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#_apt
+# https://artifacts.elastic.co/GPG-KEY-elasticsearch
 RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 46095ACC8548582C1A2699A9D27D666CD88E42B4

 RUN echo 'deb http://packages.elastic.co/logstash/2.1/debian stable main' > /etc/apt/sources.list.d/logstash.list
diff --git a/logstash_2.2/Dockerfile b/logstash_2.2/Dockerfile
index b4d8ec7..5d0d927 100644
--- a/logstash_2.2/Dockerfile
+++ b/logstash_2.2/Dockerfile
@@ -22,8 +22,8 @@ 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#_apt
+# https://artifacts.elastic.co/GPG-KEY-elasticsearch
 RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 46095ACC8548582C1A2699A9D27D666CD88E42B4

 RUN echo 'deb http://packages.elastic.co/logstash/2.2/debian stable main' > /etc/apt/sources.list.d/logstash.list
diff --git a/logstash_2.3/Dockerfile b/logstash_2.3/Dockerfile
index c75cb54..f95cd98 100644
--- a/logstash_2.3/Dockerfile
+++ b/logstash_2.3/Dockerfile
@@ -22,8 +22,8 @@ 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#_apt
+# https://artifacts.elastic.co/GPG-KEY-elasticsearch
 RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 46095ACC8548582C1A2699A9D27D666CD88E42B4

 RUN echo 'deb http://packages.elastic.co/logstash/2.3/debian stable main' > /etc/apt/sources.list.d/logstash.list
diff --git a/logstash_latest/Dockerfile b/logstash_2/Dockerfile
similarity index 93%
copy from logstash_latest/Dockerfile
copy to logstash_2/Dockerfile
index 99673c0..5421e64 100644
--- a/logstash_latest/Dockerfile
+++ b/logstash_2/Dockerfile
@@ -22,8 +22,8 @@ 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#_apt
+# https://artifacts.elastic.co/GPG-KEY-elasticsearch
 RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 46095ACC8548582C1A2699A9D27D666CD88E42B4

 RUN echo 'deb http://packages.elastic.co/logstash/2.4/debian stable main' > /etc/apt/sources.list.d/logstash.list
diff --git a/logstash_5/docker-entrypoint.sh b/logstash_2/docker-entrypoint.sh
similarity index 100%
rename from logstash_5/docker-entrypoint.sh
rename to logstash_2/docker-entrypoint.sh
diff --git a/logstash_5/Dockerfile b/logstash_5/Dockerfile
deleted file mode 100644
index 101c66f..0000000
diff --git a/logstash_latest/Dockerfile b/logstash_latest/Dockerfile
index 99673c0..9df7d4e 100644
--- a/logstash_latest/Dockerfile
+++ b/logstash_latest/Dockerfile
@@ -22,20 +22,20 @@ 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#_apt
+# https://artifacts.elastic.co/GPG-KEY-elasticsearch
 RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 46095ACC8548582C1A2699A9D27D666CD88E42B4

-RUN echo 'deb http://packages.elastic.co/logstash/2.4/debian stable main' > /etc/apt/sources.list.d/logstash.list
+RUN echo 'deb https://artifacts.elastic.co/packages/5.x/apt stable main' > /etc/apt/sources.list.d/logstash.list

-ENV LOGSTASH_VERSION 1:2.4.0-1
+ENV LOGSTASH_VERSION 1:5.0.0-1

 RUN set -x \
    && apt-get update \
    && apt-get install -y --no-install-recommends logstash=$LOGSTASH_VERSION \
    && rm -rf /var/lib/apt/lists/*

-ENV PATH /opt/logstash/bin:$PATH
+ENV PATH /usr/share/logstash/bin:$PATH

 # necessary for 5.0+ (overriden via "--path.settings", ignored by < 5.0)
 ENV LS_SETTINGS_DIR /etc/logstash

@yosifkit
Copy link
Member

Build test of #2288; 8465b7f (elasticsearch, kibana, logstash):

$ bashbrew build elasticsearch:1.5.2
Using bashbrew/cache:99e6105abfae785ef941b2faeeca7edf822c5051d7ce39c2c3488592122f9942 (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:69873c6ca23c526c4184bec3a9bd651ee2a93d2193649caf8095f824d7fea0db (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:c3f8e1b76743e9a91b25671e5ab68abdd5ee788ff26ad96bfcb66329bd19482b (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:6cd5dcff67e0c2d796bc5bd8ccef87b97c23a1470f97e655ec9bf56671b34e79 (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:a24983341d94ce8170f11f82dc6a0bfb274b5a0edcbb218357b6c0be526250cd (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:78265701831b2fe8a9d58e416c587e66bdf356734c7f9db2edf2ef67b2dd0eb4 (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:04e14344013192e5bf990e99cd17a2a256100ca5226b4775cf6f347636d32e69 (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:e0b3aac7dc089e998ffd5e6f9d8334ccdc954147a398c65d0714197f75c42ab0 (elasticsearch:2.4.1)
Tagging elasticsearch:2.4.1
Tagging elasticsearch:2.4
Tagging elasticsearch:2

$ 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
Using bashbrew/cache:4d31f263a5c820405f08022af46294e41c1febff84d7bbcc58a8fb8cd780a023 (elasticsearch:5.0.0)
Tagging elasticsearch:5.0.0
Tagging elasticsearch:5.0
Tagging elasticsearch:5
Tagging elasticsearch:latest

$ test/run.sh elasticsearch:5.0.0
testing elasticsearch:5.0.0
    '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 kibana:4.1.11
Using bashbrew/cache:22e19ff0ce920fb2aaa3b4503699bc6f7be3ac275bb657c6b00edb636d1c561b (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
Using bashbrew/cache:f3f0533b7b06aea9df2d177f8f748aa57bb680e6df803ef810c80e0721166edf (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
Using bashbrew/cache:4ee6967838944d625c5cee8c28993533946c380f62f6d1099c76efd9190d28b6 (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
Using bashbrew/cache:6063bc95b9019d56e90eb9e0bf0d285e5c28651dc417b4ec74605de7d70158d1 (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
Using bashbrew/cache:242edd7763df572d953c2b45e9c47d611db6f5aa289eb272c49a7374181a3391 (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.2
Using bashbrew/cache:56dfa87208fe2d61d83ca3c2191cf0f322c4d2db6e150d7d4b2b0538627ccc0c (kibana:4.6.2)
Tagging kibana:4.6.2
Tagging kibana:4.6
Tagging kibana:4

$ test/run.sh kibana:4.6.2
testing kibana:4.6.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:5.0.0
Using bashbrew/cache:91a6696fefe5a6bf4615b7d69908ea3a24b15c4665a384eebc49553af9b2e386 (kibana:5.0.0)
Tagging kibana:5.0.0
Tagging kibana:5.0
Tagging kibana:5
Tagging kibana:latest

$ test/run.sh kibana:5.0.0
testing kibana:5.0.0
    '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:1302191965d5bd5e9802f8a8bd7dbe0c35d02108276093a388ebe91f2e263d90 (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:e253ffb974923f6af4a63c522242d080a938d651225044d60fc76ec603ec6f76 (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:8c6925b2c1ec8ab9800922a2090c45c1b8e19b819de45e241c1247d2296ca131 (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:2641a97524677e2ce537e95620f151301a4ab4988ceef532903388b8ef6b20a2 (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:f9049277831a47ff59b43f0882d19dd33607fa54f148003b31fb88cdf64a978d (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:37afa5bf4bc4facc2b2ef90a2070890b3471276daa6431cfc64ece4993c3b856 (logstash:2.4.0-1)
Tagging logstash:2.4.0-1
Tagging logstash:2.4.0
Tagging logstash:2.4
Tagging logstash:2

$ 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-1
Using bashbrew/cache:8600939158fe9b2c0c8e7bfc685699e702a2d14180a188027c1a1c8eac74f6c4 (logstash:5.0.0-1)
Tagging logstash:5.0.0-1
Tagging logstash:5.0.0
Tagging logstash:5.0
Tagging logstash:5
Tagging logstash:latest

$ test/run.sh logstash:5.0.0-1
testing logstash:5.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

@yosifkit yosifkit merged commit ab99b5a into docker-library:master Oct 26, 2016
@gerardorochin gerardorochin deleted the update-elk-5.0.0 branch October 26, 2016 20:23
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.

4 participants