summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-06-09 17:44:52 +0200
committerGitHub <noreply@github.com>2020-06-09 17:44:52 +0200
commit607cfa3ffb6ae54dc196827b4705601bf4c386e2 (patch)
tree6d39f5963b2259c1425cad3cd2405b2012699245 /vendor
parentc831ae110e35cc37e47ffc89bfa00c08199ddb45 (diff)
parent01c45698ca216d46523ae56f9f1d8d24198d5581 (diff)
downloadpodman-607cfa3ffb6ae54dc196827b4705601bf4c386e2.tar.gz
podman-607cfa3ffb6ae54dc196827b4705601bf4c386e2.tar.bz2
podman-607cfa3ffb6ae54dc196827b4705601bf4c386e2.zip
Merge pull request #6534 from containers/dependabot/go_modules/github.com/containers/common-0.13.0
Bump github.com/containers/common from 0.12.0 to 0.13.0
Diffstat (limited to 'vendor')
-rw-r--r--vendor/github.com/containers/common/pkg/config/config.go3
-rw-r--r--vendor/modules.txt2
2 files changed, 4 insertions, 1 deletions
diff --git a/vendor/github.com/containers/common/pkg/config/config.go b/vendor/github.com/containers/common/pkg/config/config.go
index d0b56c7f6..9657ecb69 100644
--- a/vendor/github.com/containers/common/pkg/config/config.go
+++ b/vendor/github.com/containers/common/pkg/config/config.go
@@ -269,6 +269,9 @@ type EngineConfig struct {
// RemoteURI containers connection information used to connect to remote system.
RemoteURI string `toml:"remote_uri,omitempty"`
+ // Identity key file for RemoteURI
+ RemoteIdentity string `toml:"remote_identity,omitempty"`
+
// RuntimePath is the path to OCI runtime binary for launching containers.
// The first path pointing to a valid file will be used This is used only
// when there are no OCIRuntime/OCIRuntimes defined. It is used only to be
diff --git a/vendor/modules.txt b/vendor/modules.txt
index b0271aa8a..8bdc0f2de 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -84,7 +84,7 @@ github.com/containers/buildah/pkg/secrets
github.com/containers/buildah/pkg/supplemented
github.com/containers/buildah/pkg/umask
github.com/containers/buildah/util
-# github.com/containers/common v0.12.0
+# github.com/containers/common v0.13.0
github.com/containers/common/pkg/apparmor
github.com/containers/common/pkg/auth
github.com/containers/common/pkg/capabilities