Merge pull request #14823 from karalabe/puppeth-limited-logging

cmd/puppeth: limit cotnainers to 10MB logs
This commit is contained in:
Péter Szilágyi 2017-07-17 21:18:31 +03:00 committed by GitHub
commit 8a8fc5f8ef
5 changed files with 25 additions and 0 deletions

View File

@ -425,6 +425,11 @@ services:
- "{{.Port}}:80"{{else}} - "{{.Port}}:80"{{else}}
environment: environment:
- VIRTUAL_HOST={{.VHost}}{{end}} - VIRTUAL_HOST={{.VHost}}{{end}}
logging:
driver: "json-file"
options:
max-size: "1m"
max-file: "10"
restart: always restart: always
` `

View File

@ -60,6 +60,11 @@ services:
environment: environment:
- WS_SECRET={{.Secret}}{{if .VHost}} - WS_SECRET={{.Secret}}{{if .VHost}}
- VIRTUAL_HOST={{.VHost}}{{end}} - VIRTUAL_HOST={{.VHost}}{{end}}
logging:
driver: "json-file"
options:
max-size: "1m"
max-file: "10"
restart: always restart: always
` `

View File

@ -82,6 +82,11 @@ services:
- CAPTCHA_SECRET={{.CaptchaSecret}}{{if .VHost}} - CAPTCHA_SECRET={{.CaptchaSecret}}{{if .VHost}}
- VIRTUAL_HOST={{.VHost}} - VIRTUAL_HOST={{.VHost}}
- VIRTUAL_PORT=8080{{end}} - VIRTUAL_PORT=8080{{end}}
logging:
driver: "json-file"
options:
max-size: "1m"
max-file: "10"
restart: always restart: always
` `

View File

@ -43,6 +43,11 @@ services:
- "{{.Port}}:80" - "{{.Port}}:80"
volumes: volumes:
- /var/run/docker.sock:/tmp/docker.sock:ro - /var/run/docker.sock:/tmp/docker.sock:ro
logging:
driver: "json-file"
options:
max-size: "1m"
max-file: "10"
restart: always restart: always
` `

View File

@ -68,6 +68,11 @@ services:
- MINER_NAME={{.Etherbase}} - MINER_NAME={{.Etherbase}}
- GAS_TARGET={{.GasTarget}} - GAS_TARGET={{.GasTarget}}
- GAS_PRICE={{.GasPrice}} - GAS_PRICE={{.GasPrice}}
logging:
driver: "json-file"
options:
max-size: "1m"
max-file: "10"
restart: always restart: always
` `