Set ownership to unpacked entries

glestaris · glestaris · commit ea4e2eae29bd · 2016-09-15T18:23:05.000+01:00
Signed-off-by: George Lestaris &lt;glestaris@gmail.com&gt;
diff --git a/image/manifest.go b/image/manifest.go
@@ -184,6 +184,12 @@ loop:
 				if err2 := os.MkdirAll(path, info.Mode()); err2 != nil {
 					return errors.Wrap(err2, "error creating directory")
 				}
+
+				if os.Getuid() == 0 {
+					if err2 := os.Chown(path, hdr.Uid, hdr.Gid); err2 != nil {
+						return errors.Wrap(err2, "error chowing directory")
+					}
+				}
 			}
 
 		case tar.TypeReg, tar.TypeRegA:
@@ -192,6 +198,12 @@ loop:
 				return errors.Wrap(err, "unable to open file")
 			}
 
+			if os.Getuid() == 0 {
+				if err := os.Chown(path, hdr.Uid, hdr.Gid); err != nil {
+					return errors.Wrap(err, "error chowing file")
+				}
+			}
+
 			if _, err := io.Copy(f, tr); err != nil {
 				f.Close()
 				return errors.Wrap(err, "unable to copy")
@@ -219,6 +231,13 @@ loop:
 			if err := os.Symlink(hdr.Linkname, path); err != nil {
 				return err
 			}
+
+			if os.Getuid() == 0 {
+				if err := os.Lchown(path, hdr.Uid, hdr.Gid); err != nil {
+					return errors.Wrap(err, "error chowing symlink")
+				}
+			}
+
 		case tar.TypeXGlobalHeader:
 			return nil
 		}
