Merge pull request #976 from SkynetLabs/adjust-docker-services-logging

adjust docker services logging (missing ones)
This commit is contained in:
Ivaylo Novakov 2021-07-12 14:04:06 +02:00 committed by GitHub
commit 65e20acaf1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 0 deletions

View File

@ -145,6 +145,7 @@ services:
volumes: volumes:
- ./docker/kratos/oathkeeper:/etc/config/oathkeeper - ./docker/kratos/oathkeeper:/etc/config/oathkeeper
restart: on-failure restart: on-failure
logging: *default-logging
networks: networks:
shared: shared:
ipv4_address: 10.10.10.83 ipv4_address: 10.10.10.83
@ -154,6 +155,8 @@ services:
cockroach: cockroach:
image: cockroachdb/cockroach:v20.2.3 image: cockroachdb/cockroach:v20.2.3
container_name: cockroach container_name: cockroach
restart: unless-stopped
logging: *default-logging
env_file: env_file:
- .env - .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 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

View File

@ -1,5 +1,11 @@
version: "3.7" version: "3.7"
x-logging: &default-logging
driver: json-file
options:
max-size: "10m"
max-file: "3"
services: services:
sia: sia:
environment: environment:
@ -23,6 +29,7 @@ services:
] ]
container_name: jaeger-agent container_name: jaeger-agent
restart: on-failure restart: on-failure
logging: *default-logging
expose: expose:
- 6831 - 6831
- 6832 - 6832
@ -40,6 +47,7 @@ services:
entrypoint: /wait_to_start.sh entrypoint: /wait_to_start.sh
container_name: jaeger-collector container_name: jaeger-collector
restart: on-failure restart: on-failure
logging: *default-logging
expose: expose:
- 14269 - 14269
- 14268 - 14268
@ -64,6 +72,7 @@ services:
entrypoint: /wait_to_start.sh entrypoint: /wait_to_start.sh
container_name: jaeger-query container_name: jaeger-query
restart: on-failure restart: on-failure
logging: *default-logging
ports: ports:
- "127.0.0.1:16686:16686" - "127.0.0.1:16686:16686"
expose: expose:
@ -87,6 +96,7 @@ services:
image: docker.elastic.co/elasticsearch/elasticsearch:7.13.2 image: docker.elastic.co/elasticsearch/elasticsearch:7.13.2
container_name: elasticsearch container_name: elasticsearch
restart: on-failure restart: on-failure
logging: *default-logging
environment: environment:
- discovery.type=single-node - discovery.type=single-node
- "ES_JAVA_OPTS=-Xms2g -Xmx2g" - "ES_JAVA_OPTS=-Xms2g -Xmx2g"