File tree Expand file tree Collapse file tree 1 file changed +2
-16
lines changed Expand file tree Collapse file tree 1 file changed +2
-16
lines changed Original file line number Diff line number Diff line change @@ -2,7 +2,6 @@ package main
22
33import (
44 "bytes"
5- "io"
65 "io/ioutil"
76 "log"
87 "os"
@@ -85,21 +84,8 @@ func generateFile(config Config, containers Context) bool {
8584 filteredContainers = containers
8685 }
8786
88- dest := os .Stdout
89- if config .Dest != "" {
90- dest , err = ioutil .TempFile (filepath .Dir (config .Dest ), "docker-gen" )
91- defer func () {
92- dest .Close ()
93- os .Remove (dest .Name ())
94- }()
95- if err != nil {
96- log .Fatalf ("unable to create temp file: %s\n " , err )
97- }
98- }
99-
10087 var buf bytes.Buffer
101- multiwriter := io .MultiWriter (dest , & buf )
102- err = tmpl .ExecuteTemplate (multiwriter , filepath .Base (templatePath ), & filteredContainers )
88+ err = tmpl .ExecuteTemplate (& buf , filepath .Base (templatePath ), & filteredContainers )
10389 if err != nil {
10490 log .Fatalf ("template error: %s\n " , err )
10591 }
@@ -115,7 +101,7 @@ func generateFile(config Config, containers Context) bool {
115101 }
116102
117103 if bytes .Compare (contents , buf .Bytes ()) != 0 {
118- err = os . Rename ( dest . Name (), config . Dest )
104+ err = ioutil . WriteFile ( config . Dest , buf . Bytes (), os . FileMode ( 0640 ) )
119105 if err != nil {
120106 log .Fatalf ("unable to create dest file %s: %s\n " , config .Dest , err )
121107 }
You can’t perform that action at this time.
0 commit comments