Fix: use all attributes to render the manifest (#77)

blablacar · Aug 25, 2017 · ccc2b1a · ccc2b1a
1 parent 8d5ab47
commit ccc2b1a
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/work/service.go b/work/service.go
@@ -18,6 +18,7 @@ import (
 	"github.com/n0rad/go-erlog/data"
 	"github.com/n0rad/go-erlog/errs"
 	"github.com/n0rad/go-erlog/logs"
+	"github.com/peterbourgon/mergemap"
 	"golang.org/x/net/context"
 	"gopkg.in/yaml.v2"
 )
@@ -340,7 +341,8 @@ func (s *Service) renderManifest() ([]byte, error) {
 
 	manifest, err := ioutil.TempFile(os.TempDir(), "prefix")
 	defer os.Remove(manifest.Name())
-	err = t.RunTemplate(manifest.Name(), s.manifestAttributes, true)
+
+	err = t.RunTemplate(manifest.Name(), mergemap.Merge(s.manifestAttributes, s.attributes), true)
 	if err != nil {
 		return nil, err
 	}