Merge pull request moby#4169 from tonistiigi/v0.12.2-picks

[v0.12] v0.12.2 cherry-picks

Author: tonistiigi

docs/annotations.md

@@ -43,13 +43,12 @@ write to the following `<type>`s:
 - The `manifest` (the default, as above)
 - The `manifest-descriptor`
     - This adds the annotation into the image index's descriptor for the manifest
-    - (discarded if the output does not contain an image index)
 - The `index`
     - This adds the annotation into the image index root
-    - (discarded if the output does not contain an image index)
+    - If the exporter does not produce an image index, the build will fail.
 - The `index-descriptor`
     - This adds the annotation into the OCI layout's descriptor for the index
-    - (discarded if the output does not contain an OCI layout)
+    - If the exporter does not produce an image index, the build will fail.
 
 For example, if you want to add the annotation at the image index level, so
 that the annotation is shared between all architectures, you can instead:

docs/buildkitd.toml.md

@@ -64,7 +64,7 @@ insecure-entitlements = [ "network.host", "security.insecure" ]
 
   [[worker.oci.gcpolicy]]
     # keepBytes can be an integer number of bytes (e.g. 512000000), a string
-    # with a unit (e.g. "512MB"), or a string percentage of available disk
+    # with a unit (e.g. "512MB"), or a string percentage of the total disk
     # space (e.g. "10%")
     keepBytes = "512MB"
     # keepDuration can be an integer number of seconds (e.g. 172800), or a

util/progress/multiwriter.go

@@ -65,7 +65,7 @@ func (ps *MultiWriter) Write(id string, v interface{}) error {
 		Sys:       v,
 		meta:      ps.meta,
 	}
-	return ps.WriteRawProgress(p)
+	return ps.writeRawProgress(p)
 }
 
 func (ps *MultiWriter) WriteRawProgress(p *Progress) error {