opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-25 18:25:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1764 from rhatdan/nopasswd

Browse Source 
Don't fail if /etc/passwd or /etc/group does not exists
This commit is contained in:
OpenShift Merge Robot
2018-11-07 11:24:57 -08:00
committed by GitHub
parent 1370c311f5 ae68bec75c
commit e9f8aed407
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libpod/container_internal.go
View File

@ -5,7 +5,6 @@ import (
"context" "context"
"encoding/json" "encoding/json"
"fmt" "fmt"
"github.com/opencontainers/runc/libcontainer/user"
"io" "io"
"io/ioutil" "io/ioutil"
"os" "os"
@ -27,6 +26,7 @@ import (
"github.com/containers/storage/pkg/archive" "github.com/containers/storage/pkg/archive"
"github.com/containers/storage/pkg/chrootarchive" "github.com/containers/storage/pkg/chrootarchive"
"github.com/containers/storage/pkg/mount" "github.com/containers/storage/pkg/mount"
"github.com/opencontainers/runc/libcontainer/user"
spec "github.com/opencontainers/runtime-spec/specs-go" spec "github.com/opencontainers/runtime-spec/specs-go"
"github.com/opencontainers/runtime-tools/generate" "github.com/opencontainers/runtime-tools/generate"
"github.com/opencontainers/selinux/go-selinux/label" "github.com/opencontainers/selinux/go-selinux/label"
@ -1139,7 +1139,7 @@ func (c *Container) generatePasswd() (string, error) {
} }
originPasswdFile := filepath.Join(c.state.Mountpoint, "/etc/passwd") originPasswdFile := filepath.Join(c.state.Mountpoint, "/etc/passwd")
orig, err := ioutil.ReadFile(originPasswdFile) orig, err := ioutil.ReadFile(originPasswdFile)
if err != nil { if err != nil && !os.IsNotExist(err) {
return "", errors.Wrapf(err, "unable to read passwd file %s", originPasswdFile) return "", errors.Wrapf(err, "unable to read passwd file %s", originPasswdFile)
} }

8
pkg/lookup/lookup.go
View File

@ -1,10 +1,12 @@
package lookup package lookup
import ( import (
"os"
"strconv"
"github.com/cyphar/filepath-securejoin" "github.com/cyphar/filepath-securejoin"
"github.com/opencontainers/runc/libcontainer/user" "github.com/opencontainers/runc/libcontainer/user"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"strconv"
) )
const ( const (
@ -116,7 +118,7 @@ func GetUser(containerMount, userIDorName string) (*user.User, error) {
} }
return u.Uid == uid return u.Uid == uid
}) })
if err != nil { if err != nil && !os.IsNotExist(err) {
return nil, err return nil, err
} }
if len(users) > 0 { if len(users) > 0 {
@ -146,7 +148,7 @@ func GetGroup(containerMount, groupIDorName string) (*user.Group, error) {
} }
return g.Gid == gid return g.Gid == gid
}) })
if err != nil { if err != nil && !os.IsNotExist(err) {
return nil, err return nil, err
} }
if len(groups) > 0 { if len(groups) > 0 {