mirror of
https://github.com/containers/podman.git
synced 2025-06-21 01:19:15 +08:00
Update containers/common to main branch
Want to add support for Machine.Volumes Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
2
go.mod
2
go.mod
@ -12,7 +12,7 @@ require (
|
|||||||
github.com/containernetworking/cni v1.0.1
|
github.com/containernetworking/cni v1.0.1
|
||||||
github.com/containernetworking/plugins v1.1.1
|
github.com/containernetworking/plugins v1.1.1
|
||||||
github.com/containers/buildah v1.25.2-0.20220406205807-5b8e79118057
|
github.com/containers/buildah v1.25.2-0.20220406205807-5b8e79118057
|
||||||
github.com/containers/common v0.47.5-0.20220406101255-3dd66c046c25
|
github.com/containers/common v0.47.5-0.20220413182852-c23a4e11f91b
|
||||||
github.com/containers/conmon v2.0.20+incompatible
|
github.com/containers/conmon v2.0.20+incompatible
|
||||||
github.com/containers/image/v5 v5.21.1-0.20220405081457-d1b64686e1d0
|
github.com/containers/image/v5 v5.21.1-0.20220405081457-d1b64686e1d0
|
||||||
github.com/containers/ocicrypt v1.1.3
|
github.com/containers/ocicrypt v1.1.3
|
||||||
|
4
go.sum
4
go.sum
@ -355,8 +355,8 @@ github.com/containernetworking/plugins v1.1.1/go.mod h1:Sr5TH/eBsGLXK/h71HeLfX19
|
|||||||
github.com/containers/buildah v1.25.2-0.20220406205807-5b8e79118057 h1:lKSxhMBpcHyyQrj2QJYzcm56uiSeibRdSL2KoppF6rg=
|
github.com/containers/buildah v1.25.2-0.20220406205807-5b8e79118057 h1:lKSxhMBpcHyyQrj2QJYzcm56uiSeibRdSL2KoppF6rg=
|
||||||
github.com/containers/buildah v1.25.2-0.20220406205807-5b8e79118057/go.mod h1:iSoopbYRb6K4b5c3hXgXNkGTI/T085t2+XiGjceud94=
|
github.com/containers/buildah v1.25.2-0.20220406205807-5b8e79118057/go.mod h1:iSoopbYRb6K4b5c3hXgXNkGTI/T085t2+XiGjceud94=
|
||||||
github.com/containers/common v0.47.5-0.20220331143923-5f14ec785c18/go.mod h1:Vr2Fn6EdzD6JNAbz8L8bTv3uWLv2p31Ih2O3EAK6Hyc=
|
github.com/containers/common v0.47.5-0.20220331143923-5f14ec785c18/go.mod h1:Vr2Fn6EdzD6JNAbz8L8bTv3uWLv2p31Ih2O3EAK6Hyc=
|
||||||
github.com/containers/common v0.47.5-0.20220406101255-3dd66c046c25 h1:IQeqv8Hf6CqFUlKaz95QFTrLc9V4sbVQyhP9jzGnNBc=
|
github.com/containers/common v0.47.5-0.20220413182852-c23a4e11f91b h1:HVOojcjTGPke7oOh1T/Wj67DK74LBJOR6qU5uW+33zk=
|
||||||
github.com/containers/common v0.47.5-0.20220406101255-3dd66c046c25/go.mod h1:0mfWn1RRdpBjXmiunOVLaJ1I86pQjXKAc8zuiAuUesk=
|
github.com/containers/common v0.47.5-0.20220413182852-c23a4e11f91b/go.mod h1:nRW9288gdZqIGoRwoV23i3qO7Zznbd34sdDOBnq2GjY=
|
||||||
github.com/containers/conmon v2.0.20+incompatible h1:YbCVSFSCqFjjVwHTPINGdMX1F6JXHGTUje2ZYobNrkg=
|
github.com/containers/conmon v2.0.20+incompatible h1:YbCVSFSCqFjjVwHTPINGdMX1F6JXHGTUje2ZYobNrkg=
|
||||||
github.com/containers/conmon v2.0.20+incompatible/go.mod h1:hgwZ2mtuDrppv78a/cOBNiCm6O0UMWGx1mu7P00nu5I=
|
github.com/containers/conmon v2.0.20+incompatible/go.mod h1:hgwZ2mtuDrppv78a/cOBNiCm6O0UMWGx1mu7P00nu5I=
|
||||||
github.com/containers/image/v5 v5.19.2-0.20220224100137-1045fb70b094/go.mod h1:XoYK6kE0dpazFNcuS+a8lra+QfbC6s8tzv+cUuCrZpE=
|
github.com/containers/image/v5 v5.19.2-0.20220224100137-1045fb70b094/go.mod h1:XoYK6kE0dpazFNcuS+a8lra+QfbC6s8tzv+cUuCrZpE=
|
||||||
|
4
vendor/github.com/containers/common/pkg/config/config.go
generated
vendored
4
vendor/github.com/containers/common/pkg/config/config.go
generated
vendored
@ -558,8 +558,10 @@ type MachineConfig struct {
|
|||||||
Image string `toml:"image,omitempty"`
|
Image string `toml:"image,omitempty"`
|
||||||
// Memory in MB a machine is created with.
|
// Memory in MB a machine is created with.
|
||||||
Memory uint64 `toml:"memory,omitempty,omitzero"`
|
Memory uint64 `toml:"memory,omitempty,omitzero"`
|
||||||
// Username to use for rootless podman when init-ing a podman machine VM
|
// User to use for rootless podman when init-ing a podman machine VM
|
||||||
User string `toml:"user,omitempty"`
|
User string `toml:"user,omitempty"`
|
||||||
|
// Volumes are host directories mounted into the VM by default.
|
||||||
|
Volumes []string `toml:"volumes"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// Destination represents destination for remote service
|
// Destination represents destination for remote service
|
||||||
|
9
vendor/github.com/containers/common/pkg/config/containers.conf
generated
vendored
9
vendor/github.com/containers/common/pkg/config/containers.conf
generated
vendored
@ -627,6 +627,15 @@ default_sysctls = [
|
|||||||
#
|
#
|
||||||
#user = "core"
|
#user = "core"
|
||||||
|
|
||||||
|
# Host directories to be mounted as volumes into the VM by default.
|
||||||
|
# Environment variables like $HOME as well as complete paths are supported for
|
||||||
|
# the source and destination. An optional third field `:ro` can be used to
|
||||||
|
# tell the container engines to mount the volume readonly.
|
||||||
|
#
|
||||||
|
# volumes = [
|
||||||
|
# "$HOME:$HOME",
|
||||||
|
#]
|
||||||
|
|
||||||
# The [machine] table MUST be the last entry in this file.
|
# The [machine] table MUST be the last entry in this file.
|
||||||
# (Unless another table is added)
|
# (Unless another table is added)
|
||||||
# TOML does not provide a way to end a table other than a further table being
|
# TOML does not provide a way to end a table other than a further table being
|
||||||
|
23
vendor/github.com/containers/common/pkg/config/default.go
generated
vendored
23
vendor/github.com/containers/common/pkg/config/default.go
generated
vendored
@ -9,6 +9,7 @@ import (
|
|||||||
"path/filepath"
|
"path/filepath"
|
||||||
"regexp"
|
"regexp"
|
||||||
"strconv"
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
|
||||||
nettypes "github.com/containers/common/libnetwork/types"
|
nettypes "github.com/containers/common/libnetwork/types"
|
||||||
"github.com/containers/common/pkg/apparmor"
|
"github.com/containers/common/pkg/apparmor"
|
||||||
@ -246,6 +247,7 @@ func defaultMachineConfig() MachineConfig {
|
|||||||
Image: getDefaultMachineImage(),
|
Image: getDefaultMachineImage(),
|
||||||
Memory: 2048,
|
Memory: 2048,
|
||||||
User: getDefaultMachineUser(),
|
User: getDefaultMachineUser(),
|
||||||
|
Volumes: []string{"$HOME:$HOME"},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -593,3 +595,24 @@ func (c *Config) LogDriver() string {
|
|||||||
func (c *Config) MachineEnabled() bool {
|
func (c *Config) MachineEnabled() bool {
|
||||||
return c.Engine.MachineEnabled
|
return c.Engine.MachineEnabled
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// MachineVolumes returns volumes to mount into the VM
|
||||||
|
func (c *Config) MachineVolumes() ([]string, error) {
|
||||||
|
return machineVolumes(c.Machine.Volumes)
|
||||||
|
}
|
||||||
|
|
||||||
|
func machineVolumes(volumes []string) ([]string, error) {
|
||||||
|
translatedVolumes := []string{}
|
||||||
|
for _, v := range volumes {
|
||||||
|
vol := os.ExpandEnv(v)
|
||||||
|
split := strings.Split(vol, ":")
|
||||||
|
if len(split) < 2 || len(split) > 3 {
|
||||||
|
return nil, errors.Errorf("invalid machine volume %s, 2 or 3 fields required", v)
|
||||||
|
}
|
||||||
|
if split[0] == "" || split[1] == "" {
|
||||||
|
return nil, errors.Errorf("invalid machine volume %s, fields must container data", v)
|
||||||
|
}
|
||||||
|
translatedVolumes = append(translatedVolumes, vol)
|
||||||
|
}
|
||||||
|
return translatedVolumes, nil
|
||||||
|
}
|
||||||
|
2
vendor/modules.txt
vendored
2
vendor/modules.txt
vendored
@ -109,7 +109,7 @@ github.com/containers/buildah/pkg/rusage
|
|||||||
github.com/containers/buildah/pkg/sshagent
|
github.com/containers/buildah/pkg/sshagent
|
||||||
github.com/containers/buildah/pkg/util
|
github.com/containers/buildah/pkg/util
|
||||||
github.com/containers/buildah/util
|
github.com/containers/buildah/util
|
||||||
# github.com/containers/common v0.47.5-0.20220406101255-3dd66c046c25
|
# github.com/containers/common v0.47.5-0.20220413182852-c23a4e11f91b
|
||||||
## explicit
|
## explicit
|
||||||
github.com/containers/common/libimage
|
github.com/containers/common/libimage
|
||||||
github.com/containers/common/libimage/manifests
|
github.com/containers/common/libimage/manifests
|
||||||
|
Reference in New Issue
Block a user