Alex-Devera/tpotce
1
0
Fork 0
mirror of https://github.com/telekom-security/tpotce.git synced 2025-05-08 16:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Disable Scalable Vector Engine (XX:UseSVE=0) to fix issues on macOS and other ARM platforms

Browse source 
https://github.com/elastic/elasticsearch/issues/118583
This commit is contained in:
t3chn0m4g3 2025-01-06 15:50:08 +01:00
parent 653bb2ed1e
commit b221a9d96e
3 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
docker/elk/elasticsearch/Dockerfile
View file

@ -1,7 +1,6 @@
FROM ubuntu:24.04 FROM ubuntu:24.04
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive
ENV ES_VER=8.16.1 ENV ES_VER=8.16.1
ENV _JAVA_OPTIONS="-XX:UseSVE=0"
# #
# Include dist # Include dist
COPY dist/ /root/dist/ COPY dist/ /root/dist/
@ -16,8 +15,8 @@ RUN apt-get update -y && \
# #
# Determine arch, get and install packages # Determine arch, get and install packages
ARCH=$(arch) && \ ARCH=$(arch) && \
if [ "$ARCH" = "x86_64" ]; then ES_ARCH="amd64"; fi && \ if [ "$ARCH" = "x86_64" ]; then ES_ARCH="amd64"; export _JAVA_OPTIONS=""; fi && \
if [ "$ARCH" = "aarch64" ]; then ES_ARCH="arm64"; fi && \ if [ "$ARCH" = "aarch64" ]; then ES_ARCH="arm64"; export _JAVA_OPTIONS="-XX:UseSVE=0"; fi && \
echo "$ARCH" && \ echo "$ARCH" && \
cd /root/dist/ && \ cd /root/dist/ && \
mkdir -p /usr/share/elasticsearch/config \ mkdir -p /usr/share/elasticsearch/config \
@ -48,4 +47,7 @@ HEALTHCHECK --retries=10 CMD curl -s -XGET 'http://127.0.0.1:9200/_cat/health'
# #
# Start ELK # Start ELK
USER elasticsearch:elasticsearch USER elasticsearch:elasticsearch
CMD ["/usr/share/elasticsearch/bin/elasticsearch"] #CMD ["/usr/share/elasticsearch/bin/elasticsearch"]
CMD ARCH=$(arch) && \
if [ "$ARCH" = "aarch64" ]; then export _JAVA_OPTIONS="-XX:UseSVE=0"; fi && \
exec /usr/share/elasticsearch/bin/elasticsearch

4
docker/elk/logstash/Dockerfile
View file

@ -18,8 +18,8 @@ RUN apt-get update -y && \
# #
# Determine arch, get and install packages # Determine arch, get and install packages
ARCH=$(arch) && \ ARCH=$(arch) && \
if [ "$ARCH" = "x86_64" ]; then LS_ARCH="amd64"; fi && \ if [ "$ARCH" = "x86_64" ]; then LS_ARCH="amd64"; export _JAVA_OPTIONS=""; fi && \
if [ "$ARCH" = "aarch64" ]; then LS_ARCH="arm64"; fi && \ if [ "$ARCH" = "aarch64" ]; then LS_ARCH="arm64"; export _JAVA_OPTIONS="-XX:UseSVE=0"; fi && \
echo "$ARCH" && \ echo "$ARCH" && \
mkdir -p /etc/listbot && \ mkdir -p /etc/listbot && \
cd /etc/listbot && \ cd /etc/listbot && \

4
docker/elk/logstash/dist/entrypoint.sh vendored
View file

@ -101,4 +101,8 @@ if [ "$TPOT_TYPE" != "SENSOR" ];
fi fi
echo echo
ARCH=$(arch)
if [ "$ARCH" = "aarch64" ]; then
export _JAVA_OPTIONS="-XX:UseSVE=0";
fi
exec /usr/share/logstash/bin/logstash --config.reload.automatic exec /usr/share/logstash/bin/logstash --config.reload.automatic