0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

integration/internal: use strings.Cut() and minor refactor

Browse source 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2022-11-01 10:38:14 +01:00
parent 39f59c3289
commit ebda2fa2b5
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
integration/internal/container/ops.go
View file

@ -1,7 +1,6 @@
package container
import (
"fmt"
"strings"
containertypes "github.com/docker/docker/api/types/container"
@ -91,23 +90,20 @@ func WithVolume(target string) func(*TestContainerConfig) {
// 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))
c.HostConfig.Binds = append(c.HostConfig.Binds, src+":"+target)
}
}
// WithTmpfs sets a target path in the container to a tmpfs
func WithTmpfs(target string) func(config *TestContainerConfig) {
// WithTmpfs sets a target path in the container to a tmpfs, with optional options
// (separated with a colon).
func WithTmpfs(targetAndOpts 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
target, opts, _ := strings.Cut(targetAndOpts, ":")
c.HostConfig.Tmpfs[target] = opts
}
}