summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-05-30 05:09:30 -0400
committerGitHub <noreply@github.com>2020-05-30 05:09:30 -0400
commit6d6a629db5d3f8fd4d3cc44a080d928f47dab5f3 (patch)
treef82f00493d66309d35afe166006d05f278c19dd7 /vendor
parentc479d63dd689b0960832cbaa343e2aa3f00954e0 (diff)
parentcd001a3a9ed9a5cb2b59b5de11485041569bc26c (diff)
downloadpodman-6d6a629db5d3f8fd4d3cc44a080d928f47dab5f3.tar.gz
podman-6d6a629db5d3f8fd4d3cc44a080d928f47dab5f3.tar.bz2
podman-6d6a629db5d3f8fd4d3cc44a080d928f47dab5f3.zip
Merge pull request #6165 from containers/dependabot/go_modules/github.com/rootless-containers/rootlesskit-0.9.5
Bump github.com/rootless-containers/rootlesskit from 0.9.4 to 0.9.5
Diffstat (limited to 'vendor')
-rw-r--r--vendor/github.com/rootless-containers/rootlesskit/pkg/port/builtin/parent/parent.go1
-rw-r--r--vendor/modules.txt2
2 files changed, 2 insertions, 1 deletions
diff --git a/vendor/github.com/rootless-containers/rootlesskit/pkg/port/builtin/parent/parent.go b/vendor/github.com/rootless-containers/rootlesskit/pkg/port/builtin/parent/parent.go
index 8ffadd859..49252a06d 100644
--- a/vendor/github.com/rootless-containers/rootlesskit/pkg/port/builtin/parent/parent.go
+++ b/vendor/github.com/rootless-containers/rootlesskit/pkg/port/builtin/parent/parent.go
@@ -117,6 +117,7 @@ func annotateEPERM(origErr error, spec port.Spec) error {
// Podman launches the parent driver in the child user namespace (but in the parent network namespace), which disables the file capability.
text += ", or set CAP_NET_BIND_SERVICE on rootlesskit binary"
}
+ text += fmt.Sprintf(", or choose a larger port number (>= %d)", start)
return errors.Wrap(origErr, text)
}
diff --git a/vendor/modules.txt b/vendor/modules.txt
index a42743c33..f0e279be4 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -465,7 +465,7 @@ github.com/prometheus/common/model
github.com/prometheus/procfs
github.com/prometheus/procfs/internal/fs
github.com/prometheus/procfs/internal/util
-# github.com/rootless-containers/rootlesskit v0.9.4
+# github.com/rootless-containers/rootlesskit v0.9.5
github.com/rootless-containers/rootlesskit/pkg/msgutil
github.com/rootless-containers/rootlesskit/pkg/port
github.com/rootless-containers/rootlesskit/pkg/port/builtin