Merge pull request #32409 from dnephin/support-consistency-params-in-compose

Add support for volume consistency in compose format
This commit is contained in:
Victor Vieux 2017-04-07 17:26:50 -07:00 committed by GitHub
commit fc6d8fb94d
6 changed files with 19 additions and 11 deletions

View File

@ -32,6 +32,7 @@ func convertVolumeToMount(
Source: volume.Source, Source: volume.Source,
Target: volume.Target, Target: volume.Target,
ReadOnly: volume.ReadOnly, ReadOnly: volume.ReadOnly,
Consistency: mount.Consistency(volume.Consistency),
} }
// Anonymous volumes // Anonymous volumes

View File

@ -220,6 +220,10 @@ services:
- ~/configs:/etc/configs/:ro - ~/configs:/etc/configs/:ro
# Named volume # Named volume
- datavolume:/var/lib/mysql - datavolume:/var/lib/mysql
- type: bind
source: ./opt
target: /opt
consistency: cached
working_dir: /code working_dir: /code

View File

@ -910,6 +910,7 @@ func TestFullExample(t *testing.T) {
{Source: workingDir + "/static", Target: "/var/www/html", Type: "bind"}, {Source: workingDir + "/static", Target: "/var/www/html", Type: "bind"},
{Source: homeDir + "/configs", Target: "/etc/configs/", Type: "bind", ReadOnly: true}, {Source: homeDir + "/configs", Target: "/etc/configs/", Type: "bind", ReadOnly: true},
{Source: "datavolume", Target: "/var/lib/mysql", Type: "volume"}, {Source: "datavolume", Target: "/var/lib/mysql", Type: "volume"},
{Source: workingDir + "/opt", Target: "/opt", Consistency: "cached", Type: "bind"},
}, },
WorkingDir: "/code", WorkingDir: "/code",
} }

File diff suppressed because one or more lines are too long

View File

@ -249,6 +249,7 @@
"source": {"type": "string"}, "source": {"type": "string"},
"target": {"type": "string"}, "target": {"type": "string"},
"read_only": {"type": "boolean"}, "read_only": {"type": "boolean"},
"consistency": {"type": "string"},
"bind": { "bind": {
"type": "object", "type": "object",
"properties": { "properties": {

View File

@ -233,6 +233,7 @@ type ServiceVolumeConfig struct {
Source string Source string
Target string Target string
ReadOnly bool `mapstructure:"read_only"` ReadOnly bool `mapstructure:"read_only"`
Consistency string
Bind *ServiceVolumeBind Bind *ServiceVolumeBind
Volume *ServiceVolumeVolume Volume *ServiceVolumeVolume
} }