Skip to content
This repository was archived by the owner on Nov 27, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 61 additions & 6 deletions local/compose/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -388,36 +388,91 @@ func buildContainerMountOptions(p types.Project, s types.ServiceConfig, img moby
}
if img.ContainerConfig != nil {
for k := range img.ContainerConfig.Volumes {
mount, err := buildMount(p, types.ServiceVolumeConfig{
m, err := buildMount(p, types.ServiceVolumeConfig{
Type: types.VolumeTypeVolume,
Target: k,
})
if err != nil {
return nil, err
}
mounts[k] = mount
mounts[k] = m

}
}

mounts, err := fillBindMounts(p, s, mounts)
if err != nil {
return nil, err
}

values := make([]mount.Mount, 0, len(mounts))
for _, v := range mounts {
values = append(values, v)
}
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 {
mount, err := buildMount(p, v)
bindMount, err := buildMount(p, v)
if err != nil {
return nil, err
}
mounts[mount.Target] = mount
m[bindMount.Target] = bindMount
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll never get used with this golang habit to use single letter variables...

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same for me... Javaist thing probably :)

}

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

configs, err := buildContainerConfigMounts(p, s)
if err != nil {
return nil, err
}
for _, c := range configs {
if _, found := m[c.Target]; found {
continue
}
mounts[s.Target] = s
m[c.Target] = c
}
return m, nil
}

func buildContainerConfigMounts(p types.Project, s types.ServiceConfig) ([]mount.Mount, error) {
var mounts = map[string]mount.Mount{}

configsBaseDir := "/"
for _, config := range s.Configs {
target := config.Target
if config.Target == "" {
target = filepath.Join(configsBaseDir, config.Source)
} else if !filepath.IsAbs(config.Target) {
target = filepath.Join(configsBaseDir, config.Target)
}

definedConfig := p.Configs[config.Source]
if definedConfig.External.External {
return nil, fmt.Errorf("unsupported external config %s", definedConfig.Name)
}

bindMount, err := buildMount(p, types.ServiceVolumeConfig{
Type: types.VolumeTypeBind,
Source: definedConfig.File,
Target: target,
ReadOnly: true,
})
if err != nil {
return nil, err
}
mounts[target] = bindMount
}
values := make([]mount.Mount, 0, len(mounts))
for _, v := range mounts {
values = append(values, v)
Expand Down
1 change: 1 addition & 0 deletions local/e2e/compose/compose_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,7 @@ func TestLocalComposeVolume(t *testing.T) {
output := res.Stdout()
// nolint
assert.Assert(t, strings.Contains(output, `"Destination":"/usr/src/app/node_modules","Driver":"local","Mode":"","RW":true,"Propagation":""`), output)
assert.Assert(t, strings.Contains(output, `"Destination":"/myconfig","Mode":"","RW":false,"Propagation":"rprivate"`), output)
})

t.Run("check container bind-mounts specs", func(t *testing.T) {
Expand Down
8 changes: 7 additions & 1 deletion local/e2e/compose/fixtures/volume-test/compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,14 @@ services:
- otherVol:/usr/share/nginx/test
ports:
- 9090:80
configs:
- myconfig

volumes:
staticVol:
otherVol:
name: myVolume
name: myVolume

configs:
myconfig:
file: ./static/index.html