GitList

Browse code

daemon: relabel secrets path

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
(cherry picked from commit b11af7b2f686fe3724d0cfce260000a3d2b8fbc1)
Signed-off-by: Brian Goff <cpuguy83@gmail.com>

Antonio Murdaca authored on 2017/04/12 00:43:23
Showing 1 changed files

daemon/container_operations_unix.go index 2296045..68cb072 100644

daemon/container_operations_unix.go

History View file @ 39372e6

@@ -213,6 +213,8 @@ func (daemon *Daemon) setupSecretDir(c *container.Container) (setupErr error) {
 		}
 	}
 
+	label.Relabel(localMountPath, c.MountLabel, false)
+
 	// remount secrets ro
 	if err := mount.Mount("tmpfs", localMountPath, "tmpfs", "remount,ro,"+tmpfsOwnership); err != nil {
 		return errors.Wrap(err, "unable to remount secret dir as readonly")

...	...	@@ -213,6 +213,8 @@ func (daemon Daemon) setupSecretDir(c container.Container) (setupErr error) {
213	213	}
214	214	}
215	215
	216	+ label.Relabel(localMountPath, c.MountLabel, false)
	217	+
216	218	// remount secrets ro
217	219	if err := mount.Mount("tmpfs", localMountPath, "tmpfs", "remount,ro,"+tmpfsOwnership); err != nil {
218	220	return errors.Wrap(err, "unable to remount secret dir as readonly")