Skip to content

Commit

Permalink
Merge pull request containers#3895 from rhatdan/VENDOR
Browse files Browse the repository at this point in the history
vendor in latest containers/common,image,storage
  • Loading branch information
rhatdan authored Apr 5, 2022
2 parents 46d18e0 + e792564 commit 310b224
Show file tree
Hide file tree
Showing 144 changed files with 1,461 additions and 1,240 deletions.
8 changes: 4 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ go 1.13
require (
github.com/containerd/containerd v1.6.2
github.com/containernetworking/cni v1.0.1
github.com/containers/common v0.47.5
github.com/containers/image/v5 v5.20.0
github.com/containers/common v0.47.5-0.20220331143923-5f14ec785c18
github.com/containers/image/v5 v5.20.1-0.20220404163228-d03e80fc66b3
github.com/containers/ocicrypt v1.1.3
github.com/containers/storage v1.39.0
github.com/containers/storage v1.39.1-0.20220330193934-f3200eb5a5d9
github.com/docker/distribution v2.8.1+incompatible
github.com/docker/docker v20.10.14+incompatible
github.com/docker/go-units v0.4.0
Expand Down Expand Up @@ -39,7 +39,7 @@ require (
go.etcd.io/bbolt v1.3.6
golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27
golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211
)

Expand Down
44 changes: 24 additions & 20 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tests/images.bats
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ load helpers
cid2=$output

run_buildah 125 images --noheading --filter since k8s.gcr.io/pause
expect_output 'invalid image filter "since": must be in the format "filter=value"'
expect_output 'invalid image filter "since": must be in the format "filter=value or filter!=value"'


run_buildah images --noheading --filter since=k8s.gcr.io/pause
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 19 additions & 3 deletions vendor/github.com/containers/common/libimage/filters.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

59 changes: 38 additions & 21 deletions vendor/github.com/containers/common/libimage/runtime.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 310b224

Please sign in to comment.