Skip to content

Commit 5404ea3

Browse files
Contexts for 6.8.7 (#36)
This commit was created by the elastic-dockerfiles-publisher.
1 parent f7f8b8a commit 5404ea3

File tree

4 files changed

+19
-19
lines changed

4 files changed

+19
-19
lines changed

elasticsearch/Dockerfile

+13-13
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@
1414
FROM centos:7 AS builder
1515

1616
ENV PATH /usr/share/elasticsearch/bin:$PATH
17-
ENV JAVA_HOME /opt/jdk-13.0.1+9
17+
ENV JAVA_HOME /opt/jdk-13.0.2+8
1818

19-
RUN for iter in {1..10}; do curl -L -s -S https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.1%2B9/OpenJDK13U-jdk_x64_linux_hotspot_13.0.1_9.tar.gz | tar -C /opt -zx && \
19+
RUN for iter in {1..10}; do curl -L -s -S https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_x64_linux_hotspot_13.0.2_8.tar.gz | tar -C /opt -zx && \
2020
exit_code=0 && break || exit_code=\$? && echo "download error: retry $iter in 10s" && sleep 10; done; \
2121
(exit $exit_code)
2222

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

2828
RUN yum install -y unzip which
2929

@@ -32,9 +32,9 @@ RUN groupadd -g 1000 elasticsearch && \
3232

3333
WORKDIR /usr/share/elasticsearch
3434

35-
RUN cd /opt && curl --retry 8 -s -L -O https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.8.6.tar.gz && cd -
35+
RUN cd /opt && curl --retry 8 -s -L -O https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.8.7.tar.gz && cd -
3636

37-
RUN tar zxf /opt/elasticsearch-6.8.6.tar.gz --strip-components=1
37+
RUN tar zxf /opt/elasticsearch-6.8.7.tar.gz --strip-components=1
3838
RUN grep ES_DISTRIBUTION_TYPE=tar /usr/share/elasticsearch/bin/elasticsearch-env \
3939
&& sed -ie 's/ES_DISTRIBUTION_TYPE=tar/ES_DISTRIBUTION_TYPE=docker/' /usr/share/elasticsearch/bin/elasticsearch-env
4040
RUN mkdir -p config data logs
@@ -50,9 +50,9 @@ COPY config/elasticsearch.yml config/log4j2.properties config/
5050
FROM centos:7
5151

5252
ENV ELASTIC_CONTAINER true
53-
ENV JAVA_HOME /opt/jdk-13.0.1+9
53+
ENV JAVA_HOME /opt/jdk-13.0.2+8
5454

55-
COPY --from=builder /opt/jdk-13.0.1+9 /opt/jdk-13.0.1+9
55+
COPY --from=builder /opt/jdk-13.0.2+8 /opt/jdk-13.0.2+8
5656

5757
RUN for iter in {1..10}; do yum update --setopt=tsflags=nodocs -y && \
5858
yum install -y --setopt=tsflags=nodocs nc unzip wget which && \
@@ -78,25 +78,25 @@ RUN chgrp 0 /usr/local/bin/docker-entrypoint.sh && \
7878

7979
EXPOSE 9200 9300
8080

81-
LABEL org.label-schema.build-date="2019-12-13T17:11:52.013738Z" \
81+
LABEL org.label-schema.build-date="2020-02-26T14:38:01.193138Z" \
8282
org.label-schema.license="Elastic-License" \
8383
org.label-schema.name="Elasticsearch" \
8484
org.label-schema.schema-version="1.0" \
8585
org.label-schema.url="https://www.elastic.co/products/elasticsearch" \
8686
org.label-schema.usage="https://www.elastic.co/guide/en/elasticsearch/reference/index.html" \
87-
org.label-schema.vcs-ref="3d9f765bcad28244dc4c8eb8e8b7ba97ba5408f1" \
87+
org.label-schema.vcs-ref="c63e621eaba638f77ebb10e03f7637688eb0a726" \
8888
org.label-schema.vcs-url="https://github.com/elastic/elasticsearch" \
8989
org.label-schema.vendor="Elastic" \
90-
org.label-schema.version="6.8.6" \
91-
org.opencontainers.image.created="2019-12-13T17:11:52.013738Z" \
90+
org.label-schema.version="6.8.7" \
91+
org.opencontainers.image.created="2020-02-26T14:38:01.193138Z" \
9292
org.opencontainers.image.documentation="https://www.elastic.co/guide/en/elasticsearch/reference/index.html" \
9393
org.opencontainers.image.licenses="Elastic-License" \
94-
org.opencontainers.image.revision="3d9f765bcad28244dc4c8eb8e8b7ba97ba5408f1" \
94+
org.opencontainers.image.revision="c63e621eaba638f77ebb10e03f7637688eb0a726" \
9595
org.opencontainers.image.source="https://github.com/elastic/elasticsearch" \
9696
org.opencontainers.image.title="Elasticsearch" \
9797
org.opencontainers.image.url="https://www.elastic.co/products/elasticsearch" \
9898
org.opencontainers.image.vendor="Elastic" \
99-
org.opencontainers.image.version="6.8.6"
99+
org.opencontainers.image.version="6.8.7"
100100

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

kibana/Dockerfile

+3-3
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.6-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.7-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.6-linux-x86_64.tar.gz
13+
RUN tar --strip-components=1 -zxf /opt/kibana-6.8.7-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.6" 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.7" 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"]

logstash/Dockerfile

+3-3
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.6.tar.gz | \
16+
RUN curl -Lo - https://artifacts.elastic.co/downloads/logstash/logstash-6.8.7.tar.gz | \
1717
tar zxf - -C /usr/share && \
18-
mv /usr/share/logstash-6.8.6 /usr/share/logstash && \
18+
mv /usr/share/logstash-6.8.7 /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.6" \
55+
org.label-schema.version="6.8.7" \
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

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)