Bugfix - Docker push fails to update layers properties (#21)

Author: Or-Geva

artifactory/utils/docker/buildinfo.go

@@ -231,20 +231,34 @@ func (builder *buildInfoBuilder) setBuildProperties() (int, error) {
 	if err != nil {
 		return 0, err
 	}
-	writer, err := content.NewContentWriter("results", true, false)
+	pathToFile, err := writeLayersToFile(builder.layers)
 	if err != nil {
-		log.Error("Fail to create new content writer for docker layer")
 		return 0, err
 	}
-	defer writer.Close()
-	for _, item := range builder.layers {
-		writer.Write(item)
-	}
-	reader := content.NewContentReader(writer.GetFilePath(), content.DefaultKey)
+	reader := content.NewContentReader(pathToFile, content.DefaultKey)
 	defer reader.Close()
 	return builder.serviceManager.SetProps(services.PropsParams{Reader: reader, Props: props})
 }
 
+func writeLayersToFile(layers []utils.ResultItem) (filePath string, err error) {
+	writer, err := content.NewContentWriter("results", true, false)
+	if err != nil {
+		log.Error("Fail to create new content writer for docker layer")
+		return
+	}
+	defer func() {
+		deferErr := writer.Close()
+		if err == nil {
+			err = deferErr
+		}
+	}()
+	for _, layer := range layers {
+		writer.Write(layer)
+	}
+	filePath = writer.GetFilePath()
+	return
+}
+
 // Create docker build info
 func (builder *buildInfoBuilder) createBuildInfo(module string) (*buildinfo.BuildInfo, error) {
 	imageProperties := map[string]string{}