Skip to content

Commit

Permalink
don't set propagation if target engine isn't linux
Browse files Browse the repository at this point in the history 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
  • Loading branch information
@ndeloof @glours
ndeloof authored and glours committed Sep 18, 2024
1 parent 20404db commit c16df17
Show file tree
Hide file tree
Showing 3 changed files with 67 additions and 39 deletions.
17 changes: 17 additions & 0 deletions pkg/compose/compose.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,23 @@ func (s *composeService) RuntimeVersion(ctx context.Context) (string, error) {

}

var windowsContainer = struct {
once sync.Once
val bool
err error
}{}

func (s *composeService) isWindowsContainer(ctx context.Context) (bool, error) {
windowsContainer.once.Do(func() {
info, err := s.apiClient().Info(ctx)
if err != nil {
windowsContainer.err = err
}
windowsContainer.val = info.OSType == "windows"
})
return windowsContainer.val, windowsContainer.err
}

func (s *composeService) isDesktopIntegrationActive() bool {
return s.desktopCli != nil
}
Expand Down
73 changes: 40 additions & 33 deletions pkg/compose/create.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -801,7 +801,7 @@ func (s *composeService) buildContainerVolumes(
return nil, nil, err
}

mountOptions, err := buildContainerMountOptions(p, service, imgInspect, inherit)
mountOptions, err := s.buildContainerMountOptions(ctx, p, service, imgInspect, inherit)
if err != nil {
return nil, nil, err
}
Expand Down Expand Up @@ -834,7 +834,7 @@ MOUNTS:
return binds, mounts, nil
}

func buildContainerMountOptions(p types.Project, s types.ServiceConfig, img moby.ImageInspect, inherit *moby.Container) ([]mount.Mount, error) {
func (s *composeService) buildContainerMountOptions(ctx context.Context, p types.Project, service types.ServiceConfig, img moby.ImageInspect, inherit *moby.Container) ([]mount.Mount, error) {
var mounts = map[string]mount.Mount{}
if inherit != nil {
for _, m := range inherit.Mounts {
Expand All @@ -859,7 +859,7 @@ func buildContainerMountOptions(p types.Project, s types.ServiceConfig, img moby
}
}
volumes := []types.ServiceVolumeConfig{}
for _, v := range s.Volumes {
for _, v := range service.Volumes {
if v.Target != m.Destination || v.Source != "" {
volumes = append(volumes, v)
continue
Expand All @@ -872,11 +872,11 @@ func buildContainerMountOptions(p types.Project, s types.ServiceConfig, img moby
ReadOnly: !m.RW,
}
}
s.Volumes = volumes
service.Volumes = volumes
}
}

mounts, err := fillBindMounts(p, s, mounts)
mounts, err := s.fillBindMounts(ctx, p, service, mounts)
if err != nil {
return nil, err
}
Expand All @@ -888,27 +888,27 @@ func buildContainerMountOptions(p types.Project, s types.ServiceConfig, img moby
return values, nil
}

func fillBindMounts(p types.Project, s types.ServiceConfig, m map[string]mount.Mount) (map[string]mount.Mount, error) {
for _, v := range s.Volumes {
bindMount, err := buildMount(p, v)
func (s *composeService) fillBindMounts(ctx context.Context, p types.Project, service types.ServiceConfig, m map[string]mount.Mount) (map[string]mount.Mount, error) {
for _, v := range service.Volumes {
bindMount, err := s.buildMount(ctx, p, v)
if err != nil {
return nil, err
}
m[bindMount.Target] = bindMount
}

secrets, err := buildContainerSecretMounts(p, s)
secrets, err := s.buildContainerSecretMounts(ctx, p, service)
if err != nil {
return nil, err
}
for _, s := range secrets {
if _, found := m[s.Target]; found {
for _, secret := range secrets {
if _, found := m[secret.Target]; found {
continue
}
m[s.Target] = s
m[secret.Target] = secret
}

configs, err := buildContainerConfigMounts(p, s)
configs, err := s.buildContainerConfigMounts(ctx, p, service)
if err != nil {
return nil, err
}
Expand All @@ -921,11 +921,11 @@ func fillBindMounts(p types.Project, s types.ServiceConfig, m map[string]mount.M
return m, nil
}

func buildContainerConfigMounts(p types.Project, s types.ServiceConfig) ([]mount.Mount, error) {
func (s *composeService) buildContainerConfigMounts(ctx context.Context, p types.Project, service types.ServiceConfig) ([]mount.Mount, error) {
var mounts = map[string]mount.Mount{}

configsBaseDir := "/"
for _, config := range s.Configs {
for _, config := range service.Configs {
target := config.Target
if config.Target == "" {
target = configsBaseDir + config.Source
Expand Down Expand Up @@ -953,7 +953,7 @@ func buildContainerConfigMounts(p types.Project, s types.ServiceConfig) ([]mount
continue
}

bindMount, err := buildMount(p, types.ServiceVolumeConfig{
bindMount, err := s.buildMount(ctx, p, types.ServiceVolumeConfig{
Type: types.VolumeTypeBind,
Source: definedConfig.File,
Target: target,
Expand All @@ -971,11 +971,11 @@ func buildContainerConfigMounts(p types.Project, s types.ServiceConfig) ([]mount
return values, nil
}

func buildContainerSecretMounts(p types.Project, s types.ServiceConfig) ([]mount.Mount, error) {
func (s *composeService) buildContainerSecretMounts(ctx context.Context, p types.Project, service types.ServiceConfig) ([]mount.Mount, error) {
var mounts = map[string]mount.Mount{}

secretsDir := "/run/secrets/"
for _, secret := range s.Secrets {
for _, secret := range service.Secrets {
target := secret.Target
if secret.Target == "" {
target = secretsDir + secret.Source
Expand Down Expand Up @@ -1003,7 +1003,7 @@ func buildContainerSecretMounts(p types.Project, s types.ServiceConfig) ([]mount
continue
}

mnt, err := buildMount(p, types.ServiceVolumeConfig{
mnt, err := s.buildMount(ctx, p, types.ServiceVolumeConfig{
Type: types.VolumeTypeBind,
Source: definedSecret.File,
Target: target,
Expand Down Expand Up @@ -1039,7 +1039,7 @@ func isWindowsAbs(p string) bool {
return false
}

func buildMount(project types.Project, volume types.ServiceVolumeConfig) (mount.Mount, error) {
func (s *composeService) buildMount(ctx context.Context, project types.Project, volume types.ServiceVolumeConfig) (mount.Mount, error) {
source := volume.Source
// on windows, filepath.IsAbs(source) is false for unix style abs path like /var/run/docker.sock.
// do not replace these with filepath.Abs(source) that will include a default drive.
Expand All @@ -1060,7 +1060,10 @@ func buildMount(project types.Project, volume types.ServiceVolumeConfig) (mount.
}
}

bind, vol, tmpfs := buildMountOptions(volume)
bind, vol, tmpfs, err := s.buildMountOptions(ctx, volume)
if err != nil {
return mount.Mount{}, err
}

volume.Target = path.Clean(volume.Target)

Expand All @@ -1080,7 +1083,7 @@ func buildMount(project types.Project, volume types.ServiceVolumeConfig) (mount.
}, nil
}

func buildMountOptions(volume types.ServiceVolumeConfig) (*mount.BindOptions, *mount.VolumeOptions, *mount.TmpfsOptions) {
func (s *composeService) buildMountOptions(ctx context.Context, volume types.ServiceVolumeConfig) (*mount.BindOptions, *mount.VolumeOptions, *mount.TmpfsOptions, error) {
switch volume.Type {
case "bind":
if volume.Volume != nil {
Expand All @@ -1089,43 +1092,47 @@ func buildMountOptions(volume types.ServiceVolumeConfig) (*mount.BindOptions, *m
if volume.Tmpfs != nil {
logrus.Warnf("mount of type `bind` should not define `tmpfs` option")
}
return buildBindOption(volume.Bind), nil, nil
option, err := s.buildBindOption(ctx, volume.Bind)
return option, nil, nil, err
case "volume":
if volume.Bind != nil {
logrus.Warnf("mount of type `volume` should not define `bind` option")
}
if volume.Tmpfs != nil {
logrus.Warnf("mount of type `volume` should not define `tmpfs` option")
}
return nil, buildVolumeOptions(volume.Volume), nil
return nil, buildVolumeOptions(volume.Volume), nil, nil
case "tmpfs":
if volume.Bind != nil {
logrus.Warnf("mount of type `tmpfs` should not define `bind` option")
}
if volume.Volume != nil {
logrus.Warnf("mount of type `tmpfs` should not define `volume` option")
}
return nil, nil, buildTmpfsOptions(volume.Tmpfs)
return nil, nil, buildTmpfsOptions(volume.Tmpfs), nil
}
return nil, nil, nil
return nil, nil, nil, nil
}

func buildBindOption(bind *types.ServiceVolumeBind) *mount.BindOptions {
func (s *composeService) buildBindOption(ctx context.Context, bind *types.ServiceVolumeBind) (*mount.BindOptions, error) {
if bind == nil {
return nil
return nil, nil
}

// I miss ternary operator
propagation := types.PropagationRPrivate
if bind.Propagation != "" {
propagation = bind.Propagation
propagation := bind.Propagation
isWindowsContainer, err := s.isWindowsContainer(ctx)
if err != nil {
return nil, err
}
if propagation == "" && !isWindowsContainer {
propagation = types.PropagationRPrivate
}

return &mount.BindOptions{
Propagation: mount.Propagation(propagation),
CreateMountpoint: bind.CreateHostPath,
// NonRecursive: false, FIXME missing from model ?
}
}, nil
}

func buildVolumeOptions(vol *types.ServiceVolumeVolume) *mount.VolumeOptions {
Expand Down
16 changes: 10 additions & 6 deletions pkg/compose/create_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package compose

import (
"context"
"os"
"path/filepath"
"sort"
Expand All @@ -41,7 +42,8 @@ func TestBuildBindMount(t *testing.T) {
Source: "",
Target: "/data",
}
mount, err := buildMount(project, volume)
s := composeService{}
mount, err := s.buildMount(context.TODO(), project, volume)
assert.NilError(t, err)
assert.Assert(t, filepath.IsAbs(mount.Source))
_, err = os.Stat(mount.Source)
Expand All @@ -56,7 +58,8 @@ func TestBuildNamedPipeMount(t *testing.T) {
Source: "\\\\.\\pipe\\docker_engine_windows",
Target: "\\\\.\\pipe\\docker_engine",
}
mount, err := buildMount(project, volume)
s := composeService{}
mount, err := s.buildMount(context.TODO(), project, volume)
assert.NilError(t, err)
assert.Equal(t, mount.Type, mountTypes.TypeNamedPipe)
}
Expand All @@ -75,7 +78,8 @@ func TestBuildVolumeMount(t *testing.T) {
Source: "myVolume",
Target: "/data",
}
mount, err := buildMount(project, volume)
s := composeService{}
mount, err := s.buildMount(context.TODO(), project, volume)
assert.NilError(t, err)
assert.Equal(t, mount.Source, "myProject_myVolume")
assert.Equal(t, mount.Type, mountTypes.TypeVolume)
Expand Down Expand Up @@ -152,8 +156,8 @@ func TestBuildContainerMountOptions(t *testing.T) {
},
},
}

mounts, err := buildContainerMountOptions(project, project.Services["myService"], moby.ImageInspect{}, inherit)
s := composeService{}
mounts, err := s.buildContainerMountOptions(context.TODO(), project, project.Services["myService"], moby.ImageInspect{}, inherit)
sort.Slice(mounts, func(i, j int) bool {
return mounts[i].Target < mounts[j].Target
})
Expand All @@ -165,7 +169,7 @@ func TestBuildContainerMountOptions(t *testing.T) {
assert.Equal(t, mounts[2].VolumeOptions.Subpath, "etc")
assert.Equal(t, mounts[3].Target, "\\\\.\\pipe\\docker_engine")

mounts, err = buildContainerMountOptions(project, project.Services["myService"], moby.ImageInspect{}, inherit)
mounts, err = s.buildContainerMountOptions(context.TODO(), project, project.Services["myService"], moby.ImageInspect{}, inherit)
sort.Slice(mounts, func(i, j int) bool {
return mounts[i].Target < mounts[j].Target
})
Expand Down

0 comments on commit c16df17

Please sign in to comment.