Skip to content

Commit

Permalink
Contexts for 8.13.2
Browse files Browse the repository at this point in the history
This commit was created by the elastic-dockerfiles-publisher.
  • Loading branch information
elasticmachine committed Apr 8, 2024
1 parent 4fdbd17 commit 66eb45c
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 21 deletions.
14 changes: 7 additions & 7 deletions elasticsearch/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ RUN set -eux ; \
RUN mkdir /usr/share/elasticsearch
WORKDIR /usr/share/elasticsearch

RUN curl --retry 10 -S -L --output /tmp/elasticsearch.tar.gz https://artifacts-no-kpi.elastic.co/downloads/elasticsearch/elasticsearch-8.13.1-linux-$(arch).tar.gz
RUN curl --retry 10 -S -L --output /tmp/elasticsearch.tar.gz https://artifacts-no-kpi.elastic.co/downloads/elasticsearch/elasticsearch-8.13.2-linux-$(arch).tar.gz

RUN tar -zxf /tmp/elasticsearch.tar.gz --strip-components=1

Expand Down Expand Up @@ -135,25 +135,25 @@ RUN /etc/ca-certificates/update.d/docker-openjdk

EXPOSE 9200 9300

LABEL org.label-schema.build-date="2024-03-29T10:05:29.787251984Z" \
LABEL org.label-schema.build-date="2024-04-05T14:45:26.420424304Z" \
org.label-schema.license="Elastic-License-2.0" \
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="9287f29bba5e270bd51d557b8daccb7d118ba247" \
org.label-schema.vcs-ref="16cc90cd2d08a3147ce02b07e50894bc060a4cbf" \
org.label-schema.vcs-url="https://github.com/elastic/elasticsearch" \
org.label-schema.vendor="Elastic" \
org.label-schema.version="8.13.1" \
org.opencontainers.image.created="2024-03-29T10:05:29.787251984Z" \
org.label-schema.version="8.13.2" \
org.opencontainers.image.created="2024-04-05T14:45:26.420424304Z" \
org.opencontainers.image.documentation="https://www.elastic.co/guide/en/elasticsearch/reference/index.html" \
org.opencontainers.image.licenses="Elastic-License-2.0" \
org.opencontainers.image.revision="9287f29bba5e270bd51d557b8daccb7d118ba247" \
org.opencontainers.image.revision="16cc90cd2d08a3147ce02b07e50894bc060a4cbf" \
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="8.13.1"
org.opencontainers.image.version="8.13.2"

# Our actual entrypoint is `tini`, a minimal but functional init program. It
# calls the entrypoint we provide, while correctly forwarding signals.
Expand Down
14 changes: 7 additions & 7 deletions kibana/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y curl
RUN cd /tmp && \
curl --retry 8 -s -L \
--output kibana.tar.gz \
https://artifacts.elastic.co/downloads/kibana/kibana-8.13.1-linux-$(arch).tar.gz && \
https://artifacts.elastic.co/downloads/kibana/kibana-8.13.2-linux-$(arch).tar.gz && \
cd -


Expand Down Expand Up @@ -104,25 +104,25 @@ RUN groupadd --gid 1000 kibana && \
--home-dir /usr/share/kibana --no-create-home \
kibana

LABEL org.label-schema.build-date="2024-03-29T12:06:31.613Z" \
LABEL org.label-schema.build-date="2024-04-05T16:08:08.397Z" \
org.label-schema.license="Elastic License" \
org.label-schema.name="Kibana" \
org.label-schema.schema-version="1.0" \
org.label-schema.url="https://www.elastic.co/products/kibana" \
org.label-schema.usage="https://www.elastic.co/guide/en/kibana/reference/index.html" \
org.label-schema.vcs-ref="091f486ab05863258cf2f3fa18ea0c59097dee80" \
org.label-schema.vcs-ref="d4d06bdf0d1d5dcb4532f00d2cbaa83fc61bb877" \
org.label-schema.vcs-url="https://github.com/elastic/kibana" \
org.label-schema.vendor="Elastic" \
org.label-schema.version="8.13.1" \
org.opencontainers.image.created="2024-03-29T12:06:31.613Z" \
org.label-schema.version="8.13.2" \
org.opencontainers.image.created="2024-04-05T16:08:08.397Z" \
org.opencontainers.image.documentation="https://www.elastic.co/guide/en/kibana/reference/index.html" \
org.opencontainers.image.licenses="Elastic License" \
org.opencontainers.image.revision="091f486ab05863258cf2f3fa18ea0c59097dee80" \
org.opencontainers.image.revision="d4d06bdf0d1d5dcb4532f00d2cbaa83fc61bb877" \
org.opencontainers.image.source="https://github.com/elastic/kibana" \
org.opencontainers.image.title="Kibana" \
org.opencontainers.image.url="https://www.elastic.co/products/kibana" \
org.opencontainers.image.vendor="Elastic" \
org.opencontainers.image.version="8.13.1"
org.opencontainers.image.version="8.13.2"


ENTRYPOINT ["/bin/tini", "--"]
Expand Down
16 changes: 9 additions & 7 deletions logstash/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ RUN groupadd --gid 1000 logstash && \
adduser --uid 1000 --gid 1000 --home /usr/share/logstash --no-create-home logstash

# Add Logstash itself.
RUN curl -Lo - https://artifacts.elastic.co/downloads/logstash/logstash-8.13.1-linux-$(arch).tar.gz | \
RUN curl -Lo - https://artifacts.elastic.co/downloads/logstash/logstash-8.13.2-linux-$(arch).tar.gz | \
tar zxf - -C /usr/share && \
mv /usr/share/logstash-8.13.1 /usr/share/logstash && \
mv /usr/share/logstash-8.13.2 /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 All @@ -50,9 +50,11 @@ COPY config/log4j2.file.properties config/
COPY pipeline/default.conf pipeline/logstash.conf
COPY env2yaml/env2yaml-amd64 env2yaml/
COPY env2yaml/env2yaml-arm64 env2yaml/

RUN chown --recursive logstash:root config/ pipeline/
# Ensure Logstash gets the correct locale by default.
ENV LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8

# Copy over the appropriate env2yaml artifact
RUN env2yamlarch="$(arch)"; \
case "${env2yamlarch}" in \
Expand All @@ -62,7 +64,7 @@ RUN env2yamlarch="$(arch)"; \
'aarch64') \
env2yamlarch=arm64; \
;; \
*) echo >&2 "error: unsupported architecture '${env2yamlarch}'"; exit 1 ;; \
*) echo >&2 "error: unsupported architecture '$env2yamlarch'"; exit 1 ;; \
esac; \
cp env2yaml/env2yaml-${env2yamlarch} /usr/local/bin/env2yaml; \
rm -rf env2yaml
Expand All @@ -81,14 +83,14 @@ LABEL org.label-schema.schema-version="1.0" \
org.opencontainers.image.vendor="Elastic" \
org.label-schema.name="logstash" \
org.opencontainers.image.title="logstash" \
org.label-schema.version="8.13.1" \
org.opencontainers.image.version="8.13.1" \
org.label-schema.version="8.13.2" \
org.opencontainers.image.version="8.13.2" \
org.label-schema.url="https://www.elastic.co/products/logstash" \
org.label-schema.vcs-url="https://github.com/elastic/logstash" \
org.label-schema.license="Elastic License" \
org.opencontainers.image.licenses="Elastic License" \
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.'" \
org.label-schema.build-date=2024-04-03T10:39:38-04:00 \
org.opencontainers.image.created=2024-04-03T10:39:38-04:00
org.label-schema.build-date=2024-04-05T16:26:47+00:00 \
org.opencontainers.image.created=2024-04-05T16:26:47+00:00

ENTRYPOINT ["/usr/local/bin/docker-entrypoint"]
Binary file modified logstash/env2yaml/env2yaml-amd64
Binary file not shown.
Binary file modified logstash/env2yaml/env2yaml-arm64
Binary file not shown.

0 comments on commit 66eb45c

Please sign in to comment.