Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: containers/common
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: da3fcb8343114a8ecdfb7d8fbc10a5f200979765
Choose a base ref
..
head repository: containers/common
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: cdf35b8d0e5e1e980ae26cb0d5f9250e9a59b068
Choose a head ref
Showing with 2,471 additions and 592 deletions.
  1. +8 −6 go.mod
  2. +16 −12 go.sum
  3. +1 −1 vendor/github.com/Microsoft/hcsshim/internal/hns/hnsendpoint.go
  4. +4 −7 vendor/github.com/Microsoft/hcsshim/internal/jobobject/jobobject.go
  5. +1 −1 vendor/github.com/Microsoft/hcsshim/internal/oc/errors.go
  6. +17 −2 vendor/github.com/Microsoft/hcsshim/internal/winapi/jobobject.go
  7. +6 −2 vendor/github.com/Microsoft/hcsshim/internal/winapi/zsyscall_windows.go
  8. +380 −29 vendor/github.com/containerd/errdefs/errors.go
  9. +0 −147 vendor/github.com/containerd/errdefs/grpc.go
  10. +191 −0 vendor/github.com/containerd/errdefs/pkg/LICENSE
  11. +353 −0 vendor/github.com/containerd/errdefs/pkg/errgrpc/grpc.go
  12. +33 −0 vendor/github.com/containerd/errdefs/pkg/internal/cause/cause.go
  13. +57 −0 vendor/github.com/containerd/errdefs/pkg/internal/types/collapsible.go
  14. +147 −0 vendor/github.com/containerd/errdefs/resolve.go
  15. +2 −0 vendor/github.com/containerd/typeurl/v2/.gitignore
  16. +191 −0 vendor/github.com/containerd/typeurl/v2/LICENSE
  17. +20 −0 vendor/github.com/containerd/typeurl/v2/README.md
  18. +83 −0 vendor/github.com/containerd/typeurl/v2/doc.go
  19. +298 −0 vendor/github.com/containerd/typeurl/v2/types.go
  20. +1 −0 vendor/github.com/containers/image/v5/copy/copy.go
  21. +1 −1 vendor/github.com/containers/image/v5/copy/single.go
  22. +1 −1 vendor/github.com/containers/image/v5/docker/body_reader.go
  23. +12 −2 vendor/github.com/containers/image/v5/pkg/compression/compression.go
  24. +9 −0 vendor/github.com/containers/image/v5/pkg/compression/internal/types.go
  25. +11 −3 vendor/github.com/containers/image/v5/storage/storage_dest.go
  26. +9 −1 vendor/github.com/containers/storage/.cirrus.yml
  27. +3 −0 vendor/github.com/containers/storage/.codespellrc
  28. +1 −1 vendor/github.com/containers/storage/Makefile
  29. +11 −12 vendor/github.com/containers/storage/containers.go
  30. +2 −2 vendor/github.com/containers/storage/drivers/driver.go
  31. +1 −4 vendor/github.com/containers/storage/drivers/fsdiff.go
  32. +36 −13 vendor/github.com/containers/storage/drivers/overlay/composefs.go
  33. +13 −7 vendor/github.com/containers/storage/drivers/overlay/overlay.go
  34. +48 −0 vendor/github.com/containers/storage/drivers/quota/projectquota_supported.go
  35. +11 −12 vendor/github.com/containers/storage/images.go
  36. +20 −17 vendor/github.com/containers/storage/layers.go
  37. +9 −1 vendor/github.com/containers/storage/pkg/chunked/cache_linux.go
  38. +32 −2 vendor/github.com/containers/storage/pkg/chunked/compression_linux.go
  39. +112 −82 vendor/github.com/containers/storage/pkg/chunked/storage_linux.go
  40. +1 −1 vendor/github.com/containers/storage/pkg/idtools/idtools.go
  41. +46 −86 vendor/github.com/containers/storage/store.go
  42. +60 −27 vendor/github.com/containers/storage/userns.go
  43. +14 −0 vendor/github.com/containers/storage/userns_unsupported.go
  44. +2 −2 vendor/google.golang.org/grpc/balancer/base/balancer.go
  45. +1 −1 vendor/google.golang.org/grpc/balancer/pickfirst/pickfirst.go
  46. +3 −3 vendor/google.golang.org/grpc/balancer_wrapper.go
  47. +11 −11 vendor/google.golang.org/grpc/binarylog/grpc_binarylog_v1/binarylog.pb.go
  48. +1 −1 vendor/google.golang.org/grpc/credentials/insecure/insecure.go
  49. +2 −0 vendor/google.golang.org/grpc/dialoptions.go
  50. +5 −6 vendor/google.golang.org/grpc/experimental/stats/metricregistry.go
  51. +1 −1 vendor/google.golang.org/grpc/grpclog/internal/logger.go
  52. +1 −1 vendor/google.golang.org/grpc/internal/binarylog/method_logger.go
  53. +0 −7 vendor/google.golang.org/grpc/internal/channelz/channelmap.go
  54. +1 −1 vendor/google.golang.org/grpc/internal/channelz/funcs.go
  55. +2 −2 vendor/google.golang.org/grpc/internal/channelz/syscall_nonlinux.go
  56. +1 −1 vendor/google.golang.org/grpc/internal/envconfig/envconfig.go
  57. +5 −6 vendor/google.golang.org/grpc/internal/internal.go
  58. +1 −1 vendor/google.golang.org/grpc/internal/resolver/passthrough/passthrough.go
  59. +2 −2 vendor/google.golang.org/grpc/internal/status/status.go
  60. +3 −3 vendor/google.golang.org/grpc/internal/syscall/syscall_nonlinux.go
  61. +0 −7 vendor/google.golang.org/grpc/internal/transport/controlbuf.go
  62. +2 −2 vendor/google.golang.org/grpc/internal/transport/handler_server.go
  63. +5 −13 vendor/google.golang.org/grpc/internal/transport/http2_client.go
  64. +2 −2 vendor/google.golang.org/grpc/internal/transport/http2_server.go
  65. +1 −1 vendor/google.golang.org/grpc/internal/transport/http_util.go
  66. +17 −3 vendor/google.golang.org/grpc/keepalive/keepalive.go
  67. +7 −5 vendor/google.golang.org/grpc/mem/buffer_slice.go
  68. +2 −2 vendor/google.golang.org/grpc/mem/buffers.go
  69. +17 −17 vendor/google.golang.org/grpc/rpc_util.go
  70. +1 −0 vendor/google.golang.org/grpc/server.go
  71. +86 −0 vendor/google.golang.org/grpc/stream_interfaces.go
  72. +1 −1 vendor/google.golang.org/grpc/version.go
  73. +16 −8 vendor/modules.txt
14 changes: 8 additions & 6 deletions go.mod
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ require (
github.com/containernetworking/plugins v1.5.1
github.com/containers/image/v5 v5.32.1-0.20240806084436-e3e9287ca8e6
github.com/containers/ocicrypt v1.2.0
github.com/containers/storage v1.55.1-0.20241008185503-a397602515fd
github.com/containers/storage v1.55.2-0.20241031160952-5958b09bef02
github.com/coreos/go-systemd/v22 v22.5.0
github.com/cyphar/filepath-securejoin v0.3.4
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
@@ -56,15 +56,17 @@ require (
require (
dario.cat/mergo v1.0.1 // indirect
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/Microsoft/hcsshim v0.12.7 // indirect
github.com/Microsoft/hcsshim v0.12.9 // indirect
github.com/VividCortex/ewma v1.2.0 // indirect
github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d // indirect
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
github.com/chzyer/readline v1.5.1 // indirect
github.com/containerd/cgroups/v3 v3.0.3 // indirect
github.com/containerd/errdefs v0.1.0 // indirect
github.com/containerd/errdefs v0.3.0 // indirect
github.com/containerd/errdefs/pkg v0.3.0 // indirect
github.com/containerd/log v0.1.0 // indirect
github.com/containerd/stargz-snapshotter/estargz v0.15.1 // indirect
github.com/containerd/typeurl/v2 v2.2.0 // indirect
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 // indirect
github.com/cyberphone/json-canonicalization v0.0.0-20231217050601-ba74d44ecf5f // indirect
github.com/distribution/reference v0.6.0 // indirect
@@ -142,8 +144,8 @@ require (
golang.org/x/net v0.30.0 // indirect
golang.org/x/text v0.19.0 // indirect
golang.org/x/tools v0.26.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240823204242-4ba0660f739c // indirect
google.golang.org/grpc v1.66.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
google.golang.org/grpc v1.67.0 // indirect
google.golang.org/protobuf v1.35.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
@@ -153,4 +155,4 @@ retract (
v1.0.0 // We reverted to v0.… version numbers; the v1.0.0 tag was actually deleted.
)

replace github.com/containers/image/v5 => github.com/mtrmac/image/v5 v5.0.0-20241021121719-f630065724b8
replace github.com/containers/image/v5 => github.com/mtrmac/image/v5 v5.0.0-20241104162921-6ba898f74fd4
28 changes: 16 additions & 12 deletions go.sum
Original file line number Diff line number Diff line change
@@ -10,8 +10,8 @@ github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0
github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
github.com/Microsoft/hcsshim v0.12.7 h1:MP6R1spmjxTE4EU4J3YsrTxn8CjvN9qwjTKJXldFaRg=
github.com/Microsoft/hcsshim v0.12.7/go.mod h1:HPbAuJ9BvQYYZbB4yEQcyGIsTP5L4yHKeO9XO149AEM=
github.com/Microsoft/hcsshim v0.12.9 h1:2zJy5KA+l0loz1HzEGqyNnjd3fyZA31ZBCGKacp6lLg=
github.com/Microsoft/hcsshim v0.12.9/go.mod h1:fJ0gkFAna6ukt0bLdKB8djt4XIJhF/vEPuoIWYVvZ8Y=
github.com/VividCortex/ewma v1.2.0 h1:f58SaIzcDXrSy3kWaHNvuJgJ3Nmz59Zji6XoJR/q1ow=
github.com/VividCortex/ewma v1.2.0/go.mod h1:nz4BbCtbLyFDeC9SUHbtcT5644juEuWfUAUnGx7j5l4=
github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d h1:licZJFw2RwpHMqeKTCYkitsPqHNxTmd4SNR5r94FGM8=
@@ -45,14 +45,18 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
github.com/containerd/cgroups/v3 v3.0.3 h1:S5ByHZ/h9PMe5IOQoN7E+nMc2UcLEM/V48DGDJ9kip0=
github.com/containerd/cgroups/v3 v3.0.3/go.mod h1:8HBe7V3aWGLFPd/k03swSIsGjZhHI2WzJmticMgVuz0=
github.com/containerd/errdefs v0.1.0 h1:m0wCRBiu1WJT/Fr+iOoQHMQS/eP5myQ8lCv4Dz5ZURM=
github.com/containerd/errdefs v0.1.0/go.mod h1:YgWiiHtLmSeBrvpw+UfPijzbLaB77mEG1WwJTDETIV0=
github.com/containerd/errdefs v0.3.0 h1:FSZgGOeK4yuT/+DnF07/Olde/q4KBoMsaamhXxIMDp4=
github.com/containerd/errdefs v0.3.0/go.mod h1:+YBYIdtsnF4Iw6nWZhJcqGSg/dwvV7tyJ/kCkyJ2k+M=
github.com/containerd/errdefs/pkg v0.3.0 h1:9IKJ06FvyNlexW690DXuQNx2KA2cUJXx151Xdx3ZPPE=
github.com/containerd/errdefs/pkg v0.3.0/go.mod h1:NJw6s9HwNuRhnjJhM7pylWwMyAkmCQvQ4GpJHEqRLVk=
github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
github.com/containerd/platforms v0.2.1 h1:zvwtM3rz2YHPQsF2CHYM8+KtB5dvhISiXh5ZpSBQv6A=
github.com/containerd/platforms v0.2.1/go.mod h1:XHCb+2/hzowdiut9rkudds9bE5yJ7npe7dG/wG+uFPw=
github.com/containerd/stargz-snapshotter/estargz v0.15.1 h1:eXJjw9RbkLFgioVaTG+G/ZW/0kEe2oEKCdS/ZxIyoCU=
github.com/containerd/stargz-snapshotter/estargz v0.15.1/go.mod h1:gr2RNwukQ/S9Nv33Lt6UC7xEx58C+LHRdoqbEKjz1Kk=
github.com/containerd/typeurl/v2 v2.2.0 h1:6NBDbQzr7I5LHgp34xAXYF5DOTQDn05X58lsPEmzLso=
github.com/containerd/typeurl/v2 v2.2.0/go.mod h1:8XOOxnyatxSWuG8OfsZXVnAF4iZfedjS/8UHSPJnX4g=
github.com/containernetworking/cni v1.2.3 h1:hhOcjNVUQTnzdRJ6alC5XF+wd9mfGIUaj8FuJbEslXM=
github.com/containernetworking/cni v1.2.3/go.mod h1:DuLgF+aPd3DzcTQTtp/Nvl1Kim23oFKdm2okJzBQA5M=
github.com/containernetworking/plugins v1.5.1 h1:T5ji+LPYjjgW0QM+KyrigZbLsZ8jaX+E5J/EcKOE4gQ=
@@ -61,8 +65,8 @@ github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 h1:Qzk5C6cYgle
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01/go.mod h1:9rfv8iPl1ZP7aqh9YA68wnZv2NUDbXdcdPHVz0pFbPY=
github.com/containers/ocicrypt v1.2.0 h1:X14EgRK3xNFvJEfI5O4Qn4T3E25ANudSOZz/sirVuPM=
github.com/containers/ocicrypt v1.2.0/go.mod h1:ZNviigQajtdlxIZGibvblVuIFBKIuUI2M0QM12SD31U=
github.com/containers/storage v1.55.1-0.20241008185503-a397602515fd h1:Yh3v4wrVxMpccXjA451OsF4CdKuQEEGCNDHtK84y+10=
github.com/containers/storage v1.55.1-0.20241008185503-a397602515fd/go.mod h1:H3XVD+Fwqe26DEP+Ev3s9VmdtXlAd9rV/WFC+dgALSI=
github.com/containers/storage v1.55.2-0.20241031160952-5958b09bef02 h1:rHyNde35eV5xOicaVh5F1v2kQzDbg/VkN5SMAHDCQBg=
github.com/containers/storage v1.55.2-0.20241031160952-5958b09bef02/go.mod h1:Blahv9If3N1bfizPPfeSJXjFb4VjB7QAaL4eKi7h9Pg=
github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs=
github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
@@ -238,8 +242,8 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
github.com/mtrmac/image/v5 v5.0.0-20241021121719-f630065724b8 h1:MZX0hBXLNYRp0bTSfZwGrALmVA33sifU9Ix2IexEaOs=
github.com/mtrmac/image/v5 v5.0.0-20241021121719-f630065724b8/go.mod h1:Ulwf/jQO4757C/uOJyNiZ10dRiXRwVnyhF9wYFno3GQ=
github.com/mtrmac/image/v5 v5.0.0-20241104162921-6ba898f74fd4 h1:sJtBTSqAR+NbEK02XHYXm7jJSwxXBbDaCOEL6e5oydE=
github.com/mtrmac/image/v5 v5.0.0-20241104162921-6ba898f74fd4/go.mod h1:qsONoo3ZvAnrwa2+49bY6m3ewtJO5+A1AaELCtGuDKc=
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4=
@@ -470,15 +474,15 @@ google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEY
google.golang.org/genproto v0.0.0-20240823204242-4ba0660f739c h1:TYOEhrQMrNDTAd2rX9m+WgGr8Ku6YNuj1D7OX6rWSok=
google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 h1:wKguEg1hsxI2/L3hUYrpo1RVi48K+uTyzKqprwLXsb8=
google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142/go.mod h1:d6be+8HhtEtucleCbxpPW9PA9XwISACu8nvpPqF0BVo=
google.golang.org/genproto/googleapis/rpc v0.0.0-20240823204242-4ba0660f739c h1:Kqjm4WpoWvwhMPcrAczoTyMySQmYa9Wy2iL6Con4zn8=
google.golang.org/genproto/googleapis/rpc v0.0.0-20240823204242-4ba0660f739c/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU=
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 h1:pPJltXNxVzT4pK9yD8vR9X75DaWYYmLGMsEvBfFQZzQ=
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU=
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
google.golang.org/grpc v1.66.0 h1:DibZuoBznOxbDQxRINckZcUvnCEvrW9pcWIE2yF9r1c=
google.golang.org/grpc v1.66.0/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y=
google.golang.org/grpc v1.67.0 h1:IdH9y6PF5MPSdAntIcpjQ+tXO41pcQsfZV2RxtQgVcw=
google.golang.org/grpc v1.67.0/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA=
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=

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.

2 changes: 1 addition & 1 deletion vendor/github.com/Microsoft/hcsshim/internal/oc/errors.go

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

19 changes: 17 additions & 2 deletions vendor/github.com/Microsoft/hcsshim/internal/winapi/jobobject.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.

Loading