Windows: Block read-only

John Howard · John Howard · commit 6f7dc65847c4 · 2017-05-08T09:29:37.000-07:00
Signed-off-by: John Howard &lt;jhoward@microsoft.com&gt;
diff --git a/runconfig/config.go b/runconfig/config.go
@@ -79,6 +79,11 @@ func DecodeContainerConfig(src io.Reader) (*container.Config, *container.HostCon
 		return nil, nil, nil, err
 	}
 
+	// Validate ReadonlyRootfs
+	if err := validateReadonlyRootfs(hc); err != nil {
+		return nil, nil, nil, err
+	}
+
 	return w.Config, hc, w.NetworkingConfig, nil
 }
 
diff --git a/runconfig/hostconfig_unix.go b/runconfig/hostconfig_unix.go
@@ -103,3 +103,8 @@ func validateResources(hc *container.HostConfig, si *sysinfo.SysInfo) error {
 func validatePrivileged(hc *container.HostConfig) error {
 	return nil
 }
+
+// validateReadonlyRootfs performs platform specific validation of the ReadonlyRootfs setting
+func validateReadonlyRootfs(hc *container.HostConfig) error {
+	return nil
+}
diff --git a/runconfig/hostconfig_windows.go b/runconfig/hostconfig_windows.go
@@ -82,3 +82,15 @@ func validatePrivileged(hc *container.HostConfig) error {
 	}
 	return nil
 }
+
+// validateReadonlyRootfs performs platform specific validation of the ReadonlyRootfs setting
+func validateReadonlyRootfs(hc *container.HostConfig) error {
+	// We may not be passed a host config, such as in the case of docker commit
+	if hc == nil {
+		return nil
+	}
+	if hc.ReadonlyRootfs {
+		return fmt.Errorf("invalid --read-only: Windows does not support this feature")
+	}
+	return nil
+}

Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,11 @@ func DecodeContainerConfig(src io.Reader) (container.Config, container.HostCon`
`79`	`79`	`return nil, nil, nil, err`
`80`	`80`	`}`
`81`	`81`
	`82`	`+ // Validate ReadonlyRootfs`
	`83`	`+ if err := validateReadonlyRootfs(hc); err != nil {`
	`84`	`+ return nil, nil, nil, err`
	`85`	`+ }`
	`86`	`+`
`82`	`87`	`return w.Config, hc, w.NetworkingConfig, nil`
`83`	`88`	`}`
`84`	`89`
Original file line number	Diff line number	Diff line change
`@@ -103,3 +103,8 @@ func validateResources(hc container.HostConfig, si sysinfo.SysInfo) error {`
`103`	`103`	`func validatePrivileged(hc *container.HostConfig) error {`
`104`	`104`	`return nil`
`105`	`105`	`}`
	`106`	`+`
	`107`	`+// validateReadonlyRootfs performs platform specific validation of the ReadonlyRootfs setting`
	`108`	`+func validateReadonlyRootfs(hc *container.HostConfig) error {`
	`109`	`+ return nil`
	`110`	`+}`