Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions elasticsearch/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ RUN set -eux; \
chmod 0555 /bin/tini

WORKDIR /usr/share/elasticsearch
RUN arch="$(rpm --query --queryformat='%{ARCH}' rpm)" && curl -f --retry 10 -S -L --output /tmp/elasticsearch.tar.gz https://artifacts-no-kpi.elastic.co/downloads/elasticsearch/elasticsearch-9.1.8-linux-$arch.tar.gz
RUN arch="$(rpm --query --queryformat='%{ARCH}' rpm)" && curl -f --retry 10 -S -L --output /tmp/elasticsearch.tar.gz https://artifacts-no-kpi.elastic.co/downloads/elasticsearch/elasticsearch-9.1.9-linux-$arch.tar.gz
RUN tar -zxf /tmp/elasticsearch.tar.gz --strip-components=1 && \
# Configure the distribution for Docker
sed -i -e 's/ES_DISTRIBUTION_TYPE=tar/ES_DISTRIBUTION_TYPE=docker/' bin/elasticsearch-env && \
Expand Down Expand Up @@ -99,30 +99,30 @@ RUN chmod g=u /etc/passwd && \

EXPOSE 9200 9300

LABEL org.label-schema.build-date="2025-11-26T22:06:37.615050576Z" \
LABEL org.label-schema.build-date="2025-12-16T22:07:32.093242252Z" \
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="50f58de526b746a6cc07f0cbec0e0d510f13ce52" \
org.label-schema.vcs-ref="5cf7cb8c6f69b8c284f3ea738db6932703574d3d" \
org.label-schema.vcs-url="https://github.com/elastic/elasticsearch" \
org.label-schema.vendor="Elastic" \
org.label-schema.version="9.1.8" \
org.opencontainers.image.created="2025-11-26T22:06:37.615050576Z" \
org.label-schema.version="9.1.9" \
org.opencontainers.image.created="2025-12-16T22:07:32.093242252Z" \
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="50f58de526b746a6cc07f0cbec0e0d510f13ce52" \
org.opencontainers.image.revision="5cf7cb8c6f69b8c284f3ea738db6932703574d3d" \
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="9.1.8"
org.opencontainers.image.version="9.1.9"

LABEL name="Elasticsearch" \
maintainer="[email protected]" \
vendor="Elastic" \
version="9.1.8" \
version="9.1.9" \
release="1" \
summary="Elasticsearch" \
description="You know, for search."
Expand Down
16 changes: 8 additions & 8 deletions kibana/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ RUN cd /tmp && \
arch="$(rpm --query --queryformat='%{ARCH}' rpm)" && \
curl -f --retry 8 -s -L \
--output kibana.tar.gz \
https://artifacts.elastic.co/downloads/kibana/kibana-9.1.8-linux-${arch}.tar.gz && \
https://artifacts.elastic.co/downloads/kibana/kibana-9.1.9-linux-${arch}.tar.gz && \
cd -

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

LABEL org.label-schema.build-date="2025-11-26T17:31:50.353Z" \
LABEL org.label-schema.build-date="2025-12-16T23:08:44.328Z" \
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="6ecd757760927423daa344d901e634b43497e16d" \
org.label-schema.vcs-ref="126c439648663caa7554075ebc3d1e9a6f8ad93c" \
org.label-schema.vcs-url="https://github.com/elastic/kibana" \
org.label-schema.vendor="Elastic" \
org.label-schema.version="9.1.8" \
org.opencontainers.image.created="2025-11-26T17:31:50.353Z" \
org.label-schema.version="9.1.9" \
org.opencontainers.image.created="2025-12-16T23:08:44.328Z" \
org.opencontainers.image.documentation="https://www.elastic.co/guide/en/kibana/reference/index.html" \
org.opencontainers.image.licenses="Elastic License" \
org.opencontainers.image.revision="6ecd757760927423daa344d901e634b43497e16d" \
org.opencontainers.image.revision="126c439648663caa7554075ebc3d1e9a6f8ad93c" \
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="9.1.8"
org.opencontainers.image.version="9.1.9"

LABEL name="Kibana" \
maintainer="[email protected]" \
vendor="Elastic" \
version="9.1.8" \
version="9.1.9" \
release="1" \
summary="Kibana" \
description="Your window into the Elastic Stack."
Expand Down
30 changes: 11 additions & 19 deletions logstash/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,17 +1,6 @@
# This Dockerfile was generated from templates/Dockerfile.erb


# Build env2yaml
FROM golang:1.25 AS builder-env2yaml

COPY env2yaml/env2yaml.go env2yaml/go.mod env2yaml/go.sum /tmp/go/src/env2yaml/

WORKDIR /tmp/go/src/env2yaml

RUN go build -trimpath

# Build main image
# Minimal distributions do not ship with en language packs.

FROM redhat/ubi9-minimal:latest

ENV ELASTIC_CONTAINER=true
Expand All @@ -35,10 +24,10 @@ RUN groupadd --gid 1000 logstash && \
--no-create-home \
logstash && \
arch="$(rpm --query --queryformat='%{ARCH}' rpm)" && \
curl -f -Lo logstash.tar.gz https://artifacts.elastic.co/downloads/logstash/logstash-9.1.8-linux-${arch}.tar.gz && \
curl -f -Lo logstash.tar.gz https://artifacts.elastic.co/downloads/logstash/logstash-9.1.9-linux-${arch}.tar.gz && \
tar -zxf logstash.tar.gz -C /usr/share && \
rm logstash.tar.gz && \
mv /usr/share/logstash-9.1.8 /usr/share/logstash && \
mv /usr/share/logstash-9.1.9 /usr/share/logstash && \
chown -R logstash:root /usr/share/logstash && \
chmod -R g=u /usr/share/logstash && \
mkdir /licenses && \
Expand All @@ -47,7 +36,10 @@ RUN groupadd --gid 1000 logstash && \
find /usr/share/logstash -type d -exec chmod g+s {} \; && \
ln -s /usr/share/logstash /opt/logstash

COPY --from=builder-env2yaml /tmp/go/src/env2yaml/env2yaml /usr/local/bin/env2yaml

COPY --chown=logstash:root env2yaml/classes /usr/share/logstash/env2yaml/classes/
COPY --chown=logstash:root env2yaml/lib /usr/share/logstash/env2yaml/lib/
COPY --chmod=0755 env2yaml/env2yaml /usr/local/bin/env2yaml
COPY --chown=logstash:root config/pipelines.yml config/log4j2.properties config/log4j2.file.properties /usr/share/logstash/config/
COPY --chown=logstash:root config/logstash-full.yml /usr/share/logstash/config/logstash.yml
COPY --chown=logstash:root pipeline/default.conf /usr/share/logstash/pipeline/logstash.conf
Expand All @@ -59,20 +51,20 @@ USER 1000

EXPOSE 9600 5044

LABEL org.label-schema.build-date=2025-11-25T19:41:48+00:00 \
LABEL org.label-schema.build-date=2025-12-10T14:14:26+00:00 \
org.label-schema.license="Elastic License" \
org.label-schema.name="logstash" \
org.label-schema.schema-version="1.0" \
org.label-schema.url="https://www.elastic.co/products/logstash" \
org.label-schema.vcs-url="https://github.com/elastic/logstash" \
org.label-schema.vendor="Elastic" \
org.label-schema.version="9.1.8" \
org.opencontainers.image.created=2025-11-25T19:41:48+00:00 \
org.label-schema.version="9.1.9" \
org.opencontainers.image.created=2025-12-10T14:14:26+00:00 \
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.opencontainers.image.licenses="Elastic License" \
org.opencontainers.image.title="logstash" \
org.opencontainers.image.vendor="Elastic" \
org.opencontainers.image.version="9.1.8" \
org.opencontainers.image.version="9.1.9" \
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.'" \
license="Elastic License" \
maintainer="[email protected]" \
Expand Down
Binary file not shown.
Binary file not shown.
12 changes: 12 additions & 0 deletions logstash/env2yaml/env2yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#!/bin/bash

# Execute the env2yaml java program. Ensure the snakeyaml-engine jar is in the classpath.

exec /usr/share/logstash/jdk/bin/java \
-XX:+UseSerialGC \
-Xms32m \
-Xmx32m \
-cp "/usr/share/logstash/env2yaml/classes:/usr/share/logstash/env2yaml/lib/*" \
org.logstash.env2yaml.Env2Yaml "$@"


198 changes: 0 additions & 198 deletions logstash/env2yaml/env2yaml.go

This file was deleted.

5 changes: 0 additions & 5 deletions logstash/env2yaml/go.mod

This file was deleted.

3 changes: 0 additions & 3 deletions logstash/env2yaml/go.sum

This file was deleted.

Binary file added logstash/env2yaml/lib/snakeyaml-engine-2.9.jar
Binary file not shown.