Skip to content

Fix 9.0.2 contexts #277

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jun 5, 2025
Merged

Fix 9.0.2 contexts #277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6bee757
[9.0.2] Update Kibana
jbudz Jun 3, 2025
370a353
[9.0.2] Update Elasticsearch
jbudz Jun 3, 2025
b446c3f
[9.0.2] Update Logstash
jbudz Jun 3, 2025
745b4ce
Update elasticsearch/Dockerfile
jbudz Jun 4, 2025
0c4ddf1
Update elasticsearch/Dockerfile
jbudz Jun 4, 2025
feaa581
Update logstash/Dockerfile
jbudz Jun 4, 2025
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
5 changes: 2 additions & 3 deletions elasticsearch/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ RUN microdnf install -y findutils tar gzip
# build. Instead, we check the binary against the published checksum.
RUN set -eux ; \
tini_bin="" ; \
arch="$(rpm --query --queryformat='%{ARCH}' rpm)"; case "$(arch)" in \
arch="$(rpm --query --queryformat='%{ARCH}' rpm)"; case "$arch" in \
aarch64) tini_bin='tini-arm64' ;; \
x86_64) tini_bin='tini-amd64' ;; \
*) echo >&2 ; echo >&2 "Unsupported architecture $arch" ; echo >&2 ; exit 1 ;; \
Expand All @@ -30,7 +30,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.0.2-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.0.2-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 @@ -95,7 +95,6 @@ ENV SHELL=/bin/bash
COPY --chmod=0555 bin/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh

RUN chmod g=u /etc/passwd && \
chmod 0555 /usr/local/bin/docker-entrypoint.sh && \
find / -xdev -perm -4000 -exec chmod ug-s {} + && \
chmod 0775 /usr/share/elasticsearch && \
chown elasticsearch bin config config/jvm.options.d data logs plugins
Expand Down
12 changes: 6 additions & 6 deletions kibana/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ FROM redhat/ubi9-minimal:latest AS builder
RUN microdnf install -y findutils tar gzip

RUN cd /tmp && \
arch="$(rpm --query --queryformat='%{ARCH}' rpm)"; \ && \
arch="$(rpm --query --queryformat='%{ARCH}' rpm)" && \
curl -f --retry 8 -s -L \
--output kibana.tar.gz \
https://artifacts.elastic.co/downloads/kibana/kibana-9.0.2-linux-$arch.tar.gz && \
https://artifacts.elastic.co/downloads/kibana/kibana-9.0.2-linux-${arch}.tar.gz && \
cd -

RUN mkdir /usr/share/kibana
Expand All @@ -35,21 +35,21 @@ RUN chmod -R g=u /usr/share/kibana
# Add an init process, check the checksum to make sure it's a match
RUN set -e ; \
TINI_BIN="" ; \
arch="$(rpm --query --queryformat='%{ARCH}' rpm)"; \
arch="$(rpm --query --queryformat='%{ARCH}' rpm)"; \
case "$arch" in \
aarch64) \
TINI_BIN='tini-arm64' ; \
TINI_CHECKSUM='07952557df20bfd2a95f9bef198b445e006171969499a1d361bd9e6f8e5e0e81' ; \
;; \
x86_64) \
TINI_BIN='tini-amd64' ; \
TINI_CHECKSUM='93dcc18adc78c65a028a84799ecf8ad40c936fdfc5f2a57b1acda5a8117fa82c' ; \
;; \
*) echo >&2 "Unsupported architecture $arch" ; exit 1 ;; \
esac ; \
TINI_VERSION='v0.19.0' ; \
curl -f --retry 8 -S -L -O "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/${TINI_BIN}" ; \
curl -f --retry 8 -S -L -O "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/${TINI_BIN}.sha256sum" ; \
sha256sum -c "${TINI_BIN}.sha256sum" ; \
rm "${TINI_BIN}.sha256sum" ; \
echo "${TINI_CHECKSUM} ${TINI_BIN}" | sha256sum -c - ; \
mv "${TINI_BIN}" /bin/tini ; \
chmod +x /bin/tini
RUN mkdir -p /usr/share/fonts/local && \
Expand Down
16 changes: 6 additions & 10 deletions logstash/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,11 @@ ENV LANG=C.UTF-8 LC_ALL=C.UTF-8
WORKDIR /usr/share

# Install packages
RUN for iter in {1..10}; do \
microdnf update -y && \
RUN \
microdnf install -y procps findutils tar gzip && \
microdnf install -y openssl && \
microdnf install -y which shadow-utils && \
microdnf clean all && \
exit_code=0 && break || \
exit_code=$? && echo "packaging error: retry $iter in 10s" && \
microdnf clean all && sleep 10; \
done; \
(exit $exit_code)
microdnf clean all

# Provide a non-root user to run the process
# Add Logstash itself and set permissions
Expand All @@ -39,8 +33,10 @@ RUN groupadd --gid 1000 logstash && \
--home "/usr/share/logstash" \
--no-create-home \
logstash && \
curl -Lo - https://artifacts.elastic.co/downloads/logstash/logstash-9.0.2-linux-x86_64.tar.gz | \
tar zxf - -C /usr/share && \
arch="$(rpm --query --queryformat='%{ARCH}' rpm)" && \
curl -f -Lo logstash.tar.gz "https://artifacts.elastic.co/downloads/logstash/logstash-9.0.2-linux-${arch}.tar.gz" && \
tar -zxf logstash.tar.gz -C /usr/share && \
rm logstash.tar.gz && \
mv /usr/share/logstash-9.0.2 /usr/share/logstash && \
chown -R logstash:root /usr/share/logstash && \
chmod -R g=u /usr/share/logstash && \
Expand Down