Update ELK images #6150
Merged
Update ELK images #6150
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@c9aa8ee: Update to 6.8.1 - docker-library/elasticsearch@8ee2df9: Update generated README logstash: - docker-library/logstash@a3e3579: Update to 6.8.1 - docker-library/logstash@4f086b1: Update generated README kibana: - docker-library/kibana@539ce0a: Update to 6.8.1 - docker-library/kibana@5651d02: Update generated README
|
Main compare link: elastic/dockerfiles@v6.8.0...v6.8.1 I'll work on a better diff for |
|
logstash diff: $ GIT_PAGER=cat git diff --irreversible-delete 2ce1e41f02426f23d27027360383f1e12afe6ac5...af8a27911265efd55a260a13114f146ab4116842 -- logstash templates build
diff --git a/build/golang/Dockerfile b/build/golang/Dockerfile
deleted file mode 100644
index b23afaa..0000000
diff --git a/build/logstash/config/logstash-full.yml b/build/logstash/config/logstash-full.yml
deleted file mode 100644
index e87c29a..0000000
diff --git a/build/logstash/env2yaml/env2yaml.go b/build/logstash/env2yaml/env2yaml.go
deleted file mode 100644
index fedf1e8..0000000
diff --git a/templates/Dockerfile.j2 b/logstash/Dockerfile
similarity index 64%
rename from templates/Dockerfile.j2
rename to logstash/Dockerfile
index 2346fa9..fc0b586 100644
--- a/templates/Dockerfile.j2
+++ b/logstash/Dockerfile
@@ -1,19 +1,4 @@
# This Dockerfile was generated from templates/Dockerfile.j2
-{% if artifacts_dir -%}
-{% set url_root = 'http://localhost:8000/logstash/build/' -%}
-{% elif staging_build_num -%}
-{% set url_root = 'https://staging.elastic.co/%s/downloads/logstash' % version_tag -%}
-{% else -%}
-{% set url_root = 'https://artifacts.elastic.co/downloads/logstash' -%}
-{% endif -%}
-
-{% if image_flavor == 'oss' -%}
- {% set tarball = 'logstash-oss-%s.tar.gz' % elastic_version -%}
-{% else -%}
- {% set tarball = 'logstash-%s.tar.gz' % elastic_version -%}
-{% endif -%}
-
-
FROM centos:7
# Install Java and the "which" command, which is needed by Logstash's shell
@@ -28,9 +13,9 @@ RUN groupadd --gid 1000 logstash && \
logstash
# Add Logstash itself.
-RUN curl -Lo - {{ url_root }}/{{ tarball }} | \
+RUN curl -Lo - https://artifacts.elastic.co/downloads/logstash/logstash-6.8.1.tar.gz | \
tar zxf - -C /usr/share && \
- mv /usr/share/logstash-{{ elastic_version }} /usr/share/logstash && \
+ mv /usr/share/logstash-6.8.1 /usr/share/logstash && \
chown --recursive logstash:logstash /usr/share/logstash/ && \
chown -R logstash:root /usr/share/logstash && \
chmod -R g=u /usr/share/logstash && \
@@ -45,7 +30,7 @@ ENV PATH=/usr/share/logstash/bin:$PATH
# Provide a minimal configuration, so that simple invocations will provide
# a good experience.
ADD config/pipelines.yml config/pipelines.yml
-ADD config/logstash-{{ image_flavor }}.yml config/logstash.yml
+ADD config/logstash-full.yml config/logstash.yml
ADD config/log4j2.properties config/
ADD pipeline/default.conf pipeline/logstash.conf
RUN chown --recursive logstash:root config/ pipeline/
@@ -67,14 +52,8 @@ EXPOSE 9600 5044
LABEL org.label-schema.schema-version="1.0" \
org.label-schema.vendor="Elastic" \
org.label-schema.name="logstash" \
- org.label-schema.version="{{ elastic_version }}" \
+ org.label-schema.version="6.8.1" \
org.label-schema.url="https://www.elastic.co/products/logstash" \
- org.label-schema.vcs-url="https://github.com/elastic/logstash-docker" \
-{% if image_flavor == 'oss' -%}
- license="Apache-2.0"
-{% else -%}
- license="Elastic License"
-{% endif -%}
-
-
+ org.label-schema.vcs-url="https://github.com/elastic/logstash" \
+license="Elastic License"
ENTRYPOINT ["/usr/local/bin/docker-entrypoint"]
diff --git a/build/logstash/bin/docker-entrypoint b/logstash/bin/docker-entrypoint
similarity index 100%
rename from build/logstash/bin/docker-entrypoint
rename to logstash/bin/docker-entrypoint
diff --git a/build/logstash/config/log4j2.properties b/logstash/config/log4j2.properties
similarity index 100%
rename from build/logstash/config/log4j2.properties
rename to logstash/config/log4j2.properties
diff --git a/logstash/config/logstash-full.yml b/logstash/config/logstash-full.yml
new file mode 100644
index 0000000..58e1a35
--- /dev/null
+++ b/logstash/config/logstash-full.yml
@@ -0,0 +1,2 @@
+http.host: "0.0.0.0"
+xpack.monitoring.elasticsearch.hosts: [ "http://elasticsearch:9200" ]
diff --git a/build/logstash/config/logstash-oss.yml b/logstash/config/logstash-oss.yml
similarity index 100%
rename from build/logstash/config/logstash-oss.yml
rename to logstash/config/logstash-oss.yml
diff --git a/build/logstash/config/pipelines.yml b/logstash/config/pipelines.yml
similarity index 100%
rename from build/logstash/config/pipelines.yml
rename to logstash/config/pipelines.yml
diff --git a/logstash/env2yaml/env2yaml b/logstash/env2yaml/env2yaml
new file mode 100755
index 0000000..4abe429
Binary files /dev/null and b/logstash/env2yaml/env2yaml differ
diff --git a/build/logstash/pipeline/default.conf b/logstash/pipeline/default.conf
similarity index 100%
rename from build/logstash/pipeline/default.conf
rename to logstash/pipeline/default.conf
diff --git a/templates/docker-compose.yml.j2 b/templates/docker-compose.yml.j2
deleted file mode 100644
index e228dd5..0000000 |
|
Build test of #6150; 468d3f1; $ bashbrew build elasticsearch:7.1.1
Using bashbrew/cache:ca2556648473146a297925471cfdd2f2711b71b27c555caf744aff101c66a8fa (elasticsearch:7.1.1)
Tagging elasticsearch:7.1.1
$ test/run.sh elasticsearch:7.1.1
testing elasticsearch:7.1.1
'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.1
Pulling docker.elastic.co/elasticsearch/elasticsearch:6.8.1@sha256:974aba875f1ec333f0c2ac7dee1e74d70c5813b039b3a225eb2bf287d4aa5911 (elasticsearch:6.8.1)
Building bashbrew/cache:596bf522dedb3cf8d9418d3c63fc7dbc9bd4ce2c85ae2f3f4bece639ef10a615 (elasticsearch:6.8.1)
Tagging elasticsearch:6.8.1
$ test/run.sh elasticsearch:6.8.1
testing elasticsearch:6.8.1
'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.1.1
Using bashbrew/cache:056e38041d98da78b005bdf8081ad679a344c4350f732b66d56da19328f5d61c (kibana:7.1.1)
Tagging kibana:7.1.1
$ test/run.sh kibana:7.1.1
testing kibana:7.1.1
'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.1
Pulling docker.elastic.co/kibana/kibana:6.8.1@sha256:dbcaccde1ddc16ab12c841b22b2de1fc5d76de5ff0ac843fc3e825ef96781f80 (kibana:6.8.1)
Building bashbrew/cache:615bd1f23a30e14a4f9585b28e8ef8257bf75192ce388aee14236703a54f732c (kibana:6.8.1)
Tagging kibana:6.8.1
$ test/run.sh kibana:6.8.1
testing kibana:6.8.1
'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.1.1
Using bashbrew/cache:4df64b748ecf74725dbd726bf747077cf5d509b26ccc36314d47420a0404e16a (logstash:7.1.1)
Tagging logstash:7.1.1
$ test/run.sh logstash:7.1.1
testing logstash:7.1.1
'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.1
Pulling docker.elastic.co/logstash/logstash:6.8.1@sha256:2280dc3c1deb9d9006cd2a423e09e649ed19109292690f52dd303d0048fc68e1 (logstash:6.8.1)
Building bashbrew/cache:f08b847271a9bd2fe82193afed922659171151af5d3a543b6849df8c5a44f8bf (logstash:6.8.1)
Tagging logstash:6.8.1
$ test/run.sh logstash:6.8.1
testing logstash:6.8.1
'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
|
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: