From fe36a32c232941dbe1449d3b6160ecbca63c25bd Mon Sep 17 00:00:00 2001
From: Jim Perrin <jperrin@centos.org>
Date: Jul 02 2014 16:25:16 +0000
Subject: remove subscription dependency for docker operation


---

diff --git a/SOURCES/docker-0.11-remove-subscription-dependency.patch b/SOURCES/docker-0.11-remove-subscription-dependency.patch
new file mode 100644
index 0000000..a31c170
--- /dev/null
+++ b/SOURCES/docker-0.11-remove-subscription-dependency.patch
@@ -0,0 +1,71 @@
+From 248d8fe6b6b4b4706d5c8b14035d5a6847e88721 Mon Sep 17 00:00:00 2001
+From: Jim Perrin <jperrin@centos.org>
+Date: Thu, 26 Jun 2014 09:23:14 -0500
+Subject: [PATCH] remove subscription manager sharing between container and
+ host
+
+---
+ daemon/container.go | 12 ++++++------
+ daemon/volumes.go   |  2 +-
+ graph/graph.go      |  2 +-
+ 3 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/daemon/container.go b/daemon/container.go
+index ce84057..c182009 100644
+--- a/daemon/container.go
++++ b/daemon/container.go
+@@ -290,9 +290,9 @@ func (container *Container) Start() (err error) {
+ 	if err := populateCommand(container, env); err != nil {
+ 		return err
+ 	}
+-	if err := container.setupSecretFiles(); err != nil {
+-		return err
+-	}
++//	if err := container.setupSecretFiles(); err != nil {
++//		return err
++//	}
+ 	if err := setupMountsForContainer(container); err != nil {
+ 		return err
+ 	}
+@@ -308,9 +308,9 @@ func (container *Container) Start() (err error) {
+ 	}
+ 
+ 	// Now the container is running, unmount the secrets on the host
+-	if err := system.Unmount(container.secretsPath(), syscall.MNT_DETACH); err != nil {
+-		return err
+-	}
++//	if err := system.Unmount(container.secretsPath(), syscall.MNT_DETACH); err != nil {
++//		return err
++//	}
+ 
+ 	return nil
+ }
+diff --git a/daemon/volumes.go b/daemon/volumes.go
+index 7d92baf..7e9cadd 100644
+--- a/daemon/volumes.go
++++ b/daemon/volumes.go
+@@ -38,7 +38,7 @@ func setupMountsForContainer(container *Container) error {
+ 	mounts := []execdriver.Mount{
+ 		{container.daemon.sysInitPath, "/.dockerinit", false, true},
+ 		{container.ResolvConfPath, "/etc/resolv.conf", false, true},
+-		{container.secretsPath(), "/run/secrets", true, true},
++//		{container.secretsPath(), "/run/secrets", true, true},
+ 	}
+ 
+ 	if container.HostnamePath != "" {
+diff --git a/graph/graph.go b/graph/graph.go
+index f578ad9..06d714b 100644
+--- a/graph/graph.go
++++ b/graph/graph.go
+@@ -257,7 +257,7 @@ func SetupInitLayer(initLayer string) error {
+ 		"/dev/pts":         "dir",
+ 		"/dev/shm":         "dir",
+ 		"/proc":            "dir",
+-		"/run/secrets":     "dir",
++		//"/run/secrets":     "dir",
+ 		"/sys":             "dir",
+ 		"/.dockerinit":     "file",
+ 		"/.dockerenv":      "file",
+-- 
+1.8.3.1
+
diff --git a/SPECS/docker.spec b/SPECS/docker.spec
index fbf1641..cbcbdac 100644
--- a/SPECS/docker.spec
+++ b/SPECS/docker.spec
@@ -15,6 +15,8 @@ Summary:        Automates deployment of containerized applications
 License:        ASL 2.0
 
 Patch0:     remove-vendored-tar.patch
+Patch1:     docker-0.11-remove-subscription-dependency.patch
+
 URL:            http://www.docker.io
 # only x86_64 for now: https://github.com/dotcloud/docker/issues/136
 ExclusiveArch:  x86_64
@@ -65,6 +67,8 @@ servers, OpenStack clusters, public instances, or combinations of the above.
 %setup -q -n docker-%{commit}
 rm -rf vendor
 %patch0 -p1 -b remove-vendored-tar
+%patch1 -p1 -b remove-subscription-dependency
+
 tar zxf %{SOURCE2} 
 
 %build
@@ -127,10 +131,10 @@ install -p -m 644 %{SOURCE1} %{buildroot}%{_unitdir}
 install -d %{buildroot}%{_sysconfdir}/sysconfig/
 install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/docker
 
-# install secrets dir
-install -d -p -m 750 %{buildroot}/%{_datadir}/rhel/secrets
-ln -s %{_sysconfdir}/pki/entitlement %{buildroot}%{_datadir}/rhel/secrets/etc-pki-entitlement
-ln -s %{_sysconfdir}/yum.repos.d/redhat.repo %{buildroot}%{_datadir}/rhel/secrets/rhel7.repo
+# don't install secrets dir
+# install -d -p -m 750 %{buildroot}/%{_datadir}/rhel/secrets
+# ln -s %{_sysconfdir}/pki/entitlement %{buildroot}%{_datadir}/rhel/secrets/etc-pki-entitlement
+# ln -s %{_sysconfdir}/yum.repos.d/redhat.repo %{buildroot}%{_datadir}/rhel/secrets/rhel7.repo
 
 %pre
 getent group docker > /dev/null || %{_sbindir}/groupadd -r docker
@@ -152,10 +156,10 @@ exit 0
 %{_mandir}/man1/*
 %{_mandir}/man5/*
 %{_bindir}/docker
-%dir %{_datadir}/rhel
-%dir %{_datadir}/rhel/secrets
-%{_datadir}/rhel/secrets/etc-pki-entitlement
-%{_datadir}/rhel/secrets/rhel7.repo
+#%dir %{_datadir}/rhel
+#%dir %{_datadir}/rhel/secrets
+#%{_datadir}/rhel/secrets/etc-pki-entitlement
+#%{_datadir}/rhel/secrets/rhel7.repo
 %dir %{_libexecdir}/docker
 %{_libexecdir}/docker/dockerinit
 %{_unitdir}/docker.service