[docker-io] adding the patch for -b=none bumping the version

Vincent Batts vbatts at fedoraproject.org
Wed Nov 20 14:32:34 UTC 2013


commit f24aa864d133e250f67006410b45a383a4801a41
Author: Vincent Batts <vbatts at redhat.com>
Date:   Wed Nov 20 09:30:44 2013 -0500

    adding the patch for -b=none
    bumping the version

 docker-bridge_flag.patch |   16 ++++++++++++++++
 docker-io.spec           |    7 ++++++-
 2 files changed, 22 insertions(+), 1 deletions(-)
---
diff --git a/docker-bridge_flag.patch b/docker-bridge_flag.patch
new file mode 100644
index 0000000..21c69ed
--- /dev/null
+++ b/docker-bridge_flag.patch
@@ -0,0 +1,16 @@
+diff --git a/server.go b/server.go
+index 768f73a..f9bd884 100644
+--- a/server.go
++++ b/server.go
+@@ -63,7 +63,10 @@ func jobInitApi(job *engine.Job) string {
+ 	}()
+ 	job.Eng.Hack_SetGlobalVar("httpapi.server", srv)
+ 	job.Eng.Hack_SetGlobalVar("httpapi.runtime", srv.runtime)
+-	job.Eng.Hack_SetGlobalVar("httpapi.bridgeIP", srv.runtime.networkManager.bridgeNetwork.IP)
++	// https://github.com/dotcloud/docker/issues/2768
++	if srv.runtime.networkManager.bridgeNetwork != nil {
++		job.Eng.Hack_SetGlobalVar("httpapi.bridgeIP", srv.runtime.networkManager.bridgeNetwork.IP)
++	}
+ 	if err := job.Eng.Register("create", srv.ContainerCreate); err != nil {
+ 		return err.Error()
+ 	}
diff --git a/docker-io.spec b/docker-io.spec
index 7b7c4df..8d20067 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -11,12 +11,13 @@
 
 Name:           docker-io
 Version:        0.7
-Release:        0.15.rc6%{?dist}
+Release:        0.16.rc6%{?dist}
 Summary:        Automates deployment of containerized applications
 License:        ASL 2.0
 
 Patch0:         docker-0.7-remove-dotcloud-tar.patch
 Patch1:         docker-0.7-el6-docs.patch
+Patch2:         docker-bridge_flag.patch
 URL:            http://www.docker.io
 # only x86_64 for now: https://github.com/dotcloud/docker/issues/136
 ExclusiveArch:  x86_64
@@ -60,6 +61,7 @@ rm -rf vendor
 %if 0%{?rhel} >= 6
 %patch1 -p1 -b docker-0.7-el6-docs.patch
 %endif
+%patch2 -p1 -b none-bridge
 
 %build
 mkdir _build
@@ -145,6 +147,9 @@ fi
 %dir %{_sharedstatedir}/docker
 
 %changelog
+* Wed Nov 20 2013 Vincent Batts <vbatts at redhat.com> - 0.7-0.16.rc6
+- adding back the none bridge patch
+
 * Wed Nov 20 2013 Vincent Batts <vbatts at redhat.com> - 0.7-0.15.rc6
 - update docker source to crosbymichael/0.7.0-rc6
 - bridge-patch is not needed on this branch


More information about the scm-commits mailing list