Skip to content

Commit a46abbb

Browse files
Contexts for 8.0.0-alpha2 (docker-library#81)
This commit was created by the elastic-dockerfiles-publisher.
1 parent ae83f07 commit a46abbb

File tree

6 files changed

+37
-33
lines changed

6 files changed

+37
-33
lines changed

elasticsearch/Dockerfile

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ENV TARBALL_URL https://curl.haxx.se/download/curl-${VERSION}.tar.xz
1515
ENV TARBALL_PATH curl-${VERSION}.tar.xz
1616

1717
# Install dependencies
18-
RUN for iter in {1..10}; do \
18+
RUN for iter in 1 2 3 4 5 6 7 8 9 10; do \
1919
apk add gnupg gcc make musl-dev openssl-dev openssl-libs-static file && \
2020
exit_code=0 && break || \
2121
exit_code=$? && echo "apk error: retry $iter in 10s" && sleep 10; \
@@ -29,7 +29,7 @@ WORKDIR /work
2929
RUN function retry_wget() { \
3030
local URL="$1" ; \
3131
local DEST="$2" ; \
32-
for iter in {1..10}; do \
32+
for iter in 1 2 3 4 5 6 7 8 9 10; do \
3333
wget "$URL" -O "$DEST" && \
3434
exit_code=0 && break || \
3535
exit_code=$? && echo "wget error: retry $iter in 10s" && sleep 10; \
@@ -165,9 +165,9 @@ FROM centos:8 AS builder
165165
RUN mkdir /usr/share/elasticsearch
166166
WORKDIR /usr/share/elasticsearch
167167

168-
RUN curl --retry 10 -S -L --output /opt/elasticsearch.tar.gz https://artifacts-no-kpi.elastic.co/downloads/elasticsearch/elasticsearch-8.0.0-alpha1-linux-$(arch).tar.gz
168+
RUN curl --retry 10 -S -L --output /tmp/elasticsearch.tar.gz https://artifacts-no-kpi.elastic.co/downloads/elasticsearch/elasticsearch-8.0.0-alpha2-linux-$(arch).tar.gz
169169

170-
RUN tar -zxf /opt/elasticsearch.tar.gz --strip-components=1
170+
RUN tar -zxf /tmp/elasticsearch.tar.gz --strip-components=1
171171

172172
# The distribution includes a `config` directory, no need to create it
173173
COPY config/elasticsearch.yml config/
@@ -236,35 +236,34 @@ RUN chmod g=u /etc/passwd && \
236236

237237
EXPOSE 9200 9300
238238

239-
LABEL org.label-schema.build-date="2021-08-03T20:46:41.477290628Z" \
239+
LABEL org.label-schema.build-date="2021-09-11T04:08:03.522358073Z" \
240240
org.label-schema.license="Elastic-License-2.0" \
241241
org.label-schema.name="Elasticsearch" \
242242
org.label-schema.schema-version="1.0" \
243243
org.label-schema.url="https://www.elastic.co/products/elasticsearch" \
244244
org.label-schema.usage="https://www.elastic.co/guide/en/elasticsearch/reference/index.html" \
245-
org.label-schema.vcs-ref="b11c15b7e0af64f90c3eb9c52c2534b4f143a070" \
245+
org.label-schema.vcs-ref="c4aef6f1a6b450952de62640948d2501c85eecec" \
246246
org.label-schema.vcs-url="https://github.com/elastic/elasticsearch" \
247247
org.label-schema.vendor="Elastic" \
248-
org.label-schema.version="8.0.0-alpha1" \
249-
org.opencontainers.image.created="2021-08-03T20:46:41.477290628Z" \
248+
org.label-schema.version="8.0.0-alpha2" \
249+
org.opencontainers.image.created="2021-09-11T04:08:03.522358073Z" \
250250
org.opencontainers.image.documentation="https://www.elastic.co/guide/en/elasticsearch/reference/index.html" \
251251
org.opencontainers.image.licenses="Elastic-License-2.0" \
252-
org.opencontainers.image.revision="b11c15b7e0af64f90c3eb9c52c2534b4f143a070" \
252+
org.opencontainers.image.revision="c4aef6f1a6b450952de62640948d2501c85eecec" \
253253
org.opencontainers.image.source="https://github.com/elastic/elasticsearch" \
254254
org.opencontainers.image.title="Elasticsearch" \
255255
org.opencontainers.image.url="https://www.elastic.co/products/elasticsearch" \
256256
org.opencontainers.image.vendor="Elastic" \
257-
org.opencontainers.image.version="8.0.0-alpha1"
258-
259-
USER elasticsearch:root
257+
org.opencontainers.image.version="8.0.0-alpha2"
260258

261259
# Our actual entrypoint is `tini`, a minimal but functional init program. It
262260
# calls the entrypoint we provide, while correctly forwarding signals.
263261
ENTRYPOINT ["/bin/tini", "--", "/usr/local/bin/docker-entrypoint.sh"]
264-
265262
# Dummy overridable parameter parsed by entrypoint
266263
CMD ["eswrapper"]
267264

265+
USER elasticsearch:root
266+
268267
################################################################################
269268
# End of multi-stage Dockerfile
270269
################################################################################

elasticsearch/config/log4j2.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ appender.header_warning.name = header_warning
2626
#################################################
2727

2828
logger.deprecation.name = org.elasticsearch.deprecation
29-
logger.deprecation.level = deprecation
29+
logger.deprecation.level = WARN
3030
logger.deprecation.appenderRef.deprecation_rolling.ref = deprecation_rolling
3131
logger.deprecation.appenderRef.header_warning.ref = header_warning
3232
logger.deprecation.additivity = false

kibana/Dockerfile

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,20 @@ FROM centos:8 AS builder
1515
RUN cd /opt && \
1616
curl --retry 8 -s -L \
1717
--output kibana.tar.gz \
18-
https://artifacts.elastic.co/downloads/kibana/kibana-8.0.0-alpha1-linux-$(arch).tar.gz && \
18+
https://artifacts.elastic.co/downloads/kibana/kibana-8.0.0-alpha2-linux-$(arch).tar.gz && \
1919
cd -
2020

2121

2222
RUN mkdir /usr/share/kibana
2323
WORKDIR /usr/share/kibana
24-
RUN tar --strip-components=1 -zxf /opt/kibana.tar.gz
24+
RUN tar --strip-components=1 -zxf /tmp/kibana.tar.gz
2525
# Ensure that group permissions are the same as user permissions.
2626
# This will help when relying on GID-0 to run Kibana, rather than UID-1000.
2727
# OpenShift does this, for example.
2828
# REF: https://docs.openshift.org/latest/creating_images/guidelines.html
2929
RUN chmod -R g=u /usr/share/kibana
3030

31+
3132
################################################################################
3233
# Build stage 1 (the actual Kibana image):
3334
#
@@ -100,29 +101,31 @@ RUN groupadd --gid 1000 kibana && \
100101
--home-dir /usr/share/kibana --no-create-home \
101102
kibana
102103

103-
LABEL org.label-schema.build-date="2021-08-03T19:35:48.434Z" \
104+
LABEL org.label-schema.build-date="2021-09-10T23:39:56.584Z" \
104105
org.label-schema.license="Elastic License" \
105106
org.label-schema.name="Kibana" \
106107
org.label-schema.schema-version="1.0" \
107108
org.label-schema.url="https://www.elastic.co/products/kibana" \
108109
org.label-schema.usage="https://www.elastic.co/guide/en/kibana/reference/index.html" \
109-
org.label-schema.vcs-ref="1ddb1eedf72380b1959ece8ece82d9f3bd84949f" \
110+
org.label-schema.vcs-ref="7da17a5e67b2443ec1c3f8f2d46cec2a97f45a7a" \
110111
org.label-schema.vcs-url="https://github.com/elastic/kibana" \
111112
org.label-schema.vendor="Elastic" \
112-
org.label-schema.version="8.0.0-alpha1" \
113-
org.opencontainers.image.created="2021-08-03T19:35:48.434Z" \
113+
org.label-schema.version="8.0.0-alpha2" \
114+
org.opencontainers.image.created="2021-09-10T23:39:56.584Z" \
114115
org.opencontainers.image.documentation="https://www.elastic.co/guide/en/kibana/reference/index.html" \
115116
org.opencontainers.image.licenses="Elastic License" \
116-
org.opencontainers.image.revision="1ddb1eedf72380b1959ece8ece82d9f3bd84949f" \
117+
org.opencontainers.image.revision="7da17a5e67b2443ec1c3f8f2d46cec2a97f45a7a" \
117118
org.opencontainers.image.source="https://github.com/elastic/kibana" \
118119
org.opencontainers.image.title="Kibana" \
119120
org.opencontainers.image.url="https://www.elastic.co/products/kibana" \
120121
org.opencontainers.image.vendor="Elastic" \
121-
org.opencontainers.image.version="8.0.0-alpha1"
122-
122+
org.opencontainers.image.version="8.0.0-alpha2"
123123

124-
USER kibana
125124

126125
ENTRYPOINT ["/bin/tini", "--"]
127126

127+
128128
CMD ["/usr/local/bin/kibana-docker"]
129+
130+
131+
USER kibana

kibana/bin/kibana-docker

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,11 @@ kibana_vars=(
7373
enterpriseSearch.host
7474
externalUrl.policy
7575
i18n.locale
76+
interactiveSetup.enabled
77+
interactiveSetup.connectionCheck.interval
7678
interpreter.enableInVisualize
7779
kibana.autocompleteTerminateAfter
7880
kibana.autocompleteTimeout
79-
kibana.defaultAppId
8081
kibana.index
8182
logging.appenders
8283
logging.appenders.console
@@ -108,6 +109,7 @@ kibana_vars=(
108109
map.tilemap.options.subdomains
109110
map.tilemap.url
110111
migrations.batchSize
112+
migrations.maxBatchSizeBytes
111113
migrations.enableV2
112114
migrations.pollInterval
113115
migrations.retryAttempts
@@ -191,13 +193,13 @@ kibana_vars=(
191193
telemetry.enabled
192194
telemetry.optIn
193195
telemetry.optInStatusUrl
196+
telemetry.sendUsageTo
194197
telemetry.sendUsageFrom
195198
tilemap.options.attribution
196199
tilemap.options.maxZoom
197200
tilemap.options.minZoom
198201
tilemap.options.subdomains
199202
tilemap.url
200-
timelion.enabled
201203
url_drilldown.enabled
202204
vega.enableExternalUrls
203205
vis_type_vega.enableExternalUrls
@@ -292,7 +294,6 @@ kibana_vars=(
292294
xpack.ingestManager.registryUrl
293295
xpack.license_management.enabled
294296
xpack.maps.enabled
295-
xpack.maps.showMapVisualizationTypes
296297
xpack.ml.enabled
297298
xpack.observability.annotations.index
298299
xpack.observability.unsafe.alertingExperience.enabled
@@ -382,6 +383,7 @@ kibana_vars=(
382383
xpack.security.session.lifespan
383384
xpack.security.sessionTimeout
384385
xpack.securitySolution.alertMergeStrategy
386+
xpack.securitySolution.alertIgnoreFields
385387
xpack.securitySolution.endpointResultListDefaultFirstPageIndex
386388
xpack.securitySolution.endpointResultListDefaultPageSize
387389
xpack.securitySolution.maxRuleImportExportSize

logstash/Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ RUN groupadd --gid 1000 logstash && \
2525
logstash
2626

2727
# Add Logstash itself.
28-
RUN curl -Lo - https://artifacts.elastic.co/downloads/logstash/logstash-8.0.0-alpha1-linux-$(arch).tar.gz | \
28+
RUN curl -Lo - https://artifacts.elastic.co/downloads/logstash/logstash-8.0.0-alpha2-linux-$(arch).tar.gz | \
2929
tar zxf - -C /usr/share && \
30-
mv /usr/share/logstash-8.0.0-alpha1 /usr/share/logstash && \
30+
mv /usr/share/logstash-8.0.0-alpha2 /usr/share/logstash && \
3131
chown --recursive logstash:logstash /usr/share/logstash/ && \
3232
chown -R logstash:root /usr/share/logstash && \
3333
chmod -R g=u /usr/share/logstash && \
@@ -70,15 +70,15 @@ LABEL org.label-schema.schema-version="1.0" \
7070
org.opencontainers.image.vendor="Elastic" \
7171
org.label-schema.name="logstash" \
7272
org.opencontainers.image.title="logstash" \
73-
org.label-schema.version="8.0.0-alpha1" \
74-
org.opencontainers.image.version="8.0.0-alpha1" \
73+
org.label-schema.version="8.0.0-alpha2" \
74+
org.opencontainers.image.version="8.0.0-alpha2" \
7575
org.label-schema.url="https://www.elastic.co/products/logstash" \
7676
org.label-schema.vcs-url="https://github.com/elastic/logstash" \
7777
org.label-schema.license="Elastic License" \
7878
org.opencontainers.image.licenses="Elastic License" \
7979
org.opencontainers.image.description="Logstash is a free and open server-side data processing pipeline that ingests data from a multitude of sources, transforms it, and then sends it to your favorite 'stash.'" \
80-
org.label-schema.build-date=2021-08-03T19:32:09Z \
81-
org.opencontainers.image.created=2021-08-03T19:32:09Z
80+
org.label-schema.build-date=2021-09-10T23:37:50Z \
81+
org.opencontainers.image.created=2021-09-10T23:37:50Z
8282

8383

8484
ENTRYPOINT ["/usr/local/bin/docker-entrypoint"]

logstash/env2yaml/env2yaml

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)