mirror of
https://github.com/telekom-security/tpotce.git
synced 2026-03-03 14:43:04 +00:00
Compare commits
3 commits
f6398f9cbb
...
9fcc4cc1ad
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9fcc4cc1ad | ||
|
|
b221a9d96e | ||
|
|
653bb2ed1e |
5 changed files with 14 additions and 7 deletions
|
|
@ -15,8 +15,8 @@ RUN apt-get update -y && \
|
|||
#
|
||||
# Determine arch, get and install packages
|
||||
ARCH=$(arch) && \
|
||||
if [ "$ARCH" = "x86_64" ]; then ES_ARCH="amd64"; fi && \
|
||||
if [ "$ARCH" = "aarch64" ]; then ES_ARCH="arm64"; fi && \
|
||||
if [ "$ARCH" = "x86_64" ]; then ES_ARCH="amd64"; export _JAVA_OPTIONS=""; fi && \
|
||||
if [ "$ARCH" = "aarch64" ]; then ES_ARCH="arm64"; export _JAVA_OPTIONS="-XX:UseSVE=0"; fi && \
|
||||
echo "$ARCH" && \
|
||||
cd /root/dist/ && \
|
||||
mkdir -p /usr/share/elasticsearch/config \
|
||||
|
|
@ -47,4 +47,7 @@ HEALTHCHECK --retries=10 CMD curl -s -XGET 'http://127.0.0.1:9200/_cat/health'
|
|||
#
|
||||
# Start ELK
|
||||
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
|
||||
|
|
|
|||
|
|
@ -22,6 +22,6 @@ services:
|
|||
mem_limit: 2g
|
||||
ports:
|
||||
- "127.0.0.1:64298:9200"
|
||||
image: "dtagdevsec/elasticsearch:24.04"
|
||||
image: "ghcr.io/telekom-security/elasticsearch:24.04.1"
|
||||
volumes:
|
||||
- $HOME/tpotce/data:/data
|
||||
|
|
|
|||
|
|
@ -17,8 +17,8 @@ RUN apt-get update -y && \
|
|||
#
|
||||
# Determine arch, get and install packages
|
||||
ARCH=$(arch) && \
|
||||
if [ "$ARCH" = "x86_64" ]; then LS_ARCH="amd64"; fi && \
|
||||
if [ "$ARCH" = "aarch64" ]; then LS_ARCH="arm64"; fi && \
|
||||
if [ "$ARCH" = "x86_64" ]; then LS_ARCH="amd64"; export _JAVA_OPTIONS=""; fi && \
|
||||
if [ "$ARCH" = "aarch64" ]; then LS_ARCH="arm64"; export _JAVA_OPTIONS="-XX:UseSVE=0"; fi && \
|
||||
echo "$ARCH" && \
|
||||
mkdir -p /etc/listbot && \
|
||||
cd /etc/listbot && \
|
||||
|
|
|
|||
4
docker/elk/logstash/dist/entrypoint.sh
vendored
4
docker/elk/logstash/dist/entrypoint.sh
vendored
|
|
@ -101,4 +101,8 @@ if [ "$TPOT_TYPE" != "SENSOR" ];
|
|||
fi
|
||||
echo
|
||||
|
||||
ARCH=$(arch)
|
||||
if [ "$ARCH" = "aarch64" ]; then
|
||||
export _JAVA_OPTIONS="-XX:UseSVE=0";
|
||||
fi
|
||||
exec /usr/share/logstash/bin/logstash --config.reload.automatic
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ services:
|
|||
# condition: service_healthy
|
||||
ports:
|
||||
- "127.0.0.1:64305:64305"
|
||||
image: "dtagdevsec/logstash:24.04"
|
||||
image: "ghcr.io/telekom-security/logstash:24.04.1"
|
||||
volumes:
|
||||
- $HOME/tpotce/data:/data
|
||||
# - /$HOME/tpotce/docker/elk/logstash/dist/logstash.conf:/etc/logstash/conf.d/logstash.conf
|
||||
|
|
|
|||
Loading…
Reference in a new issue