Moved GRAYLOG_PLUGIN_DIR env var to Dockerfile

Added log limits to the docker-compose services - 500Mb each
This commit is contained in:
MatthewJSalerno
2019-11-23 09:05:18 -05:00
parent 4b69fe18db
commit d2ab5fb4e7
3 changed files with 17 additions and 2 deletions

View File

@@ -25,7 +25,10 @@ services:
# Graylog: https://hub.docker.com/r/graylog/graylog/ # Graylog: https://hub.docker.com/r/graylog/graylog/
graylog: graylog:
build: graylog/. build:
context: ./graylog/.
args:
- GRAYLOG_PLUGIN_DIR
volumes: volumes:
- 'graylog_journal:/usr/share/graylog/data/journal' - 'graylog_journal:/usr/share/graylog/data/journal'
- './service-names-port-numbers.csv:/etc/graylog/server/service-names-port-numbers.csv' - './service-names-port-numbers.csv:/etc/graylog/server/service-names-port-numbers.csv'
@@ -70,6 +73,10 @@ services:
- elasticsearch - elasticsearch
depends_on: depends_on:
- elasticsearch - elasticsearch
logging:
driver: "json-file"
options:
max-size: "100M"
influxdb: influxdb:
image: 'influxdb:latest' image: 'influxdb:latest'
@@ -79,6 +86,10 @@ services:
- '8086:8086' - '8086:8086'
volumes: volumes:
- 'influxdb:/var/lib/influxdb' - 'influxdb:/var/lib/influxdb'
logging:
driver: "json-file"
options:
max-size: "100M"
grafana: grafana:
image: 'grafana/grafana:latest' image: 'grafana/grafana:latest'
@@ -95,6 +106,10 @@ services:
depends_on: depends_on:
- elasticsearch - elasticsearch
- influxdb - influxdb
logging:
driver: "json-file"
options:
max-size: "100M"
# Volumes for persisting data, see https://docs.docker.com/engine/admin/volumes/volumes/ # Volumes for persisting data, see https://docs.docker.com/engine/admin/volumes/volumes/
volumes: volumes:

View File

@@ -1,6 +1,7 @@
FROM graylog/graylog:3.1 FROM graylog/graylog:3.1
# Probably a bad idea, but it works for now # Probably a bad idea, but it works for now
USER root USER root
ENV GRAYLOG_PLUGIN_DIR=/etc/graylog/server/
RUN mkdir -pv /etc/graylog/server/ RUN mkdir -pv /etc/graylog/server/
COPY ./getGeo.sh /etc/graylog/server/ COPY ./getGeo.sh /etc/graylog/server/
RUN chmod +x /etc/graylog/server/getGeo.sh && /etc/graylog/server/getGeo.sh RUN chmod +x /etc/graylog/server/getGeo.sh && /etc/graylog/server/getGeo.sh

View File

@@ -1,3 +1,2 @@
GRAYLOG_PLUGIN_DIR=/etc/graylog/server/
curl --output ${GRAYLOG_PLUGIN_DIR}/mm.tar.gz https://geolite.maxmind.com/download/geoip/database/GeoLite2-City.tar.gz curl --output ${GRAYLOG_PLUGIN_DIR}/mm.tar.gz https://geolite.maxmind.com/download/geoip/database/GeoLite2-City.tar.gz
tar zxvf ${GRAYLOG_PLUGIN_DIR}/mm.tar.gz -C ${GRAYLOG_PLUGIN_DIR} --strip-components=1 tar zxvf ${GRAYLOG_PLUGIN_DIR}/mm.tar.gz -C ${GRAYLOG_PLUGIN_DIR} --strip-components=1