mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
1c4232670a
Bump libnetwork to 3ac297bc7fd0afec9051bbb47024c9bc1d75bf5b in order to
get fix 0c3d9f00 which addresses a flaw that the scalable load balancing
code revealed. Attempting to print sandbox IDs where the sandbox name
was too short results in a goroutine panic. This can occur with
sandboxes with names of 1 or 2 characters in the previous code. But due
to naming updates in the scalable load balancing code, it could now
occur for networks whose name was 3 characters and at least one of the
integration tests employed such networks (named 'foo', 'bar' and 'baz').
This update also brings in several changes as well:
* 6c7c6017 - Fix error handling about bridgeSetup
* 5ed38221 - Optimize networkDB queue
* cfa9afdb - ndots: produce error on negative numbers
* 5586e226 - improve error message for invalid ndots number
* 449672e5 - Allows to set generic knobs on the Sandbox
* 6b4c4af7 - do not ignore user-provided "ndots:0" option
* 843a0e42 - Adjust corner case for reconnect logic
Signed-off-by: Chris Telfer <ctelfer@docker.com>
(cherry picked from commit 0e162d9923)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
38 lines
954 B
Bash
Executable file
38 lines
954 B
Bash
Executable file
#!/bin/sh
|
|
|
|
# LIBNETWORK_COMMIT is used to build the docker-userland-proxy binary. When
|
|
# updating the binary version, consider updating github.com/docker/libnetwork
|
|
# in vendor.conf accordingly
|
|
LIBNETWORK_COMMIT=3ac297bc7fd0afec9051bbb47024c9bc1d75bf5b
|
|
|
|
install_proxy() {
|
|
case "$1" in
|
|
"dynamic")
|
|
install_proxy_dynamic
|
|
return
|
|
;;
|
|
"")
|
|
export CGO_ENABLED=0
|
|
_install_proxy
|
|
;;
|
|
*)
|
|
echo 'Usage: $0 [dynamic]'
|
|
;;
|
|
esac
|
|
}
|
|
|
|
install_proxy_dynamic() {
|
|
export PROXY_LDFLAGS="-linkmode=external" install_proxy
|
|
export BUILD_MODE="-buildmode=pie"
|
|
_install_proxy
|
|
}
|
|
|
|
_install_proxy() {
|
|
echo "Install docker-proxy version $LIBNETWORK_COMMIT"
|
|
git clone https://github.com/docker/libnetwork.git "$GOPATH/src/github.com/docker/libnetwork"
|
|
cd "$GOPATH/src/github.com/docker/libnetwork"
|
|
git checkout -q "$LIBNETWORK_COMMIT"
|
|
go build $BUILD_MODE -ldflags="$PROXY_LDFLAGS" -o ${PREFIX}/docker-proxy github.com/docker/libnetwork/cmd/proxy
|
|
}
|
|
|
|
|