mirror of
https://github.com/telekom-security/tpotce.git
synced 2025-07-01 20:42:11 +00:00
provide fix for #669
This commit is contained in:
parent
9b7f100f74
commit
6d29f504df
11 changed files with 20 additions and 4 deletions
|
@ -33,6 +33,7 @@ RUN sed -i 's/dl-cdn/dl-2/g' /etc/apk/repositories && \
|
||||||
cd /home/cowrie && \
|
cd /home/cowrie && \
|
||||||
git clone --depth=1 https://github.com/micheloosterhof/cowrie -b v2.1.0 && \
|
git clone --depth=1 https://github.com/micheloosterhof/cowrie -b v2.1.0 && \
|
||||||
cd cowrie && \
|
cd cowrie && \
|
||||||
|
sed -i s/logfile.DailyLogFile/logfile.LogFile/g src/cowrie/output/jsonlog.py && \
|
||||||
mkdir -p log && \
|
mkdir -p log && \
|
||||||
cp /root/dist/requirements.txt . && \
|
cp /root/dist/requirements.txt . && \
|
||||||
pip3 install -r requirements.txt && \
|
pip3 install -r requirements.txt && \
|
||||||
|
|
|
@ -46,6 +46,8 @@ services:
|
||||||
build: logstash/.
|
build: logstash/.
|
||||||
container_name: logstash
|
container_name: logstash
|
||||||
restart: always
|
restart: always
|
||||||
|
environment:
|
||||||
|
- LS_JAVA_OPTS=-Xms2048m -Xmx2048m
|
||||||
depends_on:
|
depends_on:
|
||||||
elasticsearch:
|
elasticsearch:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM alpine
|
FROM alpine:3.12
|
||||||
#
|
#
|
||||||
# VARS
|
# VARS
|
||||||
ENV ES_VER=7.8.0 \
|
ENV ES_VER=7.8.0 \
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM alpine:latest
|
FROM alpine:3.12
|
||||||
#
|
#
|
||||||
# Setup env and apt
|
# Setup env and apt
|
||||||
RUN apk -U add \
|
RUN apk -U add \
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM alpine
|
FROM alpine:3.12
|
||||||
#
|
#
|
||||||
# VARS
|
# VARS
|
||||||
ENV LS_VER=7.8.0
|
ENV LS_VER=7.8.0
|
||||||
|
@ -56,4 +56,5 @@ HEALTHCHECK --retries=10 CMD curl -s -XGET 'http://127.0.0.1:9600'
|
||||||
#
|
#
|
||||||
# Start logstash
|
# Start logstash
|
||||||
#USER logstash:logstash
|
#USER logstash:logstash
|
||||||
|
#CMD update.sh && exec /usr/share/logstash/bin/logstash -f /etc/logstash/conf.d/logstash.conf --config.reload.automatic --java-execution --log.level debug
|
||||||
CMD update.sh && exec /usr/share/logstash/bin/logstash -f /etc/logstash/conf.d/logstash.conf --config.reload.automatic --java-execution
|
CMD update.sh && exec /usr/share/logstash/bin/logstash -f /etc/logstash/conf.d/logstash.conf --config.reload.automatic --java-execution
|
||||||
|
|
|
@ -7,6 +7,8 @@ services:
|
||||||
build: .
|
build: .
|
||||||
container_name: logstash
|
container_name: logstash
|
||||||
restart: always
|
restart: always
|
||||||
|
environment:
|
||||||
|
- LS_JAVA_OPTS=-Xms2048m -Xmx2048m
|
||||||
# depends_on:
|
# depends_on:
|
||||||
# elasticsearch:
|
# elasticsearch:
|
||||||
# condition: service_healthy
|
# condition: service_healthy
|
||||||
|
@ -15,4 +17,4 @@ services:
|
||||||
image: "dtagdevsec/logstash:2006"
|
image: "dtagdevsec/logstash:2006"
|
||||||
volumes:
|
volumes:
|
||||||
- /data:/data
|
- /data:/data
|
||||||
- /root/tpotce/docker/elk/logstash/dist/logstash.conf:/etc/logstash/conf.d/logstash.conf
|
# - /root/tpotce/docker/elk/logstash/dist/logstash.conf:/etc/logstash/conf.d/logstash.conf
|
||||||
|
|
|
@ -159,6 +159,8 @@ services:
|
||||||
logstash:
|
logstash:
|
||||||
container_name: logstash
|
container_name: logstash
|
||||||
restart: always
|
restart: always
|
||||||
|
environment:
|
||||||
|
- LS_JAVA_OPTS=-Xms2048m -Xmx2048m
|
||||||
depends_on:
|
depends_on:
|
||||||
elasticsearch:
|
elasticsearch:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
|
|
|
@ -366,6 +366,8 @@ services:
|
||||||
logstash:
|
logstash:
|
||||||
container_name: logstash
|
container_name: logstash
|
||||||
restart: always
|
restart: always
|
||||||
|
environment:
|
||||||
|
- LS_JAVA_OPTS=-Xms2048m -Xmx2048m
|
||||||
depends_on:
|
depends_on:
|
||||||
elasticsearch:
|
elasticsearch:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
|
|
|
@ -144,6 +144,8 @@ services:
|
||||||
logstash:
|
logstash:
|
||||||
container_name: logstash
|
container_name: logstash
|
||||||
restart: always
|
restart: always
|
||||||
|
environment:
|
||||||
|
- LS_JAVA_OPTS=-Xms2048m -Xmx2048m
|
||||||
depends_on:
|
depends_on:
|
||||||
elasticsearch:
|
elasticsearch:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
|
|
|
@ -564,6 +564,8 @@ services:
|
||||||
logstash:
|
logstash:
|
||||||
container_name: logstash
|
container_name: logstash
|
||||||
restart: always
|
restart: always
|
||||||
|
environment:
|
||||||
|
- LS_JAVA_OPTS=-Xms2048m -Xmx2048m
|
||||||
depends_on:
|
depends_on:
|
||||||
elasticsearch:
|
elasticsearch:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
|
|
|
@ -542,6 +542,8 @@ services:
|
||||||
logstash:
|
logstash:
|
||||||
container_name: logstash
|
container_name: logstash
|
||||||
restart: always
|
restart: always
|
||||||
|
environment:
|
||||||
|
- LS_JAVA_OPTS=-Xms2048m -Xmx2048m
|
||||||
depends_on:
|
depends_on:
|
||||||
elasticsearch:
|
elasticsearch:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
|
|
Loading…
Reference in a new issue