diff options
| author | TomSweeneyRedHat <tsweeney@redhat.com> | 2020-08-27 16:26:03 -0400 |
|---|---|---|
| committer | TomSweeneyRedHat <tsweeney@redhat.com> | 2020-08-27 16:38:44 -0400 |
| commit | 023c4fadf5fbcd4519ad7701c74bc3604c8cf9f2 (patch) | |
| tree | 8aa3f1c9854dbae44cd587ac66495c30cd2a5a41 | |
| parent | 9c8e0a0f2568d42aec47dd36103713f47ba4c0f2 (diff) | |
| download | podman-023c4fadf5fbcd4519ad7701c74bc3604c8cf9f2.tar.gz podman-023c4fadf5fbcd4519ad7701c74bc3604c8cf9f2.tar.bz2 podman-023c4fadf5fbcd4519ad7701c74bc3604c8cf9f2.zip | |
Bump c/common to v0.14.10 and c/conmon to v2.0.20
As the title says.
Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
| -rw-r--r-- | go.mod | 4 | ||||
| -rw-r--r-- | go.sum | 8 | ||||
| -rw-r--r-- | vendor/github.com/containers/common/pkg/config/config_windows.go | 2 | ||||
| -rw-r--r-- | vendor/github.com/containers/common/version/version.go | 2 | ||||
| -rw-r--r-- | vendor/modules.txt | 4 |
5 files changed, 10 insertions, 10 deletions
@@ -11,8 +11,8 @@ require ( github.com/containernetworking/cni v0.7.2-0.20200304161608-4fae32b84921 github.com/containernetworking/plugins v0.8.6 github.com/containers/buildah v1.15.1 - github.com/containers/common v0.14.9 - github.com/containers/conmon v2.0.18+incompatible + github.com/containers/common v0.14.10 + github.com/containers/conmon v2.0.20+incompatible github.com/containers/image/v5 v5.5.2 github.com/containers/psgo v1.5.1 github.com/containers/storage v1.20.3 @@ -70,10 +70,10 @@ github.com/containers/buildah v1.15.1 h1:fVYZedNKir1B7qW43KR3zmkjHH+ZAmPoPQix9zH github.com/containers/buildah v1.15.1/go.mod h1:AQPeirYl0bqtXuJaxM9d/xslMm+1qrABc73AEFw0M9U= github.com/containers/common v0.14.0 h1:hiZFDPf6ajKiDmojN5f5X3gboKPO73NLrYb0RXfrQiA= github.com/containers/common v0.14.0/go.mod h1:9olhlE+WhYof1npnMJdyRMX14/yIUint6zyHzcyRVAg= -github.com/containers/common v0.14.9 h1:P8WH2O2W7y796NCJHiwecF5bjOFAVr30stVGAAHtcJA= -github.com/containers/common v0.14.9/go.mod h1:9olhlE+WhYof1npnMJdyRMX14/yIUint6zyHzcyRVAg= -github.com/containers/conmon v2.0.18+incompatible h1:rjwjNnE756NuXcdE/uUmj4kDbrykslPuBMHI31wh43E= -github.com/containers/conmon v2.0.18+incompatible/go.mod h1:hgwZ2mtuDrppv78a/cOBNiCm6O0UMWGx1mu7P00nu5I= +github.com/containers/common v0.14.10 h1:tSCwAnTFt3Q0tH29YK0ia6dOOzKVTdlPjQG4bza3Dn0= +github.com/containers/common v0.14.10/go.mod h1:9olhlE+WhYof1npnMJdyRMX14/yIUint6zyHzcyRVAg= +github.com/containers/conmon v2.0.20+incompatible h1:YbCVSFSCqFjjVwHTPINGdMX1F6JXHGTUje2ZYobNrkg= +github.com/containers/conmon v2.0.20+incompatible/go.mod h1:hgwZ2mtuDrppv78a/cOBNiCm6O0UMWGx1mu7P00nu5I= github.com/containers/image/v5 v5.4.4/go.mod h1:g7cxNXitiLi6pEr9/L9n/0wfazRuhDKXU15kV86N8h8= github.com/containers/image/v5 v5.5.1 h1:h1FCOXH6Ux9/p/E4rndsQOC4yAdRU0msRTfLVeQ7FDQ= github.com/containers/image/v5 v5.5.1/go.mod h1:4PyNYR0nwlGq/ybVJD9hWlhmIsNra4Q8uOQX2s6E2uM= diff --git a/vendor/github.com/containers/common/pkg/config/config_windows.go b/vendor/github.com/containers/common/pkg/config/config_windows.go index 7dbd665bb..1c9806e6b 100644 --- a/vendor/github.com/containers/common/pkg/config/config_windows.go +++ b/vendor/github.com/containers/common/pkg/config/config_windows.go @@ -6,5 +6,5 @@ func customConfigFile() (string, error) { if path, found := os.LookupEnv("CONTAINERS_CONF"); found { return path, nil } - return os.Getenv("LOCALAPPDATA"), nil + return os.Getenv("APPDATA") + "\\containers\\containers.conf", nil } diff --git a/vendor/github.com/containers/common/version/version.go b/vendor/github.com/containers/common/version/version.go index 39ff43d9a..8afce9816 100644 --- a/vendor/github.com/containers/common/version/version.go +++ b/vendor/github.com/containers/common/version/version.go @@ -1,4 +1,4 @@ package version // Version is the version of the build. -const Version = "0.14.9" +const Version = "0.14.10" diff --git a/vendor/modules.txt b/vendor/modules.txt index 94b7810df..68a99c238 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.14.9 +# github.com/containers/common v0.14.10 github.com/containers/common/pkg/apparmor github.com/containers/common/pkg/auth github.com/containers/common/pkg/capabilities @@ -92,7 +92,7 @@ github.com/containers/common/pkg/cgroupv2 github.com/containers/common/pkg/config github.com/containers/common/pkg/sysinfo github.com/containers/common/version -# github.com/containers/conmon v2.0.18+incompatible +# github.com/containers/conmon v2.0.20+incompatible github.com/containers/conmon/runner/config # github.com/containers/image/v5 v5.5.2 github.com/containers/image/v5/copy |