Support bind and tmpfs docker mounts #4924
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1733,6 +1733,173 @@ func TestDockerDriver_Mounts(t *testing.T) { | |
| } | ||
| } | ||
|
|
||
| func TestDockerDriver_MountsSerialization(t *testing.T) { | ||
| t.Parallel() | ||
|
|
||
| allocDir := "/tmp/nomad/alloc-dir" | ||
|
|
||
| cases := []struct { | ||
| name string | ||
| requiresVolumes bool | ||
| passedMounts []DockerMount | ||
| expectedMounts []docker.HostMount | ||
| }{ | ||
| { | ||
| name: "basic volume", | ||
| passedMounts: []DockerMount{ | ||
| { | ||
| Target: "/nomad", | ||
| ReadOnly: true, | ||
| Source: "test", | ||
| }, | ||
| }, | ||
| expectedMounts: []docker.HostMount{ | ||
| { | ||
| Type: "volume", | ||
| Target: "/nomad", | ||
| Source: "test", | ||
| ReadOnly: true, | ||
| VolumeOptions: &docker.VolumeOptions{}, | ||
| }, | ||
| }, | ||
| }, | ||
| { | ||
| name: "basic bind", | ||
| passedMounts: []DockerMount{ | ||
| { | ||
| Type: "bind", | ||
| Target: "/nomad", | ||
| Source: "test", | ||
| }, | ||
| }, | ||
| expectedMounts: []docker.HostMount{ | ||
| { | ||
| Type: "bind", | ||
| Target: "/nomad", | ||
| Source: "/tmp/nomad/alloc-dir/demo/test", | ||
| BindOptions: &docker.BindOptions{}, | ||
| }, | ||
| }, | ||
| }, | ||
| { | ||
| name: "basic absolute bind", | ||
| requiresVolumes: true, | ||
| passedMounts: []DockerMount{ | ||
| { | ||
| Type: "bind", | ||
| Target: "/nomad", | ||
| Source: "/tmp/test", | ||
| }, | ||
| }, | ||
| expectedMounts: []docker.HostMount{ | ||
| { | ||
| Type: "bind", | ||
| Target: "/nomad", | ||
| Source: "/tmp/test", | ||
| BindOptions: &docker.BindOptions{}, | ||
| }, | ||
| }, | ||
| }, | ||
| { | ||
|
|
||
| // FIXME: This needs to be true but we have a bug with security implications. | ||
| // The relative paths check should restrict access to alloc-dir subtree | ||
| // documenting existing behavior in test here and need to follow up in another commit | ||
| requiresVolumes: false, | ||
|
There was a problem hiding this comment. Can we just get this fixed up now with a call to PathEscapesAllocDir? There was a problem hiding this comment. Intend to follow up in a separate PR to audit all paths where it's a possibility and to add dedicated CHANGELOG item for it. |
||
|
|
||
| name: "bind relative outside", | ||
| passedMounts: []DockerMount{ | ||
| { | ||
| Type: "bind", | ||
| Target: "/nomad", | ||
| Source: "../../test", | ||
| }, | ||
| }, | ||
| expectedMounts: []docker.HostMount{ | ||
| { | ||
| Type: "bind", | ||
| Target: "/nomad", | ||
| Source: "/tmp/nomad/test", | ||
| BindOptions: &docker.BindOptions{}, | ||
| }, | ||
| }, | ||
| }, | ||
| { | ||
| name: "basic tmpfs", | ||
| requiresVolumes: false, | ||
| passedMounts: []DockerMount{ | ||
| { | ||
| Type: "tmpfs", | ||
| Target: "/nomad", | ||
| TmpfsOptions: DockerTmpfsOptions{ | ||
| SizeBytes: 321, | ||
| Mode: 0666, | ||
| }, | ||
| }, | ||
| }, | ||
| expectedMounts: []docker.HostMount{ | ||
| { | ||
| Type: "tmpfs", | ||
| Target: "/nomad", | ||
| TempfsOptions: &docker.TempfsOptions{ | ||
| SizeBytes: 321, | ||
| Mode: 0666, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| t.Run("with volumes enabled", func(t *testing.T) { | ||
| dh := dockerDriverHarness(t, nil) | ||
| driver := dh.Impl().(*Driver) | ||
| driver.config.Volumes.Enabled = true | ||
|
|
||
| for _, c := range cases { | ||
| t.Run(c.name, func(t *testing.T) { | ||
| task, cfg, _ := dockerTask(t) | ||
| cfg.Mounts = c.passedMounts | ||
|
|
||
| task.AllocDir = allocDir | ||
| task.Name = "demo" | ||
|
|
||
| require.NoError(t, task.EncodeConcreteDriverConfig(cfg)) | ||
|
|
||
| cc, err := driver.createContainerConfig(task, cfg, "org/repo:0.1") | ||
| require.NoError(t, err) | ||
| require.EqualValues(t, c.expectedMounts, cc.HostConfig.Mounts) | ||
| }) | ||
| } | ||
| }) | ||
|
|
||
| t.Run("with volumes disabled", func(t *testing.T) { | ||
| dh := dockerDriverHarness(t, nil) | ||
| driver := dh.Impl().(*Driver) | ||
| driver.config.Volumes.Enabled = false | ||
|
|
||
| for _, c := range cases { | ||
| t.Run(c.name, func(t *testing.T) { | ||
| task, cfg, _ := dockerTask(t) | ||
| cfg.Mounts = c.passedMounts | ||
|
|
||
| task.AllocDir = allocDir | ||
| task.Name = "demo" | ||
|
|
||
| require.NoError(t, task.EncodeConcreteDriverConfig(cfg)) | ||
|
|
||
| cc, err := driver.createContainerConfig(task, cfg, "org/repo:0.1") | ||
| if c.requiresVolumes { | ||
| require.Error(t, err, "volumes are not enabled") | ||
| } else { | ||
| require.NoError(t, err) | ||
| require.EqualValues(t, c.expectedMounts, cc.HostConfig.Mounts) | ||
| } | ||
| }) | ||
| } | ||
| }) | ||
|
|
||
| } | ||
|
|
||
| // TestDockerDriver_Cleanup ensures Cleanup removes only downloaded images. | ||
| func TestDockerDriver_Cleanup(t *testing.T) { | ||
| if !testutil.DockerIsConnected(t) { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not related to PR - but noticed that
volume_optionsis expected to be a single block not a collection.