mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Merge pull request #42025 from thaJeztah/20.10_backport_bump_rootlesskit
[20.10 backport] Update rootlesskit to v0.13.1 to fix handling of IPv6 addresses
This commit is contained in:
commit
c981698f9a
1 changed files with 6 additions and 5 deletions
|
@ -1,7 +1,7 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
# v0.11.0
|
# v0.13.1
|
||||||
: ${ROOTLESSKIT_COMMIT:=2886253e467c5444a4d2ac7084e53aa3cc50055d}
|
: "${ROOTLESSKIT_COMMIT:=5c30c9c2586add2ad659132990fdc230f05035fa}"
|
||||||
|
|
||||||
install_rootlesskit() {
|
install_rootlesskit() {
|
||||||
case "$1" in
|
case "$1" in
|
||||||
|
@ -25,12 +25,13 @@ install_rootlesskit_dynamic() {
|
||||||
_install_rootlesskit
|
_install_rootlesskit
|
||||||
}
|
}
|
||||||
|
|
||||||
_install_rootlesskit() {
|
_install_rootlesskit() (
|
||||||
echo "Install rootlesskit version $ROOTLESSKIT_COMMIT"
|
echo "Install rootlesskit version $ROOTLESSKIT_COMMIT"
|
||||||
git clone https://github.com/rootless-containers/rootlesskit.git "$GOPATH/src/github.com/rootless-containers/rootlesskit"
|
git clone https://github.com/rootless-containers/rootlesskit.git "$GOPATH/src/github.com/rootless-containers/rootlesskit"
|
||||||
cd "$GOPATH/src/github.com/rootless-containers/rootlesskit"
|
cd "$GOPATH/src/github.com/rootless-containers/rootlesskit" || exit 1
|
||||||
git checkout -q "$ROOTLESSKIT_COMMIT"
|
git checkout -q "$ROOTLESSKIT_COMMIT"
|
||||||
|
export GO111MODULE=on
|
||||||
for f in rootlesskit rootlesskit-docker-proxy; do
|
for f in rootlesskit rootlesskit-docker-proxy; do
|
||||||
go build $BUILD_MODE -ldflags="$ROOTLESSKIT_LDFLAGS" -o "${PREFIX}/$f" github.com/rootless-containers/rootlesskit/cmd/$f
|
go build $BUILD_MODE -ldflags="$ROOTLESSKIT_LDFLAGS" -o "${PREFIX}/$f" github.com/rootless-containers/rootlesskit/cmd/$f
|
||||||
done
|
done
|
||||||
}
|
)
|
||||||
|
|
Loading…
Add table
Reference in a new issue