mirror of https://github.com/docker/cli.git
Allow npipe volume type on stack file
Signed-off-by: Olli Janatuinen <olli.janatuinen@gmail.com>
This commit is contained in:
parent
2b221d8f1c
commit
0704d9a031
|
@ -122,6 +122,26 @@ func handleTmpfsToMount(volume composetypes.ServiceVolumeConfig) (mount.Mount, e
|
||||||
return result, nil
|
return result, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func handleNpipeToMount(volume composetypes.ServiceVolumeConfig) (mount.Mount, error) {
|
||||||
|
result := createMountFromVolume(volume)
|
||||||
|
|
||||||
|
if volume.Source == "" {
|
||||||
|
return mount.Mount{}, errors.New("invalid npipe source, source cannot be empty")
|
||||||
|
}
|
||||||
|
if volume.Volume != nil {
|
||||||
|
return mount.Mount{}, errors.New("volume options are incompatible with type npipe")
|
||||||
|
}
|
||||||
|
if volume.Tmpfs != nil {
|
||||||
|
return mount.Mount{}, errors.New("tmpfs options are incompatible with type npipe")
|
||||||
|
}
|
||||||
|
if volume.Bind != nil {
|
||||||
|
result.BindOptions = &mount.BindOptions{
|
||||||
|
Propagation: mount.Propagation(volume.Bind.Propagation),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return result, nil
|
||||||
|
}
|
||||||
|
|
||||||
func convertVolumeToMount(
|
func convertVolumeToMount(
|
||||||
volume composetypes.ServiceVolumeConfig,
|
volume composetypes.ServiceVolumeConfig,
|
||||||
stackVolumes volumes,
|
stackVolumes volumes,
|
||||||
|
@ -135,6 +155,8 @@ func convertVolumeToMount(
|
||||||
return handleBindToMount(volume)
|
return handleBindToMount(volume)
|
||||||
case "tmpfs":
|
case "tmpfs":
|
||||||
return handleTmpfsToMount(volume)
|
return handleTmpfsToMount(volume)
|
||||||
|
case "npipe":
|
||||||
|
return handleNpipeToMount(volume)
|
||||||
}
|
}
|
||||||
return mount.Mount{}, errors.New("volume type must be volume, bind, or tmpfs")
|
return mount.Mount{}, errors.New("volume type must be volume, bind, tmpfs or npipe")
|
||||||
}
|
}
|
||||||
|
|
|
@ -41,7 +41,7 @@ func TestConvertVolumeToMountUnapprovedType(t *testing.T) {
|
||||||
Target: "/foo/bar",
|
Target: "/foo/bar",
|
||||||
}
|
}
|
||||||
_, err := convertVolumeToMount(config, volumes{}, NewNamespace("foo"))
|
_, err := convertVolumeToMount(config, volumes{}, NewNamespace("foo"))
|
||||||
assert.Error(t, err, "volume type must be volume, bind, or tmpfs")
|
assert.Error(t, err, "volume type must be volume, bind, tmpfs or npipe")
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestConvertVolumeToMountConflictingOptionsBindInVolume(t *testing.T) {
|
func TestConvertVolumeToMountConflictingOptionsBindInVolume(t *testing.T) {
|
||||||
|
@ -343,3 +343,19 @@ func TestConvertTmpfsToMountVolumeWithSource(t *testing.T) {
|
||||||
_, err := convertVolumeToMount(config, volumes{}, NewNamespace("foo"))
|
_, err := convertVolumeToMount(config, volumes{}, NewNamespace("foo"))
|
||||||
assert.Error(t, err, "invalid tmpfs source, source must be empty")
|
assert.Error(t, err, "invalid tmpfs source, source must be empty")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestConvertVolumeToMountAnonymousNpipe(t *testing.T) {
|
||||||
|
config := composetypes.ServiceVolumeConfig{
|
||||||
|
Type: "npipe",
|
||||||
|
Source: `\\.\pipe\foo`,
|
||||||
|
Target: `\\.\pipe\foo`,
|
||||||
|
}
|
||||||
|
expected := mount.Mount{
|
||||||
|
Type: mount.TypeNamedPipe,
|
||||||
|
Source: `\\.\pipe\foo`,
|
||||||
|
Target: `\\.\pipe\foo`,
|
||||||
|
}
|
||||||
|
mount, err := convertVolumeToMount(config, volumes{}, NewNamespace("foo"))
|
||||||
|
assert.NilError(t, err)
|
||||||
|
assert.Check(t, is.DeepEqual(expected, mount))
|
||||||
|
}
|
||||||
|
|
|
@ -271,7 +271,7 @@ metadata](https://docs.docker.com/engine/userguide/labels-custom-metadata/).
|
||||||
Docker supports three different kinds of mounts, which allow containers to read
|
Docker supports three different kinds of mounts, which allow containers to read
|
||||||
from or write to files or directories, either on the host operating system, or
|
from or write to files or directories, either on the host operating system, or
|
||||||
on memory filesystems. These types are _data volumes_ (often referred to simply
|
on memory filesystems. These types are _data volumes_ (often referred to simply
|
||||||
as volumes), _bind mounts_, and _tmpfs_.
|
as volumes), _bind mounts_, _tmpfs_, and _named pipes_.
|
||||||
|
|
||||||
A **bind mount** makes a file or directory on the host available to the
|
A **bind mount** makes a file or directory on the host available to the
|
||||||
container it is mounted within. A bind mount may be either read-only or
|
container it is mounted within. A bind mount may be either read-only or
|
||||||
|
@ -291,6 +291,8 @@ You can back up or restore volumes using Docker commands.
|
||||||
|
|
||||||
A **tmpfs** mounts a tmpfs inside a container for volatile data.
|
A **tmpfs** mounts a tmpfs inside a container for volatile data.
|
||||||
|
|
||||||
|
A **npipe** mounts a named pipe from the host into the container.
|
||||||
|
|
||||||
Consider a situation where your image starts a lightweight web server. You could
|
Consider a situation where your image starts a lightweight web server. You could
|
||||||
use that image as a base image, copy in your website's HTML files, and package
|
use that image as a base image, copy in your website's HTML files, and package
|
||||||
that into another image. Each time your website changed, you'd need to update
|
that into another image. Each time your website changed, you'd need to update
|
||||||
|
@ -312,21 +314,22 @@ volumes in a service:
|
||||||
<th>Description</th>
|
<th>Description</th>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td><b>types</b></td>
|
<td><b>type</b></td>
|
||||||
<td></td>
|
<td></td>
|
||||||
<td>
|
<td>
|
||||||
<p>The type of mount, can be either <tt>volume</tt>, <tt>bind</tt>, or <tt>tmpfs</tt>. Defaults to <tt>volume</tt> if no type is specified.
|
<p>The type of mount, can be either <tt>volume</tt>, <tt>bind</tt>, <tt>tmpfs</tt>, or <tt>npipe</tt>. Defaults to <tt>volume</tt> if no type is specified.
|
||||||
<ul>
|
<ul>
|
||||||
<li><tt>volume</tt>: mounts a <a href="https://docs.docker.com/engine/reference/commandline/volume_create/">managed volume</a>
|
<li><tt>volume</tt>: mounts a <a href="https://docs.docker.com/engine/reference/commandline/volume_create/">managed volume</a>
|
||||||
into the container.</li> <li><tt>bind</tt>:
|
into the container.</li> <li><tt>bind</tt>:
|
||||||
bind-mounts a directory or file from the host into the container.</li>
|
bind-mounts a directory or file from the host into the container.</li>
|
||||||
<li><tt>tmpfs</tt>: mount a tmpfs in the container</li>
|
<li><tt>tmpfs</tt>: mount a tmpfs in the container</li>
|
||||||
|
<li><tt>npipe</tt>: mounts named pipe from the host into the container (Windows containers only).</li>
|
||||||
</ul></p>
|
</ul></p>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td><b>src</b> or <b>source</b></td>
|
<td><b>src</b> or <b>source</b></td>
|
||||||
<td>for <tt>type=bind</tt> only></td>
|
<td>for <tt>type=bind</tt> and <tt>type=npipe</tt></td>
|
||||||
<td>
|
<td>
|
||||||
<ul>
|
<ul>
|
||||||
<li>
|
<li>
|
||||||
|
|
Loading…
Reference in New Issue