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

volume: write the correct ID of the container in error messages

Browse Source 
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano
2018-10-09 09:45:21 +02:00
parent 5691938563
commit 2ad6012ea1
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libpod/container_internal.go
View File

@ -1212,28 +1212,28 @@ func (c *Container) addLocalVolumes(ctx context.Context, g *generate.Generator)
if _, err := os.Stat(srcPath); os.IsNotExist(err) { if _, err := os.Stat(srcPath); os.IsNotExist(err) {
logrus.Infof("Volume image mount point %s does not exist in root FS, need to create it", k) logrus.Infof("Volume image mount point %s does not exist in root FS, need to create it", k)
if err = os.MkdirAll(srcPath, 0755); err != nil { if err = os.MkdirAll(srcPath, 0755); err != nil {
return errors.Wrapf(err, "error creating directory %q for volume %q in container %q", volumePath, k, c.ID) return errors.Wrapf(err, "error creating directory %q for volume %q in container %q", volumePath, k, c.ID())
} }
if err = os.Chown(srcPath, int(uid), int(gid)); err != nil { if err = os.Chown(srcPath, int(uid), int(gid)); err != nil {
return errors.Wrapf(err, "error chowning directory %q for volume %q in container %q", srcPath, k, c.ID) return errors.Wrapf(err, "error chowning directory %q for volume %q in container %q", srcPath, k, c.ID())
} }
} }
if _, err := os.Stat(volumePath); os.IsNotExist(err) { if _, err := os.Stat(volumePath); os.IsNotExist(err) {
if err = os.MkdirAll(volumePath, 0755); err != nil { if err = os.MkdirAll(volumePath, 0755); err != nil {
return errors.Wrapf(err, "error creating directory %q for volume %q in container %q", volumePath, k, c.ID) return errors.Wrapf(err, "error creating directory %q for volume %q in container %q", volumePath, k, c.ID())
} }
if err = os.Chown(volumePath, int(uid), int(gid)); err != nil { if err = os.Chown(volumePath, int(uid), int(gid)); err != nil {
return errors.Wrapf(err, "error chowning directory %q for volume %q in container %q", volumePath, k, c.ID) return errors.Wrapf(err, "error chowning directory %q for volume %q in container %q", volumePath, k, c.ID())
} }
if err = label.Relabel(volumePath, c.config.MountLabel, false); err != nil { if err = label.Relabel(volumePath, c.config.MountLabel, false); err != nil {
return errors.Wrapf(err, "error relabeling directory %q for volume %q in container %q", volumePath, k, c.ID) return errors.Wrapf(err, "error relabeling directory %q for volume %q in container %q", volumePath, k, c.ID())
} }
if err = chrootarchive.NewArchiver(nil).CopyWithTar(srcPath, volumePath); err != nil && !os.IsNotExist(err) { if err = chrootarchive.NewArchiver(nil).CopyWithTar(srcPath, volumePath); err != nil && !os.IsNotExist(err) {
return errors.Wrapf(err, "error populating directory %q for volume %q in container %q using contents of %q", volumePath, k, c.ID, srcPath) return errors.Wrapf(err, "error populating directory %q for volume %q in container %q using contents of %q", volumePath, k, c.ID(), srcPath)
} }
// Set the volume path with the same owner and permission of source path // Set the volume path with the same owner and permission of source path