Use io.Copy when creating files

pkg/commands/copy.go

@@ -21,7 +21,6 @@ import (
 	"github.com/containers/image/manifest"
 	"github.com/docker/docker/builder/dockerfile/instructions"
 	"github.com/sirupsen/logrus"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
@@ -65,11 +64,12 @@ func (c *CopyCommand) ExecuteCommand(config *manifest.Schema2Config) error {
 			} else {
 				// ... Else, we want to copy over a file
 				logrus.Infof("Copying file %s to %s", file, destPath)
-				contents, err := ioutil.ReadFile(filepath.Join(c.buildcontext, file))
+				srcFile, err := os.Open(filepath.Join(c.buildcontext, file))
 				if err != nil {
 					return err
 				}
-				if err := util.CreateFile(destPath, contents, fi.Mode()); err != nil {
+				defer srcFile.Close()
+				if err := util.CreateFile(destPath, srcFile, fi.Mode()); err != nil {
 					return err
 				}
 			}

pkg/util/fs_util.go

@@ -23,7 +23,6 @@ import (
 	"github.com/containers/image/docker"
 	"github.com/sirupsen/logrus"
 	"io"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
@@ -124,8 +123,8 @@ func FilepathExists(path string) bool {
 	return !os.IsNotExist(err)
 }
 
-// CreateFile creates a file at path with contents specified
+// CreateFile creates a file at path and copies over contents from the reader
-func CreateFile(path string, contents []byte, perm os.FileMode) error {
+func CreateFile(path string, reader io.Reader, perm os.FileMode) error {
 	// Create directory path if it doesn't exist
 	baseDir := filepath.Dir(path)
 	if _, err := os.Stat(baseDir); os.IsNotExist(err) {
@@ -134,5 +133,12 @@ func CreateFile(path string, contents []byte, perm os.FileMode) error {
 			return err
 		}
 	}
-	return ioutil.WriteFile(path, contents, perm)
+	dest, err := os.Create(path)
+	if err != nil {
+		return err
+	}
+	if _, err := io.Copy(dest, reader); err != nil {
+		return err
+	}
+	return dest.Chmod(perm)
 }