bump elastic stack to 7.15.0

no image upgrade before 7.15.1
This commit is contained in:
t3chn0m4g3 2021-09-30 20:40:42 +00:00
parent 261b380db7
commit eefd38a335
7 changed files with 11 additions and 20 deletions

View file

@ -24,7 +24,7 @@ services:
# mem_limit: 4g
ports:
- "127.0.0.1:64298:9200"
image: "ghcr.io/telekom-security/elasticsearch:2006"
image: "dtagdevsec/elasticsearch:2006"
volumes:
- /data:/data
@ -39,7 +39,7 @@ services:
condition: service_healthy
ports:
- "127.0.0.1:64296:5601"
image: "ghcr.io/telekom-security/kibana:2006"
image: "dtagdevsec/kibana:2006"
## Logstash service
logstash:
@ -53,7 +53,7 @@ services:
condition: service_healthy
env_file:
- /opt/tpot/etc/compose/elk_environment
image: "ghcr.io/telekom-security/logstash:2006"
image: "dtagdevsec/logstash:2006"
volumes:
- /data:/data
# - /root/tpotce/docker/elk/logstash/dist/logstash.conf:/etc/logstash/conf.d/logstash.conf
@ -68,5 +68,5 @@ services:
condition: service_healthy
ports:
- "127.0.0.1:64302:9100"
image: "ghcr.io/telekom-security/head:2006"
image: "dtagdevsec/head:2006"
read_only: true

View file

@ -1,7 +1,7 @@
FROM alpine:3.14
#
# VARS
ENV ES_VER=7.14.1 \
ENV ES_VER=7.15.0 \
ES_JAVA_HOME=/usr/lib/jvm/java-16-openjdk
# Include dist

View file

@ -24,6 +24,6 @@ services:
mem_limit: 2g
ports:
- "127.0.0.1:64298:9200"
image: "ghcr.io/telekom-security/elasticsearch:2006"
image: "dtagdevsec/elasticsearch:2006"
volumes:
- /data:/data

View file

@ -1,13 +1,12 @@
FROM node:14.17.5-alpine3.14
FROM node:14.17.6-alpine3.14
#
# VARS
ENV KB_VER=7.14.1
ENV KB_VER=7.15.0
#
# Include dist
ADD dist/ /root/dist/
#
# Setup env and apt
#RUN sed -i 's/dl-cdn/dl-2/g' /etc/apk/repositories && \
RUN apk -U --no-cache add \
aria2 \
curl \
@ -25,11 +24,6 @@ RUN apk -U --no-cache add \
#
# Add and move files
cd /root/dist/ && \
# cp kibana.svg /usr/share/kibana/src/ui/public/images/kibana.svg && \
# cp kibana.svg /usr/share/kibana/src/ui/public/icons/kibana.svg && \
# cp elk.ico /usr/share/kibana/src/ui/public/assets/favicons/favicon.ico && \
# cp elk.ico /usr/share/kibana/src/ui/public/assets/favicons/favicon-16x16.png && \
# cp elk.ico /usr/share/kibana/src/ui/public/assets/favicons/favicon-32x32.png && \
#
# Setup user, groups and configs
sed -i 's/#server.basePath: ""/server.basePath: "\/kibana"/' /usr/share/kibana/config/kibana.yml && \
@ -37,9 +31,6 @@ RUN apk -U --no-cache add \
sed -i 's/#server.host: "localhost"/server.host: "0.0.0.0"/' /usr/share/kibana/config/kibana.yml && \
sed -i 's/#elasticsearch.hosts: \["http:\/\/localhost:9200"\]/elasticsearch.hosts: \["http:\/\/elasticsearch:9200"\]/' /usr/share/kibana/config/kibana.yml && \
sed -i 's/#server.rewriteBasePath: false/server.rewriteBasePath: false/' /usr/share/kibana/config/kibana.yml && \
# sed -i "s/#005571/#e20074/g" /usr/share/kibana/built_assets/css/plugins/kibana/index.css && \
# sed -i "s/#007ba4/#9e0051/g" /usr/share/kibana/built_assets/css/plugins/kibana/index.css && \
# sed -i "s/#00465d/#4f0028/g" /usr/share/kibana/built_assets/css/plugins/kibana/index.css && \
echo "xpack.infra.enabled: false" >> /usr/share/kibana/config/kibana.yml && \
echo "xpack.logstash.enabled: false" >> /usr/share/kibana/config/kibana.yml && \
echo "xpack.canvas.enabled: false" >> /usr/share/kibana/config/kibana.yml && \

View file

@ -12,4 +12,4 @@ services:
# condition: service_healthy
ports:
- "127.0.0.1:64296:5601"
image: "ghcr.io/telekom-security/kibana:2006"
image: "dtagdevsec/kibana:2006"

View file

@ -1,7 +1,7 @@
FROM alpine:3.14
#
# VARS
ENV LS_VER=7.14.1
ENV LS_VER=7.15.0
# Include dist
ADD dist/ /root/dist/
#

View file

@ -14,7 +14,7 @@ services:
# condition: service_healthy
env_file:
- /opt/tpot/etc/compose/elk_environment
image: "ghcr.io/telekom-security/logstash:2006"
image: "dtagdevsec/logstash:2006"
volumes:
- /data:/data
# - /root/tpotce/docker/elk/logstash/dist/logstash.conf:/etc/logstash/conf.d/logstash.conf