Change default image volume mode to "nullfs" on FreeBSD
This fixes a regression in https://github.com/containers/podman/pull/19241 which quite reasonably assumed that the default image volume mode from pkg/config was correct. Signed-off-by: Doug Rabson <dfr@rabson.org>
This commit is contained in:
parent
a030e05c8a
commit
478419732a
|
|
@ -51,7 +51,7 @@ const (
|
|||
BoltDBStateStore RuntimeStateStore = iota
|
||||
)
|
||||
|
||||
var validImageVolumeModes = []string{"bind", "tmpfs", "ignore"}
|
||||
var validImageVolumeModes = []string{_typeBind, "tmpfs", "ignore"}
|
||||
|
||||
// ProxyEnv is a list of Proxy Environment variables
|
||||
var ProxyEnv = []string{
|
||||
|
|
|
|||
|
|
@ -14,6 +14,9 @@ const (
|
|||
// DefaultSignaturePolicyPath is the default value for the
|
||||
// policy.json file.
|
||||
DefaultSignaturePolicyPath = "/etc/containers/policy.json"
|
||||
|
||||
// Mount type for mounting host dir
|
||||
_typeBind = "bind"
|
||||
)
|
||||
|
||||
// podman remote clients on darwin cannot use unshare.isRootless() to determine the configuration file locations.
|
||||
|
|
|
|||
|
|
@ -14,6 +14,9 @@ const (
|
|||
// DefaultSignaturePolicyPath is the default value for the
|
||||
// policy.json file.
|
||||
DefaultSignaturePolicyPath = "/usr/local/etc/containers/policy.json"
|
||||
|
||||
// Mount type for mounting host dir
|
||||
_typeBind = "nullfs"
|
||||
)
|
||||
|
||||
// podman remote clients on freebsd cannot use unshare.isRootless() to determine the configuration file locations.
|
||||
|
|
|
|||
|
|
@ -17,6 +17,9 @@ const (
|
|||
// DefaultSignaturePolicyPath is the default value for the
|
||||
// policy.json file.
|
||||
DefaultSignaturePolicyPath = "/etc/containers/policy.json"
|
||||
|
||||
// Mount type for mounting host dir
|
||||
_typeBind = "bind"
|
||||
)
|
||||
|
||||
func selinuxEnabled() bool {
|
||||
|
|
|
|||
|
|
@ -38,7 +38,11 @@ var _ = Describe("Config", func() {
|
|||
gomega.Expect(defaultConfig.NetNS()).To(gomega.BeEquivalentTo("private"))
|
||||
gomega.Expect(defaultConfig.IPCNS()).To(gomega.BeEquivalentTo("shareable"))
|
||||
gomega.Expect(defaultConfig.Engine.InfraImage).To(gomega.BeEquivalentTo(""))
|
||||
gomega.Expect(defaultConfig.Engine.ImageVolumeMode).To(gomega.BeEquivalentTo("bind"))
|
||||
if runtime.GOOS == "freebsd" {
|
||||
gomega.Expect(defaultConfig.Engine.ImageVolumeMode).To(gomega.BeEquivalentTo("nullfs"))
|
||||
} else {
|
||||
gomega.Expect(defaultConfig.Engine.ImageVolumeMode).To(gomega.BeEquivalentTo("bind"))
|
||||
}
|
||||
gomega.Expect(defaultConfig.Engine.SSHConfig).To(gomega.ContainSubstring("/.ssh/config"))
|
||||
gomega.Expect(defaultConfig.Engine.EventsContainerCreateInspectData).To(gomega.BeFalse())
|
||||
gomega.Expect(defaultConfig.Engine.DBBackend).To(gomega.BeEquivalentTo(stringBoltDB))
|
||||
|
|
|
|||
|
|
@ -12,6 +12,9 @@ const (
|
|||
// DefaultSignaturePolicyPath is the default value for the
|
||||
// policy.json file.
|
||||
DefaultSignaturePolicyPath = "/etc/containers/policy.json"
|
||||
|
||||
// Mount type for mounting host dir
|
||||
_typeBind = "bind"
|
||||
)
|
||||
|
||||
// podman remote clients on windows cannot use unshare.isRootless() to determine the configuration file locations.
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ const (
|
|||
_defaultTransport = "docker://"
|
||||
|
||||
// _defaultImageVolumeMode is a mode to handle built-in image volumes.
|
||||
_defaultImageVolumeMode = "bind"
|
||||
_defaultImageVolumeMode = _typeBind
|
||||
)
|
||||
|
||||
var (
|
||||
|
|
|
|||
Loading…
Reference in New Issue