Preserve volume uid and gid through subsequent commands

Closes containers#2202 Signed-off-by: Nick Carboni <ncarboni@redhat.com>
carbonin · Mar 10, 2020 · 86d9d7c · 86d9d7c
1 parent be998a6
commit 86d9d7c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/go.sum b/go.sum
@@ -281,6 +281,7 @@ github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5a
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI=
 github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI=

diff --git a/imagebuildah/stage_executor.go b/imagebuildah/stage_executor.go
@@ -8,6 +8,7 @@ import (
  "path/filepath"
  "strconv"
  "strings"
+ "syscall"
  "time"
 
  "github.com/containers/buildah"
@@ -238,7 +239,13 @@ func (s *StageExecutor) volumeCacheRestore() error {
  if err := os.Chmod(archivedPath, st.Mode()); err != nil {
  return errors.Wrapf(err, "error restoring permissions on %q", archivedPath)
  }
- if err := os.Chown(archivedPath, 0, 0); err != nil {
+ uid := 0
+ gid := 0
+ if st.Sys() != nil {
+ uid = int(st.Sys().(*syscall.Stat_t).Uid)
+ gid = int(st.Sys().(*syscall.Stat_t).Gid)
+ }
+ if err := os.Chown(archivedPath, uid, gid); err != nil {
  return errors.Wrapf(err, "error setting ownership on %q", archivedPath)
  }
  if err := os.Chtimes(archivedPath, st.ModTime(), st.ModTime()); err != nil {