mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
1d8da80dbf
This makes sure that things like `--tmpfs` mounts over an anonymous
volume don't create volumes uneccessarily.
One method only checks mountpoints, the other checks both mountpoints
and tmpfs... the usage of these should likely be consolidated.
Ideally, processing for `--tmpfs` mounts would get merged in with the
rest of the mount parsing. I opted not to do that for this change so the
fix is minimal and can potentially be backported with fewer changes of
breaking things.
Merging the mount processing for tmpfs can be handled in a followup.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit f464c31668
)
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
179 lines
5.3 KiB
Go
179 lines
5.3 KiB
Go
package container
|
|
|
|
import (
|
|
"fmt"
|
|
"strings"
|
|
|
|
containertypes "github.com/docker/docker/api/types/container"
|
|
mounttypes "github.com/docker/docker/api/types/mount"
|
|
networktypes "github.com/docker/docker/api/types/network"
|
|
"github.com/docker/docker/api/types/strslice"
|
|
"github.com/docker/go-connections/nat"
|
|
)
|
|
|
|
// WithName sets the name of the container
|
|
func WithName(name string) func(*TestContainerConfig) {
|
|
return func(c *TestContainerConfig) {
|
|
c.Name = name
|
|
}
|
|
}
|
|
|
|
// WithLinks sets the links of the container
|
|
func WithLinks(links ...string) func(*TestContainerConfig) {
|
|
return func(c *TestContainerConfig) {
|
|
c.HostConfig.Links = links
|
|
}
|
|
}
|
|
|
|
// WithImage sets the image of the container
|
|
func WithImage(image string) func(*TestContainerConfig) {
|
|
return func(c *TestContainerConfig) {
|
|
c.Config.Image = image
|
|
}
|
|
}
|
|
|
|
// WithCmd sets the comannds of the container
|
|
func WithCmd(cmds ...string) func(*TestContainerConfig) {
|
|
return func(c *TestContainerConfig) {
|
|
c.Config.Cmd = strslice.StrSlice(cmds)
|
|
}
|
|
}
|
|
|
|
// WithNetworkMode sets the network mode of the container
|
|
func WithNetworkMode(mode string) func(*TestContainerConfig) {
|
|
return func(c *TestContainerConfig) {
|
|
c.HostConfig.NetworkMode = containertypes.NetworkMode(mode)
|
|
}
|
|
}
|
|
|
|
// WithExposedPorts sets the exposed ports of the container
|
|
func WithExposedPorts(ports ...string) func(*TestContainerConfig) {
|
|
return func(c *TestContainerConfig) {
|
|
c.Config.ExposedPorts = map[nat.Port]struct{}{}
|
|
for _, port := range ports {
|
|
c.Config.ExposedPorts[nat.Port(port)] = struct{}{}
|
|
}
|
|
}
|
|
}
|
|
|
|
// WithTty sets the TTY mode of the container
|
|
func WithTty(tty bool) func(*TestContainerConfig) {
|
|
return func(c *TestContainerConfig) {
|
|
c.Config.Tty = tty
|
|
}
|
|
}
|
|
|
|
// WithWorkingDir sets the working dir of the container
|
|
func WithWorkingDir(dir string) func(*TestContainerConfig) {
|
|
return func(c *TestContainerConfig) {
|
|
c.Config.WorkingDir = dir
|
|
}
|
|
}
|
|
|
|
// WithMount adds an mount
|
|
func WithMount(m mounttypes.Mount) func(*TestContainerConfig) {
|
|
return func(c *TestContainerConfig) {
|
|
c.HostConfig.Mounts = append(c.HostConfig.Mounts, m)
|
|
}
|
|
}
|
|
|
|
// WithVolume sets the volume of the container
|
|
func WithVolume(target string) func(*TestContainerConfig) {
|
|
return func(c *TestContainerConfig) {
|
|
if c.Config.Volumes == nil {
|
|
c.Config.Volumes = map[string]struct{}{}
|
|
}
|
|
c.Config.Volumes[target] = struct{}{}
|
|
}
|
|
}
|
|
|
|
// WithBind sets the bind mount of the container
|
|
func WithBind(src, target string) func(*TestContainerConfig) {
|
|
return func(c *TestContainerConfig) {
|
|
c.HostConfig.Binds = append(c.HostConfig.Binds, fmt.Sprintf("%s:%s", src, target))
|
|
}
|
|
}
|
|
|
|
// WithTmpfs sets a target path in the container to a tmpfs
|
|
func WithTmpfs(target string) func(config *TestContainerConfig) {
|
|
return func(c *TestContainerConfig) {
|
|
if c.HostConfig.Tmpfs == nil {
|
|
c.HostConfig.Tmpfs = make(map[string]string)
|
|
}
|
|
|
|
spec := strings.SplitN(target, ":", 2)
|
|
var opts string
|
|
if len(spec) > 1 {
|
|
opts = spec[1]
|
|
}
|
|
c.HostConfig.Tmpfs[spec[0]] = opts
|
|
}
|
|
}
|
|
|
|
// WithIPv4 sets the specified ip for the specified network of the container
|
|
func WithIPv4(network, ip string) func(*TestContainerConfig) {
|
|
return func(c *TestContainerConfig) {
|
|
if c.NetworkingConfig.EndpointsConfig == nil {
|
|
c.NetworkingConfig.EndpointsConfig = map[string]*networktypes.EndpointSettings{}
|
|
}
|
|
if v, ok := c.NetworkingConfig.EndpointsConfig[network]; !ok || v == nil {
|
|
c.NetworkingConfig.EndpointsConfig[network] = &networktypes.EndpointSettings{}
|
|
}
|
|
if c.NetworkingConfig.EndpointsConfig[network].IPAMConfig == nil {
|
|
c.NetworkingConfig.EndpointsConfig[network].IPAMConfig = &networktypes.EndpointIPAMConfig{}
|
|
}
|
|
c.NetworkingConfig.EndpointsConfig[network].IPAMConfig.IPv4Address = ip
|
|
}
|
|
}
|
|
|
|
// WithIPv6 sets the specified ip6 for the specified network of the container
|
|
func WithIPv6(network, ip string) func(*TestContainerConfig) {
|
|
return func(c *TestContainerConfig) {
|
|
if c.NetworkingConfig.EndpointsConfig == nil {
|
|
c.NetworkingConfig.EndpointsConfig = map[string]*networktypes.EndpointSettings{}
|
|
}
|
|
if v, ok := c.NetworkingConfig.EndpointsConfig[network]; !ok || v == nil {
|
|
c.NetworkingConfig.EndpointsConfig[network] = &networktypes.EndpointSettings{}
|
|
}
|
|
if c.NetworkingConfig.EndpointsConfig[network].IPAMConfig == nil {
|
|
c.NetworkingConfig.EndpointsConfig[network].IPAMConfig = &networktypes.EndpointIPAMConfig{}
|
|
}
|
|
c.NetworkingConfig.EndpointsConfig[network].IPAMConfig.IPv6Address = ip
|
|
}
|
|
}
|
|
|
|
// WithLogDriver sets the log driver to use for the container
|
|
func WithLogDriver(driver string) func(*TestContainerConfig) {
|
|
return func(c *TestContainerConfig) {
|
|
c.HostConfig.LogConfig.Type = driver
|
|
}
|
|
}
|
|
|
|
// WithAutoRemove sets the container to be removed on exit
|
|
func WithAutoRemove(c *TestContainerConfig) {
|
|
c.HostConfig.AutoRemove = true
|
|
}
|
|
|
|
// WithPidsLimit sets the container's "pids-limit
|
|
func WithPidsLimit(limit *int64) func(*TestContainerConfig) {
|
|
return func(c *TestContainerConfig) {
|
|
if c.HostConfig == nil {
|
|
c.HostConfig = &containertypes.HostConfig{}
|
|
}
|
|
c.HostConfig.PidsLimit = limit
|
|
}
|
|
}
|
|
|
|
// WithRestartPolicy sets container's restart policy
|
|
func WithRestartPolicy(policy string) func(c *TestContainerConfig) {
|
|
return func(c *TestContainerConfig) {
|
|
c.HostConfig.RestartPolicy.Name = policy
|
|
}
|
|
}
|
|
|
|
// WithUser sets the user
|
|
func WithUser(user string) func(c *TestContainerConfig) {
|
|
return func(c *TestContainerConfig) {
|
|
c.Config.User = user
|
|
}
|
|
}
|