Skip to content

Commit 0b9d040

Browse files
elasticmachineMaxime Gréau
elasticmachine
authored and
Maxime Gréau
committed
Contexts for 6.8.4 (#25)
This commit was created by the elastic-dockerfiles-publisher.
1 parent 0de29e9 commit 0b9d040

File tree

5 files changed

+36
-22
lines changed

5 files changed

+36
-22
lines changed

‎elasticsearch/Dockerfile

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414
FROM centos:7 AS builder
1515

1616
ENV PATH /usr/share/elasticsearch/bin:$PATH
17-
ENV JAVA_HOME /opt/jdk-12.0.2
17+
ENV JAVA_HOME /opt/jdk-13+33
1818

19-
RUN curl --retry 8 -s https://download.java.net/java/GA/jdk12.0.2/e482c34c86bd4bf8b56c0b35558996b9/10/GPL/openjdk-12.0.2_linux-x64_bin.tar.gz | tar -C /opt -zxf -
19+
RUN curl -L --retry 8 -s https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33/OpenJDK13U-jdk_x64_linux_hotspot_13_33.tar.gz | tar -C /opt -zxf -
2020

2121
# Replace OpenJDK's built-in CA certificate keystore with the one from the OS
2222
# vendor. The latter is superior in several ways.
2323
# REF: https://github.com/elastic/elasticsearch-docker/issues/171
24-
RUN ln -sf /etc/pki/ca-trust/extracted/java/cacerts /opt/jdk-12.0.2/lib/security/cacerts
24+
RUN ln -sf /etc/pki/ca-trust/extracted/java/cacerts /opt/jdk-13+33/lib/security/cacerts
2525

2626
RUN yum install -y unzip which
2727

@@ -30,9 +30,9 @@ RUN groupadd -g 1000 elasticsearch && \
3030

3131
WORKDIR /usr/share/elasticsearch
3232

33-
RUN cd /opt && curl --retry 8 -s -L -O https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.8.3.tar.gz && cd -
33+
RUN cd /opt && curl --retry 8 -s -L -O https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.8.4.tar.gz && cd -
3434

35-
RUN tar zxf /opt/elasticsearch-6.8.3.tar.gz --strip-components=1
35+
RUN tar zxf /opt/elasticsearch-6.8.4.tar.gz --strip-components=1
3636
RUN grep ES_DISTRIBUTION_TYPE=tar /usr/share/elasticsearch/bin/elasticsearch-env \
3737
&& sed -ie 's/ES_DISTRIBUTION_TYPE=tar/ES_DISTRIBUTION_TYPE=docker/' /usr/share/elasticsearch/bin/elasticsearch-env
3838
RUN mkdir -p config data logs
@@ -48,13 +48,13 @@ COPY config/elasticsearch.yml config/log4j2.properties config/
4848
FROM centos:7
4949

5050
ENV ELASTIC_CONTAINER true
51-
ENV JAVA_HOME /opt/jdk-12.0.2
51+
ENV JAVA_HOME /opt/jdk-13+33
5252

53-
COPY --from=builder /opt/jdk-12.0.2 /opt/jdk-12.0.2
53+
COPY --from=builder /opt/jdk-13+33 /opt/jdk-13+33
5454

55-
RUN for iter in {1..10}; do yum update -y && \
56-
yum install -y nc unzip wget which && \
57-
yum clean all && exit_code=0 && break || exit_code=$? && echo "yum error: retry $iter in 10s" && sleep 10; done; \
55+
RUN for iter in {1..10}; do yum update --setopt=tsflags=nodocs -y && \
56+
yum install -y --setopt=tsflags=nodocs nc unzip wget which && \
57+
yum clean all && exit_code=0 && break || exit_code=\$? && echo "yum error: retry \$iter in 10s" && sleep 10; done; \
5858
(exit $exit_code)
5959

6060
RUN groupadd -g 1000 elasticsearch && \
@@ -76,25 +76,25 @@ RUN chgrp 0 /usr/local/bin/docker-entrypoint.sh && \
7676

7777
EXPOSE 9200 9300
7878

79-
LABEL org.label-schema.build-date="2019-08-29T19:05:24.312154Z" \
79+
LABEL org.label-schema.build-date="2019-10-16T06:19:49.319352Z" \
8080
org.label-schema.license="Elastic-License" \
8181
org.label-schema.name="Elasticsearch" \
8282
org.label-schema.schema-version="1.0" \
8383
org.label-schema.url="https://www.elastic.co/products/elasticsearch" \
8484
org.label-schema.usage="https://www.elastic.co/guide/en/elasticsearch/reference/index.html" \
85-
org.label-schema.vcs-ref="0c48c0e73be564f3a8a286b2165d50de2fbbb661" \
85+
org.label-schema.vcs-ref="bca0c8d6a8e62c36e3f9e7673017393dcef557b6" \
8686
org.label-schema.vcs-url="https://github.com/elastic/elasticsearch" \
8787
org.label-schema.vendor="Elastic" \
88-
org.label-schema.version="6.8.3" \
89-
org.opencontainers.image.created="2019-08-29T19:05:24.312154Z" \
88+
org.label-schema.version="6.8.4" \
89+
org.opencontainers.image.created="2019-10-16T06:19:49.319352Z" \
9090
org.opencontainers.image.documentation="https://www.elastic.co/guide/en/elasticsearch/reference/index.html" \
9191
org.opencontainers.image.licenses="Elastic-License" \
92-
org.opencontainers.image.revision="0c48c0e73be564f3a8a286b2165d50de2fbbb661" \
92+
org.opencontainers.image.revision="bca0c8d6a8e62c36e3f9e7673017393dcef557b6" \
9393
org.opencontainers.image.source="https://github.com/elastic/elasticsearch" \
9494
org.opencontainers.image.title="Elasticsearch" \
9595
org.opencontainers.image.url="https://www.elastic.co/products/elasticsearch" \
9696
org.opencontainers.image.vendor="Elastic" \
97-
org.opencontainers.image.version="6.8.3"
97+
org.opencontainers.image.version="6.8.4"
9898

9999
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
100100
# Dummy overridable parameter parsed by entrypoint

‎kibana/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
# Extract Kibana and make various file manipulations.
88
################################################################################
99
FROM centos:7 AS prep_files
10-
RUN cd /opt && curl --retry 8 -s -L -O https://artifacts.elastic.co/downloads/kibana/kibana-6.8.3-linux-x86_64.tar.gz && cd -
10+
RUN cd /opt && curl --retry 8 -s -L -O https://artifacts.elastic.co/downloads/kibana/kibana-6.8.4-linux-x86_64.tar.gz && cd -
1111
RUN mkdir /usr/share/kibana
1212
WORKDIR /usr/share/kibana
13-
RUN tar --strip-components=1 -zxf /opt/kibana-6.8.3-linux-x86_64.tar.gz
13+
RUN tar --strip-components=1 -zxf /opt/kibana-6.8.4-linux-x86_64.tar.gz
1414
# Ensure that group permissions are the same as user permissions.
1515
# This will help when relying on GID-0 to run Kibana, rather than UID-1000.
1616
# OpenShift does this, for example.
@@ -50,6 +50,6 @@ RUN chmod g+ws /usr/share/kibana && find /usr/share/kibana -gid 0 -and -not -per
5050
RUN groupadd --gid 1000 kibana && useradd --uid 1000 --gid 1000 --home-dir /usr/share/kibana --no-create-home kibana
5151
USER kibana
5252

53-
LABEL org.label-schema.schema-version="1.0" org.label-schema.vendor="Elastic" org.label-schema.name="kibana" org.label-schema.version="6.8.3" org.label-schema.url="https://www.elastic.co/products/kibana" org.label-schema.vcs-url="https://github.com/elastic/kibana" org.label-schema.license="Elastic License" license="Elastic License"
53+
LABEL org.label-schema.schema-version="1.0" org.label-schema.vendor="Elastic" org.label-schema.name="kibana" org.label-schema.version="6.8.4" org.label-schema.url="https://www.elastic.co/products/kibana" org.label-schema.vcs-url="https://github.com/elastic/kibana" org.label-schema.license="Elastic License" license="Elastic License"
5454

5555
CMD ["/usr/local/bin/kibana-docker"]

‎kibana/bin/kibana-docker

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,10 @@ kibana_vars=(
116116
xpack.monitoring.ui.container.elasticsearch.enabled
117117
xpack.monitoring.ui.container.logstash.enabled
118118
xpack.monitoring.ui.enabled
119+
xpack.reporting.capture.browser.autoDownload
119120
xpack.reporting.capture.browser.chromium.disableSandbox
121+
xpack.reporting.capture.browser.chromium.inspect
122+
xpack.reporting.capture.browser.chromium.maxScreenshotDimension
120123
xpack.reporting.capture.browser.chromium.proxy.enabled
121124
xpack.reporting.capture.browser.chromium.proxy.server
122125
xpack.reporting.capture.browser.chromium.proxy.bypass
@@ -125,16 +128,27 @@ kibana_vars=(
125128
xpack.reporting.capture.loadDelay
126129
xpack.reporting.capture.settleTime
127130
xpack.reporting.capture.timeout
131+
xpack.reporting.capture.viewport.height
132+
xpack.reporting.capture.viewport.width
133+
xpack.reporting.capture.zoom
128134
xpack.reporting.csv.maxSizeBytes
135+
xpack.reporting.csv.scroll.duration
136+
xpack.reporting.csv.scroll.size
129137
xpack.reporting.enabled
130138
xpack.reporting.encryptionKey
131139
xpack.reporting.index
132140
xpack.reporting.kibanaApp
133141
xpack.reporting.kibanaServer.hostname
134142
xpack.reporting.kibanaServer.port
135143
xpack.reporting.kibanaServer.protocol
144+
xpack.reporting.poll.jobCompletionNotifier.interval
145+
xpack.reporting.poll.jobCompletionNotifier.intervalErrorMultiplier
146+
xpack.reporting.poll.jobsRefresh.interval
147+
xpack.reporting.poll.jobsRefresh.intervalErrorMultiplier
136148
xpack.reporting.queue.indexInterval
149+
xpack.reporting.queue.pollEnabled
137150
xpack.reporting.queue.pollInterval
151+
xpack.reporting.queue.pollIntervalErrorMultiplier
138152
xpack.reporting.queue.timeout
139153
xpack.reporting.roles.allow
140154
xpack.searchprofiler.enabled

‎logstash/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ RUN groupadd --gid 1000 logstash && \
1313
logstash
1414

1515
# Add Logstash itself.
16-
RUN curl -Lo - https://artifacts.elastic.co/downloads/logstash/logstash-6.8.3.tar.gz | \
16+
RUN curl -Lo - https://artifacts.elastic.co/downloads/logstash/logstash-6.8.4.tar.gz | \
1717
tar zxf - -C /usr/share && \
18-
mv /usr/share/logstash-6.8.3 /usr/share/logstash && \
18+
mv /usr/share/logstash-6.8.4 /usr/share/logstash && \
1919
chown --recursive logstash:logstash /usr/share/logstash/ && \
2020
chown -R logstash:root /usr/share/logstash && \
2121
chmod -R g=u /usr/share/logstash && \
@@ -52,7 +52,7 @@ EXPOSE 9600 5044
5252
LABEL org.label-schema.schema-version="1.0" \
5353
org.label-schema.vendor="Elastic" \
5454
org.label-schema.name="logstash" \
55-
org.label-schema.version="6.8.3" \
55+
org.label-schema.version="6.8.4" \
5656
org.label-schema.url="https://www.elastic.co/products/logstash" \
5757
org.label-schema.vcs-url="https://github.com/elastic/logstash" \
5858
license="Elastic License"

‎logstash/env2yaml/env2yaml

259 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)