Skip to content

Commit

Permalink
Contexts for 7.17.23
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 Jul 30, 2024
1 parent 1f54f19 commit 9ae9896
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 40 deletions.
14 changes: 7 additions & 7 deletions elasticsearch/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,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-7.17.22-linux-$(arch).tar.gz
RUN curl --retry 10 -S -L --output /tmp/elasticsearch.tar.gz https://artifacts-no-kpi.elastic.co/downloads/elasticsearch/elasticsearch-7.17.23-linux-$(arch).tar.gz

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

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

EXPOSE 9200 9300

LABEL org.label-schema.build-date="2024-06-06T07:35:17.876121680Z" \
LABEL org.label-schema.build-date="2024-07-25T14:37:42.448799567Z" \
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="38e9ca2e81304a821c50862dafab089ca863944b" \
org.label-schema.vcs-ref="61d76462eecaf09ada684d1b5d319b5ff6865a83" \
org.label-schema.vcs-url="https://github.com/elastic/elasticsearch" \
org.label-schema.vendor="Elastic" \
org.label-schema.version="7.17.22" \
org.opencontainers.image.created="2024-06-06T07:35:17.876121680Z" \
org.label-schema.version="7.17.23" \
org.opencontainers.image.created="2024-07-25T14:37:42.448799567Z" \
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="38e9ca2e81304a821c50862dafab089ca863944b" \
org.opencontainers.image.revision="61d76462eecaf09ada684d1b5d319b5ff6865a83" \
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="7.17.22"
org.opencontainers.image.version="7.17.23"

# 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-7.17.22-linux-$(arch).tar.gz && \
https://artifacts.elastic.co/downloads/kibana/kibana-7.17.23-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-06-05T11:07:35.640Z" \
LABEL org.label-schema.build-date="2024-07-25T11:08:38.582Z" \
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="43696930d77d3bb567e445624874eab9cf363872" \
org.label-schema.vcs-ref="89cafc519e1d6e0e08d8cf5c13eee6886fe6e412" \
org.label-schema.vcs-url="https://github.com/elastic/kibana" \
org.label-schema.vendor="Elastic" \
org.label-schema.version="7.17.22" \
org.opencontainers.image.created="2024-06-05T11:07:35.640Z" \
org.label-schema.version="7.17.23" \
org.opencontainers.image.created="2024-07-25T11:08:38.582Z" \
org.opencontainers.image.documentation="https://www.elastic.co/guide/en/kibana/reference/index.html" \
org.opencontainers.image.licenses="Elastic License" \
org.opencontainers.image.revision="43696930d77d3bb567e445624874eab9cf363872" \
org.opencontainers.image.revision="89cafc519e1d6e0e08d8cf5c13eee6886fe6e412" \
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="7.17.22"
org.opencontainers.image.version="7.17.23"


ENTRYPOINT ["/bin/tini", "--"]
Expand Down
57 changes: 31 additions & 26 deletions logstash/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,34 +1,35 @@
# This Dockerfile was generated from templates/Dockerfile.j2
# This Dockerfile was generated from templates/Dockerfile.erb
FROM ubuntu:20.04

RUN for iter in {1..10}; do \
export DEBIAN_FRONTEND=noninteractive && \
apt-get update -y && \
apt-get upgrade -y && \
apt-get install -y procps findutils tar gzip curl && \
apt-get install -y locales && \
apt-get clean all && \
locale-gen 'en_US.UTF-8' && \
export DEBIAN_FRONTEND=noninteractive && \
apt-get update -y && \
apt-get upgrade -y && \
apt-get install -y procps findutils tar gzip curl && \
apt-get install -y locales && \
apt-get clean all && \
locale-gen 'en_US.UTF-8' && \
apt-get clean metadata && \
exit_code=0 && break || exit_code=$? && \
exit_code=0 && break || exit_code=$? && \
echo "packaging error: retry $iter in 10s" && \
apt-get clean all && \
apt-get clean metadata && \
sleep 10; done; \
apt-get clean metadata && \
sleep 10; done; \
(exit $exit_code)

# Provide a non-root user to run the process.
RUN groupadd --gid 1000 logstash && \
adduser --uid 1000 --gid 1000 \
--home /usr/share/logstash --no-create-home \
logstash
--home /usr/share/logstash --no-create-home \
logstash


# Add Logstash itself.
RUN \
curl -Lo - https://artifacts.elastic.co/downloads/logstash/logstash-7.17.22-linux-$(arch).tar.gz | \
curl -Lo - https://artifacts.elastic.co/downloads/logstash/logstash-7.17.23-linux-$(arch).tar.gz | \
tar zxf - -C /usr/share && \
mv /usr/share/logstash-7.17.22 /usr/share/logstash && \
chown --recursive logstash:logstash /usr/share/logstash/ && \
mv /usr/share/logstash-7.17.23 /usr/share/logstash && \
chown --recursive logstash:logstash /usr/share/logstash/ && \
chown -R logstash:root /usr/share/logstash && \
chmod -R g=u /usr/share/logstash && \
mkdir /licenses/ && \
Expand All @@ -37,22 +38,24 @@ chown --recursive logstash:logstash /usr/share/logstash/ && \
find /usr/share/logstash -type d -exec chmod g+s {} \; && \
ln -s /usr/share/logstash /opt/logstash


WORKDIR /usr/share/logstash
ENV ELASTIC_CONTAINER true
ENV PATH=/usr/share/logstash/bin:$PATH

# Provide a minimal configuration, so that simple invocations will provide
# a good experience.
ADD config/pipelines.yml config/pipelines.yml
ADD config/logstash-full.yml config/logstash.yml
ADD config/log4j2.properties config/
ADD pipeline/default.conf pipeline/logstash.conf
COPY config/pipelines.yml config/pipelines.yml
COPY config/logstash-full.yml config/logstash.yml
COPY config/log4j2.properties config/
COPY pipeline/default.conf pipeline/logstash.conf
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
ADD env2yaml/env2yaml /usr/local/bin/
COPY env2yaml/env2yaml /usr/local/bin/
# Place the startup wrapper script.
ADD bin/docker-entrypoint /usr/local/bin/
COPY bin/docker-entrypoint /usr/local/bin/

RUN chmod 0755 /usr/local/bin/docker-entrypoint

USER 1000
Expand All @@ -64,13 +67,15 @@ 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="7.17.22" \
org.opencontainers.image.version="7.17.22" \
org.label-schema.version="7.17.23" \
org.opencontainers.image.version="7.17.23" \
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-05-02T09:01:17+00:00 \
org.opencontainers.image.created=2024-05-02T09:01:17+00:00
org.label-schema.build-date=2024-07-23T07:27:01+00:00 \
org.opencontainers.image.created=2024-07-23T07:27:01+00:00


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

0 comments on commit 9ae9896

Please sign in to comment.