From 2de0bdf328350a1c2fe002bb4b828ffe7a8afb0d Mon Sep 17 00:00:00 2001 From: ezbercih Date: Thu, 21 Mar 2013 00:11:16 -0300 Subject: [PATCH 1/3] Fix issue #120, initialize TCPAddr w/ field names Current Go tip (+74e65f07a0c8) and likely Go 1.1 does not build docker since net.TCPAddr struct has an additional field now for IPv6: type TCPAddr struct { IP IP Port int Zone string // IPv6 scoped addressing zone } Initializing the struct with named fields resolves this problem. Upstream-commit: fac32cda5af7adcf0400f1fd8763764a498149f3 Component: engine --- components/engine/network.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/network.go b/components/engine/network.go index 1b6395b0b1..a109a70239 100644 --- a/components/engine/network.go +++ b/components/engine/network.go @@ -279,7 +279,7 @@ func (iface *NetworkInterface) AllocatePort(port int) (int, error) { if err != nil { return -1, err } - if err := iface.manager.portMapper.Map(extPort, net.TCPAddr{iface.IPNet.IP, port}); err != nil { + if err := iface.manager.portMapper.Map(extPort, net.TCPAddr{IP: iface.IPNet.IP, Port: port}); err != nil { iface.manager.portAllocator.Release(extPort) return -1, err } From 21dbee31597d2014adfc3ae78ad49090ce049db9 Mon Sep 17 00:00:00 2001 From: creack Date: Wed, 20 Mar 2013 06:02:25 -0700 Subject: [PATCH 2/3] Complete pull request #121, init TCPAddr with named field Upstream-commit: ab99e9252d1d3872b2e04234338ce028b9eb091c Component: engine --- components/engine/network.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/network.go b/components/engine/network.go index a109a70239..01d84379a2 100644 --- a/components/engine/network.go +++ b/components/engine/network.go @@ -319,7 +319,7 @@ func (manager *NetworkManager) Allocate() (*NetworkInterface, error) { return nil, err } iface := &NetworkInterface{ - IPNet: net.IPNet{ip, manager.bridgeNetwork.Mask}, + IPNet: net.IPNet{IP: ip, Mask: manager.bridgeNetwork.Mask}, Gateway: manager.bridgeNetwork.IP, manager: manager, } From 232f5ef62c4decec0cba1019790621af7d163ab9 Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar Date: Wed, 20 Mar 2013 22:53:42 -0700 Subject: [PATCH 3/3] remove ! from command line bash does not like it ``` $ JOB=$(docker run base /bin/sh -c "while true; do echo Hello world!; sleep 1; done") bash: !: event not found $ ``` Upstream-commit: 3bb176d8ae7f43ab0d1ca8e03b59f2f137f07530 Component: engine --- components/engine/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/README.md b/components/engine/README.md index 9a6bf8b445..c1c155ac73 100644 --- a/components/engine/README.md +++ b/components/engine/README.md @@ -148,7 +148,7 @@ Starting a long-running worker process (docker -d || echo "Docker daemon already running") & # Start a very useful long-running process - JOB=$(docker run base /bin/sh -c "while true; do echo Hello world!; sleep 1; done") + JOB=$(docker run base /bin/sh -c "while true; do echo Hello world; sleep 1; done") # Collect the output of the job so far docker logs $JOB