tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-20 04:04:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

log_opt: change address to syslog-address

Browse Source 
Signed-off-by: Joel Hansson <joel.hansson@ecraft.com>
This commit is contained in:
Joel Hansson 2015-08-20 16:38:43 +02:00
parent a806d9e77b
commit 61936f6b88
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compose/config/schema.json
View File

@ -62,9 +62,9 @@
"type": "object", "type": "object",
"properties": { "properties": {
"address": {"type": "string"} "syslog-address": {"type": "string"}
}, },
"required": ["address"] "required": ["syslog-address"]
}, },
"mac_address": {"type": "string"}, "mac_address": {"type": "string"},

2
docs/yml.md
View File

@ -301,7 +301,7 @@ Logging options are key value pairs. An example of `syslog` options:
log_driver: "syslog" log_driver: "syslog"
log_opt: log_opt:
address: "tcp://192.168.0.42:123" syslog-address: "tcp://192.168.0.42:123"
### net ### net

2
tests/unit/service_test.py
View File

@ -113,7 +113,7 @@ class ServiceTest(unittest.TestCase):
self.assertEqual(opts['host_config']['Memory'], 1000000000) self.assertEqual(opts['host_config']['Memory'], 1000000000)
def test_log_opt(self): def test_log_opt(self):
log_opt = {'address': 'tcp://192.168.0.42:123'} log_opt = {'syslog-address': 'tcp://192.168.0.42:123'}
service = Service(name='foo', image='foo', hostname='name', client=self.mock_client, log_driver='syslog', log_opt=log_opt) service = Service(name='foo', image='foo', hostname='name', client=self.mock_client, log_driver='syslog', log_opt=log_opt)
self.mock_client.containers.return_value = [] self.mock_client.containers.return_value = []
opts = service._get_container_create_options({'some': 'overrides'}, 1) opts = service._get_container_create_options({'some': 'overrides'}, 1)