Skip to content

Commit

Permalink
DO NOT MERGE: Testing containers/storage#2140
Browse files Browse the repository at this point in the history 
> go mod edit -replace github.com/containers/storage=github.com/mtrmac/storage@vfs-fallback

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
  • Loading branch information
@mtrmac
mtrmac committed Oct 18, 2024
1 parent 5343f05 commit 643f12a
Show file tree
Hide file tree
Showing 9 changed files with 90 additions and 48 deletions.
2 changes: 2 additions & 0 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,3 +230,5 @@ require (
replace github.com/containers/common => github.com/mtrmac/common v0.8.2-0.20241015204126-78c8c087610a

replace github.com/containers/image/v5 => github.com/mtrmac/image/v5 v5.0.0-20241016195457-6045533dd9a2

replace github.com/containers/storage => github.com/mtrmac/storage v0.0.0-20241017234338-b057acd7a73d
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,6 @@ github.com/containers/ocicrypt v1.2.0 h1:X14EgRK3xNFvJEfI5O4Qn4T3E25ANudSOZz/sir
github.com/containers/ocicrypt v1.2.0/go.mod h1:ZNviigQajtdlxIZGibvblVuIFBKIuUI2M0QM12SD31U=
github.com/containers/psgo v1.9.0 h1:eJ74jzSaCHnWt26OlKZROSyUyRcGDf+gYBdXnxrMW4g=
github.com/containers/psgo v1.9.0/go.mod h1:0YoluUm43Mz2UnBIh1P+6V6NWcbpTL5uRtXyOcH0B5A=
github.com/containers/storage v1.55.1-0.20241016074337-b417e8d6376d h1:pEpS4UWW++IMwvWHLOVRYPofnRWFora35fHx/XwM18c=
github.com/containers/storage v1.55.1-0.20241016074337-b417e8d6376d/go.mod h1:1Yv4k1PJCLjKLhQ5N4TdH7+5ntDjRcy/dHcZQKRQ4fg=
github.com/containers/winquit v1.1.0 h1:jArun04BNDQvt2W0Y78kh9TazN2EIEMG5Im6/JY7+pE=
github.com/containers/winquit v1.1.0/go.mod h1:PsPeZlnbkmGGIToMPHF1zhWjBUkd8aHjMOr/vFcPxw8=
github.com/coreos/go-oidc/v3 v3.11.0 h1:Ia3MxdwpSw702YW0xgfmP1GVCMA9aEFWu12XUZ3/OtI=
Expand Down Expand Up @@ -382,6 +380,8 @@ github.com/mtrmac/common v0.8.2-0.20241015204126-78c8c087610a h1:xpe1z25rOIfC8CD
github.com/mtrmac/common v0.8.2-0.20241015204126-78c8c087610a/go.mod h1:GRT29AbW4CdqEWP/jSxHyUvV5fprOzsCdhsFhqJiU4s=
github.com/mtrmac/image/v5 v5.0.0-20241016195457-6045533dd9a2 h1:jv0/6AabBWh1KPQPTD9nefFwVvimQA0K+phljh8mNU8=
github.com/mtrmac/image/v5 v5.0.0-20241016195457-6045533dd9a2/go.mod h1:Ulwf/jQO4757C/uOJyNiZ10dRiXRwVnyhF9wYFno3GQ=
github.com/mtrmac/storage v0.0.0-20241017234338-b057acd7a73d h1:/80cSp1xPePUfa7DheEQUAESxKcUD1sspiaG6l/5jPA=
github.com/mtrmac/storage v0.0.0-20241017234338-b057acd7a73d/go.mod h1:iq56tOFXnj8kA8DAytN28fhUm77eKLWrashQrImaqBs=
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/nxadm/tail v1.4.11 h1:8feyoE3OzPrcshW5/MJ4sGESc5cqmGkGCWlco4l0bqY=
Expand Down
8 changes: 8 additions & 0 deletions vendor/github.com/containers/storage/.cirrus.yml
View file

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

3 changes: 3 additions & 0 deletions vendor/github.com/containers/storage/.codespellrc
View file

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/containers/storage/Makefile
View file

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/containers/storage/pkg/chunked/cache_linux.go
View file

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

112 changes: 70 additions & 42 deletions vendor/github.com/containers/storage/pkg/chunked/storage_linux.go
View file

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/containers/storage/pkg/idtools/idtools.go
View file

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

3 changes: 2 additions & 1 deletion vendor/modules.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ github.com/containers/psgo/internal/dev
github.com/containers/psgo/internal/host
github.com/containers/psgo/internal/proc
github.com/containers/psgo/internal/process
# github.com/containers/storage v1.55.1-0.20241016074337-b417e8d6376d
# github.com/containers/storage v1.55.1-0.20241016074337-b417e8d6376d => github.com/mtrmac/storage v0.0.0-20241017234338-b057acd7a73d
## explicit; go 1.22.0
github.com/containers/storage
github.com/containers/storage/drivers
Expand Down Expand Up @@ -1386,3 +1386,4 @@ tags.cncf.io/container-device-interface/pkg/parser
tags.cncf.io/container-device-interface/specs-go
# github.com/containers/common => github.com/mtrmac/common v0.8.2-0.20241015204126-78c8c087610a
# github.com/containers/image/v5 => github.com/mtrmac/image/v5 v5.0.0-20241016195457-6045533dd9a2
# github.com/containers/storage => github.com/mtrmac/storage v0.0.0-20241017234338-b057acd7a73d

0 comments on commit 643f12a

Please sign in to comment.