From da3af8c71504dace36034dc329be1a1d625785bb Mon Sep 17 00:00:00 2001 From: Karol Wypchlo Date: Mon, 12 Jul 2021 13:58:25 +0200 Subject: [PATCH] adjust docker services logging (missing ones) --- docker-compose.accounts.yml | 3 +++ docker-compose.jaeger.yml | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/docker-compose.accounts.yml b/docker-compose.accounts.yml index 2f000764..c7782c0f 100644 --- a/docker-compose.accounts.yml +++ b/docker-compose.accounts.yml @@ -145,6 +145,7 @@ services: volumes: - ./docker/kratos/oathkeeper:/etc/config/oathkeeper restart: on-failure + logging: *default-logging networks: shared: ipv4_address: 10.10.10.83 @@ -154,6 +155,8 @@ services: cockroach: image: cockroachdb/cockroach:v20.2.3 container_name: cockroach + restart: unless-stopped + logging: *default-logging env_file: - .env command: start --advertise-addr=${CR_IP} --join=${CR_CLUSTER_NODES} --certs-dir=/certs --listen-addr=0.0.0.0:26257 --http-addr=0.0.0.0:8080 diff --git a/docker-compose.jaeger.yml b/docker-compose.jaeger.yml index cf4b854c..297d466a 100644 --- a/docker-compose.jaeger.yml +++ b/docker-compose.jaeger.yml @@ -1,5 +1,11 @@ version: "3.7" +x-logging: &default-logging + driver: json-file + options: + max-size: "10m" + max-file: "3" + services: sia: environment: @@ -23,6 +29,7 @@ services: ] container_name: jaeger-agent restart: on-failure + logging: *default-logging expose: - 6831 - 6832 @@ -40,6 +47,7 @@ services: entrypoint: /wait_to_start.sh container_name: jaeger-collector restart: on-failure + logging: *default-logging expose: - 14269 - 14268 @@ -64,6 +72,7 @@ services: entrypoint: /wait_to_start.sh container_name: jaeger-query restart: on-failure + logging: *default-logging ports: - "127.0.0.1:16686:16686" expose: @@ -87,6 +96,7 @@ services: image: docker.elastic.co/elasticsearch/elasticsearch:7.13.2 container_name: elasticsearch restart: on-failure + logging: *default-logging environment: - discovery.type=single-node - "ES_JAVA_OPTS=-Xms2g -Xmx2g"