Skip to content

update docker-proxy to 7b2b1feb1de4817d522cc372af149ff48d25028e#30306

Merged
cpuguy83 merged 1 commit intomoby:masterfrom
AkihiroSuda:update-proxy
Jan 24, 2017
Merged

update docker-proxy to 7b2b1feb1de4817d522cc372af149ff48d25028e#30306
cpuguy83 merged 1 commit intomoby:masterfrom
AkihiroSuda:update-proxy

Conversation

@AkihiroSuda
Copy link
Copy Markdown
Member

@AkihiroSuda AkihiroSuda commented Jan 20, 2017 •
edited
Loading

- What I did

Update docker-proxy to moby/libnetwork@7b2b1feb
https://github.com/docker/libnetwork/commits/master/cmd/proxy

Fix #27539 (half-duplex TCP FIN issue) via moby/libnetwork#1598

- How I did it
Updated hack/dockerfile/binaries-commits

- How to verify it

Follow #27539, or just copy-paste this script to your terminal

#!/bin/sh
# simplified script to test issue 27539
set -e
set -x
cat <<EOF | docker build -t test -
FROM alpine:latest
RUN apk update && apk add socat
CMD ["socat", "TCP-LISTEN:1234,fork", "EXEC:echo hello"]
EOF
docker run --name test -d -p 1234:1234 test
trap "docker rm -f test" EXIT
sleep 1
echo input-str-discarded | nc -v localhost 1234
echo "If the issue is fixed, you should have seen hello here."
$ ./test.sh 
+ cat
+ docker build -t test -
Sending build context to Docker daemon 2.048 kB
Step 1/3 : FROM alpine:latest
 ---> baa5d63471ea
Step 2/3 : RUN apk update && apk add socat
 ---> Using cache
 ---> 31a0490704fb
Step 3/3 : CMD socat TCP-LISTEN:1234,fork EXEC:echo hello
 ---> Using cache
 ---> 2ec0b0cdc53f
Successfully built 2ec0b0cdc53f
+ docker run --name test -d -p 1234:1234 test
2196e8b9f4e2895c0ec3afaaf0e0de014e0fe6af92512a0ad0b3f0858782e30b
+ trap docker rm -f test EXIT
+ sleep 1
+ echo input-str-discarded
+ nc -v localhost 1234
Connection to localhost 1234 port [tcp/*] succeeded!
hello
+ echo If the issue is fixed, you should have seen hello here.
If the issue is fixed, you should have seen hello here.
+ docker rm -f test
test

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)
img

Signed-off-by: Akihiro Suda [email protected]

@AkihiroSuda
Copy link
Copy Markdown
Member Author

AkihiroSuda commented Jan 20, 2017

Not sure why CI failed...

https://jenkins.dockerproject.org/job/Docker-PRs-experimental/29829/console

01:54:05.123 java.lang.RuntimeException: Failed to serialize hudson.model.Actionable#actions for class hudson.model.FreeStyleBuild
01:54:05.123 	at hudson.util.RobustReflectionConverter$2.writeField(RobustReflectionConverter.java:256)
01:54:05.123 	at hudson.util.RobustReflectionConverter$2.visit(RobustReflectionConverter.java:224)
01:54:05.124 	at com.thoughtworks.xstream.converters.reflection.PureJavaReflectionProvider.visitSerializableFields(PureJavaReflectionProvider.java:138)
01:54:05.124 	at hudson.util.RobustReflectionConverter.doMarshal(RobustReflectionConverter.java:209)
01:54:05.124 	at hudson.util.RobustReflectionConverter.marshal(RobustReflectionConverter.java:150)
01:54:05.125 	at com.thoughtworks.xstream.core.AbstractReferenceMarshaller.convert(AbstractReferenceMarshaller.java:69)
01:54:05.125 	at com.thoughtworks.xstream.core.TreeMarshaller.convertAnother(TreeMarshaller.java:58)
01:54:05.125 	at com.thoughtworks.xstream.core.TreeMarshaller.convertAnother(TreeMarshaller.java:43)
01:54:05.125 	at com.thoughtworks.xstream.core.TreeMarshaller.start(TreeMarshaller.java:82)
01:54:05.126 	at com.thoughtworks.xstream.core.AbstractTreeMarshallingStrategy.marshal(AbstractTreeMarshallingStrategy.java:37)
01:54:05.126 	at com.thoughtworks.xstream.XStream.marshal(XStream.java:1026)

cpuguy83
cpuguy83 approved these changes Jan 24, 2017
View reviewed changes
Copy link
Copy Markdown
Member

@cpuguy83 cpuguy83 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@cpuguy83 cpuguy83 merged commit 5e46ad1 into moby:master Jan 24, 2017
@GordonTheTurtle GordonTheTurtle added this to the 1.14.0 milestone Jan 24, 2017
@thaJeztah
Copy link
Copy Markdown
Member

thaJeztah commented Jan 24, 2017

for references; full diff is moby/libnetwork@0f53435...7b2b1fe

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@cpuguy83 cpuguy83 cpuguy83 approved these changes

+1 more reviewer

@justincormack justincormack justincormack approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

status/2-code-review

Projects

None yet

Milestone

17.04.0

Development

Successfully merging this pull request may close these issues.

half-duplex TCP FIN not working with published ports

5 participants

@AkihiroSuda @thaJeztah @justincormack @cpuguy83 @GordonTheTurtle