|
 |
fe36a3 |
From 248d8fe6b6b4b4706d5c8b14035d5a6847e88721 Mon Sep 17 00:00:00 2001
|
|
|
fe36a3 |
From: Jim Perrin <jperrin@centos.org>
|
|
|
fe36a3 |
Date: Thu, 26 Jun 2014 09:23:14 -0500
|
|
|
fe36a3 |
Subject: [PATCH] remove subscription manager sharing between container and
|
|
|
fe36a3 |
host
|
|
|
fe36a3 |
|
|
|
fe36a3 |
---
|
|
|
fe36a3 |
daemon/container.go | 12 ++++++------
|
|
|
fe36a3 |
daemon/volumes.go | 2 +-
|
|
|
fe36a3 |
graph/graph.go | 2 +-
|
|
|
fe36a3 |
3 files changed, 8 insertions(+), 8 deletions(-)
|
|
|
fe36a3 |
|
|
|
fe36a3 |
diff --git a/daemon/container.go b/daemon/container.go
|
|
|
fe36a3 |
index ce84057..c182009 100644
|
|
|
fe36a3 |
--- a/daemon/container.go
|
|
|
fe36a3 |
+++ b/daemon/container.go
|
|
|
fe36a3 |
@@ -290,9 +290,9 @@ func (container *Container) Start() (err error) {
|
|
|
fe36a3 |
if err := populateCommand(container, env); err != nil {
|
|
|
fe36a3 |
return err
|
|
|
fe36a3 |
}
|
|
|
fe36a3 |
- if err := container.setupSecretFiles(); err != nil {
|
|
|
fe36a3 |
- return err
|
|
|
fe36a3 |
- }
|
|
|
fe36a3 |
+// if err := container.setupSecretFiles(); err != nil {
|
|
|
fe36a3 |
+// return err
|
|
|
fe36a3 |
+// }
|
|
|
fe36a3 |
if err := setupMountsForContainer(container); err != nil {
|
|
|
fe36a3 |
return err
|
|
|
fe36a3 |
}
|
|
|
fe36a3 |
@@ -308,9 +308,9 @@ func (container *Container) Start() (err error) {
|
|
|
fe36a3 |
}
|
|
|
fe36a3 |
|
|
|
fe36a3 |
// Now the container is running, unmount the secrets on the host
|
|
|
fe36a3 |
- if err := system.Unmount(container.secretsPath(), syscall.MNT_DETACH); err != nil {
|
|
|
fe36a3 |
- return err
|
|
|
fe36a3 |
- }
|
|
|
fe36a3 |
+// if err := system.Unmount(container.secretsPath(), syscall.MNT_DETACH); err != nil {
|
|
|
fe36a3 |
+// return err
|
|
|
fe36a3 |
+// }
|
|
|
fe36a3 |
|
|
|
fe36a3 |
return nil
|
|
|
fe36a3 |
}
|
|
|
fe36a3 |
diff --git a/daemon/volumes.go b/daemon/volumes.go
|
|
|
fe36a3 |
index 7d92baf..7e9cadd 100644
|
|
|
fe36a3 |
--- a/daemon/volumes.go
|
|
|
fe36a3 |
+++ b/daemon/volumes.go
|
|
|
fe36a3 |
@@ -38,7 +38,7 @@ func setupMountsForContainer(container *Container) error {
|
|
|
fe36a3 |
mounts := []execdriver.Mount{
|
|
|
fe36a3 |
{container.daemon.sysInitPath, "/.dockerinit", false, true},
|
|
|
fe36a3 |
{container.ResolvConfPath, "/etc/resolv.conf", false, true},
|
|
|
fe36a3 |
- {container.secretsPath(), "/run/secrets", true, true},
|
|
|
fe36a3 |
+// {container.secretsPath(), "/run/secrets", true, true},
|
|
|
fe36a3 |
}
|
|
|
fe36a3 |
|
|
|
fe36a3 |
if container.HostnamePath != "" {
|
|
|
fe36a3 |
diff --git a/graph/graph.go b/graph/graph.go
|
|
|
fe36a3 |
index f578ad9..06d714b 100644
|
|
|
fe36a3 |
--- a/graph/graph.go
|
|
|
fe36a3 |
+++ b/graph/graph.go
|
|
|
fe36a3 |
@@ -257,7 +257,7 @@ func SetupInitLayer(initLayer string) error {
|
|
|
fe36a3 |
"/dev/pts": "dir",
|
|
|
fe36a3 |
"/dev/shm": "dir",
|
|
|
fe36a3 |
"/proc": "dir",
|
|
|
fe36a3 |
- "/run/secrets": "dir",
|
|
|
fe36a3 |
+ //"/run/secrets": "dir",
|
|
|
fe36a3 |
"/sys": "dir",
|
|
|
fe36a3 |
"/.dockerinit": "file",
|
|
|
fe36a3 |
"/.dockerenv": "file",
|
|
|
fe36a3 |
--
|
|
|
fe36a3 |
1.8.3.1
|
|
|
fe36a3 |
|