From 94feac18d26961c5ae4d080a3989cf2ccc8cdb52 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 11 Feb 2021 14:45:34 +0100 Subject: [PATCH] Update rootlesskit to v0.13.1 to fix handling of IPv6 addresses v0.13.1 - Refactor `ParsePortSpec` to handle IPv6 addresses, and improve validation v0.13.0 - `rootlesskit --pidns`: fix propagating exit status - Support cgroup2 evacuation, e.g., `systemd-run -p Delegate=yes --user -t rootlesskit --cgroupns --pidns --evacuate-cgroup2=evac --net=slirp4netns bash` v0.12.0 - Port forwarding API now supports setting `ChildIP` - The `vendor` directory is no longer included in this repo. Run `go mod vendor` if you need Signed-off-by: Sebastiaan van Stijn (cherry picked from commit e32ae1973ae0b04b543a05b3578d1295c0c98e36) Signed-off-by: Sebastiaan van Stijn --- hack/dockerfile/install/rootlesskit.installer | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/hack/dockerfile/install/rootlesskit.installer b/hack/dockerfile/install/rootlesskit.installer index 43b84d3c4f..9580cc971c 100755 --- a/hack/dockerfile/install/rootlesskit.installer +++ b/hack/dockerfile/install/rootlesskit.installer @@ -1,7 +1,7 @@ #!/bin/sh -# v0.11.0 -: ${ROOTLESSKIT_COMMIT:=2886253e467c5444a4d2ac7084e53aa3cc50055d} +# v0.13.1 +: "${ROOTLESSKIT_COMMIT:=5c30c9c2586add2ad659132990fdc230f05035fa}" install_rootlesskit() { case "$1" in @@ -25,12 +25,13 @@ install_rootlesskit_dynamic() { _install_rootlesskit } -_install_rootlesskit() { +_install_rootlesskit() ( echo "Install rootlesskit version $ROOTLESSKIT_COMMIT" 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" + export GO111MODULE=on 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 done -} +)