소스 검색

Fix read-write check for volumes.

Signed-off-by: David Calavera <david.calavera@gmail.com>
David Calavera 10 년 전
부모
커밋
82a54001fd
2개의 변경된 파일6개의 추가작업 그리고 1개의 파일을 삭제
  1. 1 1
      daemon/volumes.go
  2. 5 0
      volume/volume.go

+ 1 - 1
daemon/volumes.go

@@ -172,7 +172,7 @@ func (daemon *Daemon) registerMountPoints(container *Container, hostConfig *runc
 			cp := &mountPoint{
 			cp := &mountPoint{
 				Name:        m.Name,
 				Name:        m.Name,
 				Source:      m.Source,
 				Source:      m.Source,
-				RW:          m.RW && !roModes[mode],
+				RW:          m.RW && volume.ReadWrite(mode),
 				Driver:      m.Driver,
 				Driver:      m.Driver,
 				Destination: m.Destination,
 				Destination: m.Destination,
 			}
 			}

+ 5 - 0
volume/volume.go

@@ -50,3 +50,8 @@ var roModes = map[string]bool{
 func ValidateMountMode(mode string) (bool, bool) {
 func ValidateMountMode(mode string) (bool, bool) {
 	return roModes[mode] || rwModes[mode], rwModes[mode]
 	return roModes[mode] || rwModes[mode], rwModes[mode]
 }
 }
+
+// ReadOnly tells you if a mode string is a valid read-only mode or not.
+func ReadWrite(mode string) bool {
+	return rwModes[mode]
+}