From 5c282c54df5a846c8779a95b99a3bc8b6eb6bfc2 Mon Sep 17 00:00:00 2001 From: "geovana.souza" Date: Mon, 30 Jan 2017 15:03:27 -0200 Subject: [PATCH 1/3] Add log options --- examples/docker-compose.yml | 4 ++++ main.go | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/examples/docker-compose.yml b/examples/docker-compose.yml index bda6e77..be15f34 100644 --- a/examples/docker-compose.yml +++ b/examples/docker-compose.yml @@ -32,3 +32,7 @@ app: NODE_ENV: production API_URL: http://api.mydomain.com privileged: True + log_driver: gelf + log_opt: + gelf-address: udp://mydomain.com:12201 + labels: container_group diff --git a/main.go b/main.go index c1cadf5..b8f2727 100644 --- a/main.go +++ b/main.go @@ -48,6 +48,8 @@ if [[ $interactivebash == "true" ]]; then {{range $key, $value := .Service.Environment}}-e {{$key}}="{{$value}}" {{end}} \ {{range .Service.Ports}}-p {{.}} {{end}} \ {{range .Service.Env_File}}--env-file {{.}} {{end}} \ + {{if .Service.Log_Driver}}--log-driver {{.Service.Log_Driver}} {{end}} \ + {{range $key, $value := .Service.Log_Opt}}--log-opt {{$key}}={{$value}} {{end}} \ {{.Service.Image}} bash else /usr/bin/docker {{.DockerHostConnCmdArg}} run \ @@ -62,6 +64,8 @@ else {{range $key, $value := .Service.Environment}}-e {{$key}}="{{$value}}" {{end}} \ {{range .Service.Ports}}-p {{.}} {{end}} \ {{range .Service.Env_File}}--env-file {{.}} {{end}} \ + {{if .Service.Log_Driver}}--log-driver {{.Service.Log_Driver}} {{end}} \ + {{range $key, $value := .Service.Log_Opt}}--log-opt {{$key}}={{$value}} {{end}} \ {{.Service.Image}} {{.Service.Command}} fi {{else}} @@ -77,6 +81,8 @@ fi {{range $key, $value := .Service.Environment}}-e {{$key}}="{{$value}}" {{end}} \ {{range .Service.Ports}}-p {{.}} {{end}} \ {{range .Service.Env_File}}--env-file {{.}} {{end}} \ + {{if .Service.Log_Driver}}--log-driver {{.Service.Log_Driver}} {{end}} \ + {{range $key, $value := .Service.Log_Opt}}--log-opt {{$key}}={{$value}} {{end}} \ {{.Service.Image}} {{.Service.Command}} {{end}} ` @@ -102,6 +108,8 @@ type Service struct { Privileged bool Command string Environment map[string]string + Log_Driver string + Log_Opt map[string]string } // Parses the original Yaml to the Service struct From 939a7c28533cad32ed47c27163836f13c50ced55 Mon Sep 17 00:00:00 2001 From: Geovana Date: Tue, 31 Jan 2017 12:56:49 -0200 Subject: [PATCH 2/3] Update version build --- .goxc.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.goxc.json b/.goxc.json index 7f3a1c8..daa3ad9 100644 --- a/.goxc.json +++ b/.goxc.json @@ -4,7 +4,7 @@ "xc" ], "BuildConstraints": "linux, windows, darwin", - "PackageVersion": "1.6.0", + "PackageVersion": "1.7.0", "TaskSettings": { "xc": { "GOARM": "7" From ca8144b1f621377a53c174af1a92d6d12e833c54 Mon Sep 17 00:00:00 2001 From: Geovana Date: Tue, 31 Jan 2017 12:59:56 -0200 Subject: [PATCH 3/3] Remove log example --- examples/docker-compose.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/examples/docker-compose.yml b/examples/docker-compose.yml index be15f34..bda6e77 100644 --- a/examples/docker-compose.yml +++ b/examples/docker-compose.yml @@ -32,7 +32,3 @@ app: NODE_ENV: production API_URL: http://api.mydomain.com privileged: True - log_driver: gelf - log_opt: - gelf-address: udp://mydomain.com:12201 - labels: container_group