continue pin / prep images ghcr

This commit is contained in:
listbot
2020-09-04 12:37:28 +00:00
parent 1ac79d6be7
commit 47dca8b835
48 changed files with 91 additions and 64 deletions

View File

@ -24,7 +24,7 @@ services:
mem_limit: 4g
ports:
- "127.0.0.1:64298:9200"
image: "dtagdevsec/elasticsearch:2006"
image: "ghcr.io/telekom-security/elasticsearch:2006"
volumes:
- /data:/data
@ -39,7 +39,7 @@ services:
condition: service_healthy
ports:
- "127.0.0.1:64296:5601"
image: "dtagdevsec/kibana:2006"
image: "ghcr.io/telekom-security/kibana:2006"
## Logstash service
logstash:
@ -53,7 +53,7 @@ services:
condition: service_healthy
env_file:
- /opt/tpot/etc/compose/elk_environment
image: "dtagdevsec/logstash:2006"
image: "ghcr.io/telekom-security/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: "dtagdevsec/head:2006"
image: "ghcr.io/telekom-security/head:2006"
read_only: true

View File

@ -1,7 +1,7 @@
FROM alpine:3.12
#
# VARS
ENV ES_VER=7.9.0 \
ENV ES_VER=7.9.1 \
JAVA_HOME=/usr/lib/jvm/java-11-openjdk
# Include dist
ADD dist/ /root/dist/

View File

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

View File

@ -10,7 +10,8 @@ RUN apk -U add \
# Get and install packages
mkdir -p /usr/src/app/ && \
cd /usr/src/app/ && \
git clone --depth=1 https://github.com/mobz/elasticsearch-head . && \
git clone https://github.com/mobz/elasticsearch-head . && \
git checkout d0a25608854479f0b3f2dca24e8039a2fd66b0e2 && \
npm install http-server && \
sed -i "s#\"http\:\/\/localhost\:9200\"#window.location.protocol \+ \'\/\/\' \+ window.location.hostname \+ \'\:\' \+ window.location.port \+ \'\/es\/\'#" /usr/src/app/_site/app.js && \
#

View File

@ -12,5 +12,5 @@ services:
# condition: service_healthy
ports:
- "127.0.0.1:64302:9100"
image: "dtagdevsec/head:2006"
image: "ghcr.io/telekom-security/head:2006"
read_only: true

View File

@ -1,7 +1,7 @@
FROM node:10.21.0-alpine
FROM node:10.22.0-alpine
#
# VARS
ENV KB_VER=7.9.0
ENV KB_VER=7.9.1
#
# Include dist
ADD dist/ /root/dist/

View File

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

View File

@ -1,7 +1,7 @@
FROM alpine:3.12
#
# VARS
ENV LS_VER=7.9.0
ENV LS_VER=7.9.1
# 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: "dtagdevsec/logstash:2006"
image: "ghcr.io/telekom-security/logstash:2006"
volumes:
- /data:/data
# - /root/tpotce/docker/elk/logstash/dist/logstash.conf:/etc/logstash/conf.d/logstash.conf