Avoid returning the UID when resolving the GIDs.

pkg/util/command_util.go

@@ -387,14 +387,29 @@ func getUIDAndGID(userStr string, groupStr string, fallbackToUID bool) (uint32,
  return 0, 0, err
  }
 
- gid, err := getGIDFromName(groupStr, fallbackToUID)
+ if groupStr == "" {
+ if user.Gid != "" {
+ gid32, err := getGID(user.Gid, fallbackToUID)
+
+ if err != nil {
+ if errors.Is(err, fallbackToUIDError) {
+ return uid32, uid32, nil
+ }
+ return 0, 0, err
+ }
+
+ return uid32, gid32, nil
+ }
+ }
+
+ gid32, err := getGIDFromName(groupStr, fallbackToUID)
  if err != nil {
  if errors.Is(err, fallbackToUIDError) {
  return uid32, uid32, nil
  }
  return 0, 0, err
  }
- return uid32, gid, nil
+ return uid32, gid32, nil
 }
 
 // getGID tries to parse the gid or falls back to getGroupFromName if it's not an id