Skip to content

Commit

Permalink
Contexts for 6.8.6 (#30)
Browse files Browse the repository at this point in the history
This commit was created by the elastic-dockerfiles-publisher.
  • Loading branch information
elasticmachine authored and Conky5 committed Dec 18, 2019
1 parent f682427 commit f7f8b8a
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
16 changes: 8 additions & 8 deletions elasticsearch/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ RUN groupadd -g 1000 elasticsearch && \

WORKDIR /usr/share/elasticsearch

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

RUN tar zxf /opt/elasticsearch-6.8.5.tar.gz --strip-components=1
RUN tar zxf /opt/elasticsearch-6.8.6.tar.gz --strip-components=1
RUN grep ES_DISTRIBUTION_TYPE=tar /usr/share/elasticsearch/bin/elasticsearch-env \
&& sed -ie 's/ES_DISTRIBUTION_TYPE=tar/ES_DISTRIBUTION_TYPE=docker/' /usr/share/elasticsearch/bin/elasticsearch-env
RUN mkdir -p config data logs
Expand Down Expand Up @@ -78,25 +78,25 @@ RUN chgrp 0 /usr/local/bin/docker-entrypoint.sh && \

EXPOSE 9200 9300

LABEL org.label-schema.build-date="2019-11-13T20:04:24.100411Z" \
LABEL org.label-schema.build-date="2019-12-13T17:11:52.013738Z" \
org.label-schema.license="Elastic-License" \
org.label-schema.name="Elasticsearch" \
org.label-schema.schema-version="1.0" \
org.label-schema.url="https://www.elastic.co/products/elasticsearch" \
org.label-schema.usage="https://www.elastic.co/guide/en/elasticsearch/reference/index.html" \
org.label-schema.vcs-ref="78990e93431aebcc3dcd7fa20fab4b5b29ab7988" \
org.label-schema.vcs-ref="3d9f765bcad28244dc4c8eb8e8b7ba97ba5408f1" \
org.label-schema.vcs-url="https://github.com/elastic/elasticsearch" \
org.label-schema.vendor="Elastic" \
org.label-schema.version="6.8.5" \
org.opencontainers.image.created="2019-11-13T20:04:24.100411Z" \
org.label-schema.version="6.8.6" \
org.opencontainers.image.created="2019-12-13T17:11:52.013738Z" \
org.opencontainers.image.documentation="https://www.elastic.co/guide/en/elasticsearch/reference/index.html" \
org.opencontainers.image.licenses="Elastic-License" \
org.opencontainers.image.revision="78990e93431aebcc3dcd7fa20fab4b5b29ab7988" \
org.opencontainers.image.revision="3d9f765bcad28244dc4c8eb8e8b7ba97ba5408f1" \
org.opencontainers.image.source="https://github.com/elastic/elasticsearch" \
org.opencontainers.image.title="Elasticsearch" \
org.opencontainers.image.url="https://www.elastic.co/products/elasticsearch" \
org.opencontainers.image.vendor="Elastic" \
org.opencontainers.image.version="6.8.5"
org.opencontainers.image.version="6.8.6"

ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
# Dummy overridable parameter parsed by entrypoint
Expand Down
6 changes: 3 additions & 3 deletions kibana/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
# Extract Kibana and make various file manipulations.
################################################################################
FROM centos:7 AS prep_files
RUN cd /opt && curl --retry 8 -s -L -O https://artifacts.elastic.co/downloads/kibana/kibana-6.8.5-linux-x86_64.tar.gz && cd -
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 -
RUN mkdir /usr/share/kibana
WORKDIR /usr/share/kibana
RUN tar --strip-components=1 -zxf /opt/kibana-6.8.5-linux-x86_64.tar.gz
RUN tar --strip-components=1 -zxf /opt/kibana-6.8.6-linux-x86_64.tar.gz
# Ensure that group permissions are the same as user permissions.
# This will help when relying on GID-0 to run Kibana, rather than UID-1000.
# OpenShift does this, for example.
Expand Down Expand Up @@ -50,6 +50,6 @@ RUN chmod g+ws /usr/share/kibana && find /usr/share/kibana -gid 0 -and -not -per
RUN groupadd --gid 1000 kibana && useradd --uid 1000 --gid 1000 --home-dir /usr/share/kibana --no-create-home kibana
USER kibana

LABEL org.label-schema.schema-version="1.0" org.label-schema.vendor="Elastic" org.label-schema.name="kibana" org.label-schema.version="6.8.5" 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"
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"

CMD ["/usr/local/bin/kibana-docker"]
6 changes: 3 additions & 3 deletions logstash/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ RUN groupadd --gid 1000 logstash && \
logstash

# Add Logstash itself.
RUN curl -Lo - https://artifacts.elastic.co/downloads/logstash/logstash-6.8.5.tar.gz | \
RUN curl -Lo - https://artifacts.elastic.co/downloads/logstash/logstash-6.8.6.tar.gz | \
tar zxf - -C /usr/share && \
mv /usr/share/logstash-6.8.5 /usr/share/logstash && \
mv /usr/share/logstash-6.8.6 /usr/share/logstash && \
chown --recursive logstash:logstash /usr/share/logstash/ && \
chown -R logstash:root /usr/share/logstash && \
chmod -R g=u /usr/share/logstash && \
Expand Down Expand Up @@ -52,7 +52,7 @@ 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="6.8.5" \
org.label-schema.version="6.8.6" \
org.label-schema.url="https://www.elastic.co/products/logstash" \
org.label-schema.vcs-url="https://github.com/elastic/logstash" \
license="Elastic License"
Expand Down
Binary file modified logstash/env2yaml/env2yaml
Binary file not shown.

0 comments on commit f7f8b8a

Please sign in to comment.