mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
0450728267
full diff: fa125a3512...b3507428be
- fixed IPv6 iptables rules for enabled firewalld (libnetwork#2609)
- fixes "Docker uses 'iptables' instead of 'ip6tables' for IPv6 NAT rule, crashes"
- Fix regression in docker-proxy
- introduced in "Fix IPv6 Port Forwarding for the Bridge Driver" (libnetwork#2604)
- fixes/addresses: "IPv4 and IPv6 addresses are not bound by default anymore" (libnetwork#2607)
- fixes/addresses "IPv6 is no longer proxied by default anymore" (moby#41858)
- Use hostIP to decide on Portmapper version
- fixes docker-proxy not being stopped correctly
Port mapping of containers now contain separatet mappings for IPv4 and IPv6 addresses, when
listening on "any" IP address. Various tests had to be updated to take multiple mappings into
account.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
36 lines
961 B
Bash
Executable file
36 lines
961 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:=b3507428be5b458cb0e2b4086b13531fb0706e46}"
|
|
|
|
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=${GO_BUILDMODE}
|
|
_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
|
|
}
|