diff --git a/go.mod b/go.mod index 1c66115d..4f45e8c3 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,6 @@ require ( github.com/alecthomas/kong v1.12.1 github.com/bmatcuk/doublestar/v3 v3.0.0 github.com/containerd/platforms v1.0.0-rc.1 - github.com/containers/image/v5 v5.36.1 github.com/crazy-max/cron/v3 v3.1.1 github.com/crazy-max/gohealthchecks v0.5.0 github.com/crazy-max/gonfig v0.7.1 @@ -40,6 +39,7 @@ require ( github.com/stretchr/testify v1.11.1 github.com/tidwall/pretty v1.2.1 go.etcd.io/bbolt v1.4.3 + go.podman.io/image/v5 v5.37.0 golang.org/x/mod v0.27.0 golang.org/x/sys v0.35.0 google.golang.org/grpc v1.74.2 @@ -68,7 +68,6 @@ require ( github.com/containerd/typeurl/v2 v2.2.3 // indirect github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 // indirect github.com/containers/ocicrypt v1.2.1 // indirect - github.com/containers/storage v1.59.1 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/docker/distribution v2.8.3+incompatible // indirect github.com/docker/docker-credential-helpers v0.9.3 // indirect @@ -134,12 +133,13 @@ require ( go.opentelemetry.io/otel v1.36.0 // indirect go.opentelemetry.io/otel/metric v1.36.0 // indirect go.opentelemetry.io/otel/trace v1.36.0 // indirect - golang.org/x/crypto v0.40.0 // indirect - golang.org/x/net v0.41.0 // indirect + go.podman.io/storage v1.60.0 // indirect + golang.org/x/crypto v0.41.0 // indirect + golang.org/x/net v0.43.0 // indirect golang.org/x/oauth2 v0.30.0 // indirect golang.org/x/sync v0.16.0 // indirect - golang.org/x/term v0.33.0 // indirect - golang.org/x/text v0.27.0 // indirect + golang.org/x/term v0.34.0 // indirect + golang.org/x/text v0.28.0 // indirect golang.org/x/time v0.11.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20250528174236-200df99c418a // indirect gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect diff --git a/go.sum b/go.sum index ab21635c..42224ddb 100644 --- a/go.sum +++ b/go.sum @@ -63,14 +63,10 @@ github.com/containerd/platforms v1.0.0-rc.1 h1:83KIq4yy1erSRgOVHNk1HYdPvzdJ5CnsW github.com/containerd/platforms v1.0.0-rc.1/go.mod h1:J71L7B+aiM5SdIEqmd9wp6THLVRzJGXfNuWCZCllLA4= github.com/containerd/typeurl/v2 v2.2.3 h1:yNA/94zxWdvYACdYO8zofhrTVuQY73fFU1y++dYSw40= github.com/containerd/typeurl/v2 v2.2.3/go.mod h1:95ljDnPfD3bAbDJRugOiShd/DlAAsxGtUBhJxIn7SCk= -github.com/containers/image/v5 v5.36.1 h1:6zpXBqR59UcAzoKpa/By5XekeqFV+htWYfr65+Cgjqo= -github.com/containers/image/v5 v5.36.1/go.mod h1:b4GMKH2z/5t6/09utbse2ZiLK/c72GuGLFdp7K69eA4= github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 h1:Qzk5C6cYglewc+UyGf6lc8Mj2UaPTHy/iF2De0/77CA= github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01/go.mod h1:9rfv8iPl1ZP7aqh9YA68wnZv2NUDbXdcdPHVz0pFbPY= github.com/containers/ocicrypt v1.2.1 h1:0qIOTT9DoYwcKmxSt8QJt+VzMY18onl9jUXsxpVhSmM= github.com/containers/ocicrypt v1.2.1/go.mod h1:aD0AAqfMp0MtwqWgHM1bUwe1anx0VazI108CRrSKINQ= -github.com/containers/storage v1.59.1 h1:11Zu68MXsEQGBBd+GadPrHPpWeqjKS8hJDGiAHgIqDs= -github.com/containers/storage v1.59.1/go.mod h1:KoAYHnAjP3/cTsRS+mmWZGkufSY2GACiKQ4V3ZLQnR0= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/crazy-max/cron/v3 v3.1.1 h1:8tsAXjV522daYSaN6/Mb/Nh8X/Ez+nedU0KuPV98rNU= github.com/crazy-max/cron/v3 v3.1.1/go.mod h1:yexi3kKoh3GcnmRCppyJKsvYIBWzDVaym0dwNWo+zdg= @@ -86,8 +82,8 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= -github.com/docker/cli v28.3.2+incompatible h1:mOt9fcLE7zaACbxW1GeS65RI67wIJrTnqS3hP2huFsY= -github.com/docker/cli v28.3.2+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/cli v28.3.3+incompatible h1:fp9ZHAr1WWPGdIWBM1b3zLtgCF+83gRdVMTJsUeiyAo= +github.com/docker/cli v28.3.3+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk= github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/docker v28.3.3+incompatible h1:Dypm25kh4rmk49v1eiVbsAtpAsYURjYkaKubwuBdxEI= @@ -340,8 +336,8 @@ github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4= github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU= github.com/tonistiigi/go-csvvalue v0.0.0-20240814133006-030d3b2625d0 h1:2f304B10LaZdB8kkVEaoXvAMVan2tl9AiK4G0odjQtE= github.com/tonistiigi/go-csvvalue v0.0.0-20240814133006-030d3b2625d0/go.mod h1:278M4p8WsNh3n4a1eqiFcV2FGk7wE5fwUpUom9mK9lE= -github.com/ulikunitz/xz v0.5.12 h1:37Nm15o69RwBkXM0J6A5OlE67RZTfzUxTj8fB3dfcsc= -github.com/ulikunitz/xz v0.5.12/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= +github.com/ulikunitz/xz v0.5.15 h1:9DNdB5s+SgV3bQ2ApL10xRc35ck0DuIX/isZvIk+ubY= +github.com/ulikunitz/xz v0.5.15/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/vanng822/css v0.0.0-20190504095207-a21e860bcd04 h1:L0rPdfzq43+NV8rfIx2kA4iSSLRj2jN5ijYHoeXRwvQ= github.com/vanng822/css v0.0.0-20190504095207-a21e860bcd04/go.mod h1:tcnB1voG49QhCrwq1W0w5hhGasvOg+VQp9i9H1rCM1w= github.com/vanng822/go-premailer v0.0.0-20191214114701-be27abe028fe h1:9YnI5plmy+ad6BM+JCLJb2ZV7/TNiE5l7SNKfumYKgc= @@ -375,6 +371,10 @@ go.opentelemetry.io/otel/trace v1.36.0 h1:ahxWNuqZjpdiFAyrIoQ4GIiAIhxAunQR6MUoKr go.opentelemetry.io/otel/trace v1.36.0/go.mod h1:gQ+OnDZzrybY4k4seLzPAWNwVBBVlF2szhehOBB/tGA= go.opentelemetry.io/proto/otlp v1.5.0 h1:xJvq7gMzB31/d406fB8U5CBdyQGw4P399D1aQWU/3i4= go.opentelemetry.io/proto/otlp v1.5.0/go.mod h1:keN8WnHxOy8PG0rQZjJJ5A2ebUoafqWp0eVQ4yIXvJ4= +go.podman.io/image/v5 v5.37.0 h1:yzgQybwuWIIeK63hu+mQqna/wOh96XD5cpVc6j8Dg5M= +go.podman.io/image/v5 v5.37.0/go.mod h1:+s2Sx5dia/jVeT8tI3r2NAPrARMiDdbEq3QPIQogx3I= +go.podman.io/storage v1.60.0 h1:bWNSrR58nxg39VNFDSx3m0AswbvyzPGOo5XsUfomTao= +go.podman.io/storage v1.60.0/go.mod h1:NK+rsWJVuQeCM7ifv7cxD3abegWxwtW/3OkuSUJJoE4= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= golang.org/x/crypto v0.0.0-20181029175232-7e6ffbd03851/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= @@ -382,8 +382,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.40.0 h1:r4x+VvoG5Fm+eJcxMaY8CQM7Lb0l1lsmjGBQ6s8BfKM= -golang.org/x/crypto v0.40.0/go.mod h1:Qr1vMER5WyS2dfPHAlsOj01wgLbsyWtFn/aY+5+ZdxY= +golang.org/x/crypto v0.41.0 h1:WKYxWedPGCTVVl5+WHSSrOBT0O8lx32+zxmHxijgXp4= +golang.org/x/crypto v0.41.0/go.mod h1:pO5AFd7FA68rFak7rOAGVuygIISepHftHnr8dr6+sUc= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= @@ -402,8 +402,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= -golang.org/x/net v0.41.0 h1:vBTly1HeNPEn3wtREYfy4GZ/NECgw2Cnl+nK6Nz3uvw= -golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA= +golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE= +golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg= golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI= golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -438,8 +438,8 @@ golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9sn golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY= -golang.org/x/term v0.33.0 h1:NuFncQrRcaRvVmgRkvM3j/F00gWIAlcmlB8ACEKmGIg= -golang.org/x/term v0.33.0/go.mod h1:s18+ql9tYWp1IfpV9DmCtQDDSRBUjKaw9M1eAv5UeF0= +golang.org/x/term v0.34.0 h1:O/2T7POpk0ZZ7MAzMeWFSg6S5IpWd/RXDlM9hgM3DR4= +golang.org/x/term v0.34.0/go.mod h1:5jC53AEywhIVebHgPVeg0mj8OD3VO9OzclacVrqpaAw= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= @@ -447,8 +447,8 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.27.0 h1:4fGWRpyh641NLlecmyl4LOe6yDdfaYNrGb2zdfo4JV4= -golang.org/x/text v0.27.0/go.mod h1:1D28KMCvyooCX9hBiosv5Tz/+YLxj0j7XhWjpSUF7CU= +golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng= +golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU= golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0= golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= diff --git a/internal/app/job.go b/internal/app/job.go index 447df8a3..5271d821 100644 --- a/internal/app/job.go +++ b/internal/app/job.go @@ -5,12 +5,12 @@ import ( "regexp" "dario.cat/mergo" - "github.com/containers/image/v5/pkg/docker/config" - "github.com/containers/image/v5/types" "github.com/crazy-max/diun/v4/internal/model" "github.com/crazy-max/diun/v4/pkg/registry" "github.com/crazy-max/diun/v4/pkg/utl" "github.com/rs/zerolog/log" + "go.podman.io/image/v5/pkg/docker/config" + "go.podman.io/image/v5/types" ) func (di *Diun) createJob(job model.Job) { diff --git a/internal/grpc/image.go b/internal/grpc/image.go index 24edc738..f36d464c 100644 --- a/internal/grpc/image.go +++ b/internal/grpc/image.go @@ -4,10 +4,10 @@ import ( "context" "encoding/json" - "github.com/containers/image/v5/docker/reference" "github.com/crazy-max/diun/v4/pb" "github.com/crazy-max/diun/v4/pkg/registry" "github.com/pkg/errors" + "go.podman.io/image/v5/docker/reference" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/pkg/registry/image.go b/pkg/registry/image.go index a44e1eb8..bc2a8152 100644 --- a/pkg/registry/image.go +++ b/pkg/registry/image.go @@ -7,9 +7,9 @@ import ( "strings" "text/template" - "github.com/containers/image/v5/docker/reference" digest "github.com/opencontainers/go-digest" "github.com/pkg/errors" + "go.podman.io/image/v5/docker/reference" ) // Image holds information about an image. diff --git a/pkg/registry/manifest.go b/pkg/registry/manifest.go index a8314e20..4cf64713 100644 --- a/pkg/registry/manifest.go +++ b/pkg/registry/manifest.go @@ -4,11 +4,11 @@ import ( "fmt" "time" - "github.com/containers/image/v5/docker" - "github.com/containers/image/v5/manifest" "github.com/opencontainers/go-digest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" + "go.podman.io/image/v5/docker" + "go.podman.io/image/v5/manifest" ) // Manifest is the Docker image manifest information diff --git a/pkg/registry/ref.go b/pkg/registry/ref.go index f6286074..2af57fbc 100644 --- a/pkg/registry/ref.go +++ b/pkg/registry/ref.go @@ -4,10 +4,10 @@ import ( "fmt" "strings" - "github.com/containers/image/v5/docker" - "github.com/containers/image/v5/types" "github.com/distribution/reference" "github.com/pkg/errors" + "go.podman.io/image/v5/docker" + "go.podman.io/image/v5/types" ) func ImageReference(name string) (types.ImageReference, error) { diff --git a/pkg/registry/registry.go b/pkg/registry/registry.go index dc1f4f36..e56719cd 100644 --- a/pkg/registry/registry.go +++ b/pkg/registry/registry.go @@ -4,8 +4,8 @@ import ( "context" "time" - "github.com/containers/image/v5/types" "github.com/pkg/errors" + "go.podman.io/image/v5/types" ) // Client represents an active docker registry object diff --git a/pkg/registry/tags.go b/pkg/registry/tags.go index f8955ee6..c51fe6a3 100644 --- a/pkg/registry/tags.go +++ b/pkg/registry/tags.go @@ -6,9 +6,9 @@ import ( "strings" "unicode" - "github.com/containers/image/v5/docker" "github.com/crazy-max/diun/v4/pkg/utl" "github.com/pkg/errors" + "go.podman.io/image/v5/docker" "golang.org/x/mod/semver" ) diff --git a/vendor/github.com/containers/image/v5/LICENSE b/vendor/go.podman.io/image/v5/LICENSE similarity index 100% rename from vendor/github.com/containers/image/v5/LICENSE rename to vendor/go.podman.io/image/v5/LICENSE diff --git a/vendor/github.com/containers/image/v5/docker/body_reader.go b/vendor/go.podman.io/image/v5/docker/body_reader.go similarity index 100% rename from vendor/github.com/containers/image/v5/docker/body_reader.go rename to vendor/go.podman.io/image/v5/docker/body_reader.go diff --git a/vendor/github.com/containers/image/v5/docker/cache.go b/vendor/go.podman.io/image/v5/docker/cache.go similarity index 89% rename from vendor/github.com/containers/image/v5/docker/cache.go rename to vendor/go.podman.io/image/v5/docker/cache.go index 728d32d1..35fe37b3 100644 --- a/vendor/github.com/containers/image/v5/docker/cache.go +++ b/vendor/go.podman.io/image/v5/docker/cache.go @@ -1,8 +1,8 @@ package docker import ( - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/types" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/types" ) // bicTransportScope returns a BICTransportScope appropriate for ref. diff --git a/vendor/github.com/containers/image/v5/docker/distribution_error.go b/vendor/go.podman.io/image/v5/docker/distribution_error.go similarity index 100% rename from vendor/github.com/containers/image/v5/docker/distribution_error.go rename to vendor/go.podman.io/image/v5/docker/distribution_error.go diff --git a/vendor/github.com/containers/image/v5/docker/docker_client.go b/vendor/go.podman.io/image/v5/docker/docker_client.go similarity index 97% rename from vendor/github.com/containers/image/v5/docker/docker_client.go rename to vendor/go.podman.io/image/v5/docker/docker_client.go index 851d3e08..a83e19a3 100644 --- a/vendor/github.com/containers/image/v5/docker/docker_client.go +++ b/vendor/go.podman.io/image/v5/docker/docker_client.go @@ -17,24 +17,24 @@ import ( "sync" "time" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/internal/iolimits" - "github.com/containers/image/v5/internal/multierr" - "github.com/containers/image/v5/internal/set" - "github.com/containers/image/v5/internal/useragent" - "github.com/containers/image/v5/manifest" - "github.com/containers/image/v5/pkg/docker/config" - "github.com/containers/image/v5/pkg/sysregistriesv2" - "github.com/containers/image/v5/pkg/tlsclientconfig" - "github.com/containers/image/v5/types" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/homedir" "github.com/docker/distribution/registry/api/errcode" v2 "github.com/docker/distribution/registry/api/v2" "github.com/docker/go-connections/tlsconfig" digest "github.com/opencontainers/go-digest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/internal/iolimits" + "go.podman.io/image/v5/internal/multierr" + "go.podman.io/image/v5/internal/set" + "go.podman.io/image/v5/internal/useragent" + "go.podman.io/image/v5/manifest" + "go.podman.io/image/v5/pkg/docker/config" + "go.podman.io/image/v5/pkg/sysregistriesv2" + "go.podman.io/image/v5/pkg/tlsclientconfig" + "go.podman.io/image/v5/types" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/homedir" ) const ( @@ -228,7 +228,12 @@ func newDockerClient(sys *types.SystemContext, registry, reference string) (*doc registry = dockerRegistry } tlsClientConfig := &tls.Config{ - CipherSuites: tlsconfig.DefaultServerAcceptedCiphers, + // As of 2025-08, tlsconfig.ClientDefault() differs from Go 1.23 defaults only in CipherSuites; + // so, limit us to only using that value. If go-connections/tlsconfig changes its policy, we + // will want to consider that and make a decision whether to follow suit. + // There is some chance that eventually the Go default will be to require TLS 1.3, and that point + // we might want to drop the dependency on go-connections entirely. + CipherSuites: tlsconfig.ClientDefault().CipherSuites, } // It is undefined whether the host[:port] string for dockerHostname should be dockerHostname or dockerRegistry, diff --git a/vendor/github.com/containers/image/v5/docker/docker_image.go b/vendor/go.podman.io/image/v5/docker/docker_image.go similarity index 96% rename from vendor/github.com/containers/image/v5/docker/docker_image.go rename to vendor/go.podman.io/image/v5/docker/docker_image.go index 74f559dc..1e5de65a 100644 --- a/vendor/github.com/containers/image/v5/docker/docker_image.go +++ b/vendor/go.podman.io/image/v5/docker/docker_image.go @@ -9,12 +9,12 @@ import ( "net/url" "strings" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/internal/image" - "github.com/containers/image/v5/manifest" - "github.com/containers/image/v5/types" "github.com/opencontainers/go-digest" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/internal/image" + "go.podman.io/image/v5/manifest" + "go.podman.io/image/v5/types" ) // Image is a Docker-specific implementation of types.ImageCloser with a few extra methods diff --git a/vendor/github.com/containers/image/v5/docker/docker_image_dest.go b/vendor/go.podman.io/image/v5/docker/docker_image_dest.go similarity index 97% rename from vendor/github.com/containers/image/v5/docker/docker_image_dest.go rename to vendor/go.podman.io/image/v5/docker/docker_image_dest.go index 76e48a38..86077fe9 100644 --- a/vendor/github.com/containers/image/v5/docker/docker_image_dest.go +++ b/vendor/go.podman.io/image/v5/docker/docker_image_dest.go @@ -16,26 +16,26 @@ import ( "slices" "strings" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/internal/blobinfocache" - "github.com/containers/image/v5/internal/imagedestination/impl" - "github.com/containers/image/v5/internal/imagedestination/stubs" - "github.com/containers/image/v5/internal/iolimits" - "github.com/containers/image/v5/internal/private" - "github.com/containers/image/v5/internal/putblobdigest" - "github.com/containers/image/v5/internal/set" - "github.com/containers/image/v5/internal/signature" - "github.com/containers/image/v5/internal/streamdigest" - "github.com/containers/image/v5/internal/uploadreader" - "github.com/containers/image/v5/manifest" - "github.com/containers/image/v5/pkg/blobinfocache/none" - compressiontypes "github.com/containers/image/v5/pkg/compression/types" - "github.com/containers/image/v5/types" "github.com/docker/distribution/registry/api/errcode" v2 "github.com/docker/distribution/registry/api/v2" "github.com/opencontainers/go-digest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/internal/blobinfocache" + "go.podman.io/image/v5/internal/imagedestination/impl" + "go.podman.io/image/v5/internal/imagedestination/stubs" + "go.podman.io/image/v5/internal/iolimits" + "go.podman.io/image/v5/internal/private" + "go.podman.io/image/v5/internal/putblobdigest" + "go.podman.io/image/v5/internal/set" + "go.podman.io/image/v5/internal/signature" + "go.podman.io/image/v5/internal/streamdigest" + "go.podman.io/image/v5/internal/uploadreader" + "go.podman.io/image/v5/manifest" + "go.podman.io/image/v5/pkg/blobinfocache/none" + compressiontypes "go.podman.io/image/v5/pkg/compression/types" + "go.podman.io/image/v5/types" ) type dockerImageDestination struct { diff --git a/vendor/github.com/containers/image/v5/docker/docker_image_src.go b/vendor/go.podman.io/image/v5/docker/docker_image_src.go similarity index 98% rename from vendor/github.com/containers/image/v5/docker/docker_image_src.go rename to vendor/go.podman.io/image/v5/docker/docker_image_src.go index 4eb9cdfb..553dddee 100644 --- a/vendor/github.com/containers/image/v5/docker/docker_image_src.go +++ b/vendor/go.podman.io/image/v5/docker/docker_image_src.go @@ -17,19 +17,19 @@ import ( "strings" "sync" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/internal/imagesource/impl" - "github.com/containers/image/v5/internal/imagesource/stubs" - "github.com/containers/image/v5/internal/iolimits" - "github.com/containers/image/v5/internal/private" - "github.com/containers/image/v5/internal/signature" - "github.com/containers/image/v5/manifest" - "github.com/containers/image/v5/pkg/blobinfocache/none" - "github.com/containers/image/v5/pkg/sysregistriesv2" - "github.com/containers/image/v5/types" - "github.com/containers/storage/pkg/regexp" digest "github.com/opencontainers/go-digest" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/internal/imagesource/impl" + "go.podman.io/image/v5/internal/imagesource/stubs" + "go.podman.io/image/v5/internal/iolimits" + "go.podman.io/image/v5/internal/private" + "go.podman.io/image/v5/internal/signature" + "go.podman.io/image/v5/manifest" + "go.podman.io/image/v5/pkg/blobinfocache/none" + "go.podman.io/image/v5/pkg/sysregistriesv2" + "go.podman.io/image/v5/types" + "go.podman.io/storage/pkg/regexp" ) // maxLookasideSignatures is an arbitrary limit for the total number of signatures we would try to read from a lookaside server, diff --git a/vendor/github.com/containers/image/v5/docker/docker_transport.go b/vendor/go.podman.io/image/v5/docker/docker_transport.go similarity index 97% rename from vendor/github.com/containers/image/v5/docker/docker_transport.go rename to vendor/go.podman.io/image/v5/docker/docker_transport.go index c10463a4..5831dc3c 100644 --- a/vendor/github.com/containers/image/v5/docker/docker_transport.go +++ b/vendor/go.podman.io/image/v5/docker/docker_transport.go @@ -6,10 +6,10 @@ import ( "fmt" "strings" - "github.com/containers/image/v5/docker/policyconfiguration" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/transports" - "github.com/containers/image/v5/types" + "go.podman.io/image/v5/docker/policyconfiguration" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/transports" + "go.podman.io/image/v5/types" ) // UnknownDigestSuffix can be appended to a reference when the caller diff --git a/vendor/github.com/containers/image/v5/docker/errors.go b/vendor/go.podman.io/image/v5/docker/errors.go similarity index 100% rename from vendor/github.com/containers/image/v5/docker/errors.go rename to vendor/go.podman.io/image/v5/docker/errors.go diff --git a/vendor/github.com/containers/image/v5/docker/paths_common.go b/vendor/go.podman.io/image/v5/docker/paths_common.go similarity index 100% rename from vendor/github.com/containers/image/v5/docker/paths_common.go rename to vendor/go.podman.io/image/v5/docker/paths_common.go diff --git a/vendor/github.com/containers/image/v5/docker/paths_freebsd.go b/vendor/go.podman.io/image/v5/docker/paths_freebsd.go similarity index 100% rename from vendor/github.com/containers/image/v5/docker/paths_freebsd.go rename to vendor/go.podman.io/image/v5/docker/paths_freebsd.go diff --git a/vendor/github.com/containers/image/v5/docker/policyconfiguration/naming.go b/vendor/go.podman.io/image/v5/docker/policyconfiguration/naming.go similarity index 98% rename from vendor/github.com/containers/image/v5/docker/policyconfiguration/naming.go rename to vendor/go.podman.io/image/v5/docker/policyconfiguration/naming.go index e1f1f1f2..ddb0bce1 100644 --- a/vendor/github.com/containers/image/v5/docker/policyconfiguration/naming.go +++ b/vendor/go.podman.io/image/v5/docker/policyconfiguration/naming.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/containers/image/v5/docker/reference" + "go.podman.io/image/v5/docker/reference" ) // DockerReferenceIdentity returns a string representation of the reference, suitable for policy lookup, diff --git a/vendor/github.com/containers/image/v5/docker/reference/README.md b/vendor/go.podman.io/image/v5/docker/reference/README.md similarity index 100% rename from vendor/github.com/containers/image/v5/docker/reference/README.md rename to vendor/go.podman.io/image/v5/docker/reference/README.md diff --git a/vendor/github.com/containers/image/v5/docker/reference/helpers.go b/vendor/go.podman.io/image/v5/docker/reference/helpers.go similarity index 100% rename from vendor/github.com/containers/image/v5/docker/reference/helpers.go rename to vendor/go.podman.io/image/v5/docker/reference/helpers.go diff --git a/vendor/github.com/containers/image/v5/docker/reference/normalize.go b/vendor/go.podman.io/image/v5/docker/reference/normalize.go similarity index 100% rename from vendor/github.com/containers/image/v5/docker/reference/normalize.go rename to vendor/go.podman.io/image/v5/docker/reference/normalize.go diff --git a/vendor/github.com/containers/image/v5/docker/reference/reference.go b/vendor/go.podman.io/image/v5/docker/reference/reference.go similarity index 100% rename from vendor/github.com/containers/image/v5/docker/reference/reference.go rename to vendor/go.podman.io/image/v5/docker/reference/reference.go diff --git a/vendor/github.com/containers/image/v5/docker/reference/regexp-additions.go b/vendor/go.podman.io/image/v5/docker/reference/regexp-additions.go similarity index 100% rename from vendor/github.com/containers/image/v5/docker/reference/regexp-additions.go rename to vendor/go.podman.io/image/v5/docker/reference/regexp-additions.go diff --git a/vendor/github.com/containers/image/v5/docker/reference/regexp.go b/vendor/go.podman.io/image/v5/docker/reference/regexp.go similarity index 98% rename from vendor/github.com/containers/image/v5/docker/reference/regexp.go rename to vendor/go.podman.io/image/v5/docker/reference/regexp.go index 76ba5c2d..db656fe6 100644 --- a/vendor/github.com/containers/image/v5/docker/reference/regexp.go +++ b/vendor/go.podman.io/image/v5/docker/reference/regexp.go @@ -4,7 +4,7 @@ import ( "regexp" "strings" - storageRegexp "github.com/containers/storage/pkg/regexp" + storageRegexp "go.podman.io/storage/pkg/regexp" ) const ( diff --git a/vendor/github.com/containers/image/v5/docker/registries_d.go b/vendor/go.podman.io/image/v5/docker/registries_d.go similarity index 97% rename from vendor/github.com/containers/image/v5/docker/registries_d.go rename to vendor/go.podman.io/image/v5/docker/registries_d.go index 89d48cc4..53bbb53c 100644 --- a/vendor/github.com/containers/image/v5/docker/registries_d.go +++ b/vendor/go.podman.io/image/v5/docker/registries_d.go @@ -10,19 +10,19 @@ import ( "path/filepath" "strings" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/internal/rootless" - "github.com/containers/image/v5/types" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/homedir" "github.com/opencontainers/go-digest" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/internal/rootless" + "go.podman.io/image/v5/types" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/homedir" "gopkg.in/yaml.v3" ) // systemRegistriesDirPath is the path to registries.d, used for locating lookaside Docker signature storage. // You can override this at build time with -// -ldflags '-X github.com/containers/image/v5/docker.systemRegistriesDirPath=$your_path' +// -ldflags '-X go.podman.io/image/v5/docker.systemRegistriesDirPath=$your_path' var systemRegistriesDirPath = builtinRegistriesDirPath // builtinRegistriesDirPath is the path to registries.d. diff --git a/vendor/github.com/containers/image/v5/docker/wwwauthenticate.go b/vendor/go.podman.io/image/v5/docker/wwwauthenticate.go similarity index 100% rename from vendor/github.com/containers/image/v5/docker/wwwauthenticate.go rename to vendor/go.podman.io/image/v5/docker/wwwauthenticate.go diff --git a/vendor/github.com/containers/image/v5/internal/blobinfocache/blobinfocache.go b/vendor/go.podman.io/image/v5/internal/blobinfocache/blobinfocache.go similarity index 97% rename from vendor/github.com/containers/image/v5/internal/blobinfocache/blobinfocache.go rename to vendor/go.podman.io/image/v5/internal/blobinfocache/blobinfocache.go index f31ee312..5399c296 100644 --- a/vendor/github.com/containers/image/v5/internal/blobinfocache/blobinfocache.go +++ b/vendor/go.podman.io/image/v5/internal/blobinfocache/blobinfocache.go @@ -1,8 +1,8 @@ package blobinfocache import ( - "github.com/containers/image/v5/types" digest "github.com/opencontainers/go-digest" + "go.podman.io/image/v5/types" ) // FromBlobInfoCache returns a BlobInfoCache2 based on a BlobInfoCache, returning the original diff --git a/vendor/github.com/containers/image/v5/internal/blobinfocache/types.go b/vendor/go.podman.io/image/v5/internal/blobinfocache/types.go similarity index 97% rename from vendor/github.com/containers/image/v5/internal/blobinfocache/types.go rename to vendor/go.podman.io/image/v5/internal/blobinfocache/types.go index acf82ee6..d9d27ec9 100644 --- a/vendor/github.com/containers/image/v5/internal/blobinfocache/types.go +++ b/vendor/go.podman.io/image/v5/internal/blobinfocache/types.go @@ -1,9 +1,9 @@ package blobinfocache import ( - compressiontypes "github.com/containers/image/v5/pkg/compression/types" - "github.com/containers/image/v5/types" digest "github.com/opencontainers/go-digest" + compressiontypes "go.podman.io/image/v5/pkg/compression/types" + "go.podman.io/image/v5/types" ) const ( diff --git a/vendor/github.com/containers/image/v5/internal/image/docker_list.go b/vendor/go.podman.io/image/v5/internal/image/docker_list.go similarity index 91% rename from vendor/github.com/containers/image/v5/internal/image/docker_list.go rename to vendor/go.podman.io/image/v5/internal/image/docker_list.go index 617a451a..2b49964a 100644 --- a/vendor/github.com/containers/image/v5/internal/image/docker_list.go +++ b/vendor/go.podman.io/image/v5/internal/image/docker_list.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/containers/image/v5/internal/manifest" - "github.com/containers/image/v5/types" + "go.podman.io/image/v5/internal/manifest" + "go.podman.io/image/v5/types" ) func manifestSchema2FromManifestList(ctx context.Context, sys *types.SystemContext, src types.ImageSource, manblob []byte) (genericManifest, error) { diff --git a/vendor/github.com/containers/image/v5/internal/image/docker_schema1.go b/vendor/go.podman.io/image/v5/internal/image/docker_schema1.go similarity index 97% rename from vendor/github.com/containers/image/v5/internal/image/docker_schema1.go rename to vendor/go.podman.io/image/v5/internal/image/docker_schema1.go index 3ef8e144..da7a943b 100644 --- a/vendor/github.com/containers/image/v5/internal/image/docker_schema1.go +++ b/vendor/go.podman.io/image/v5/internal/image/docker_schema1.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/manifest" - "github.com/containers/image/v5/types" "github.com/opencontainers/go-digest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/manifest" + "go.podman.io/image/v5/types" ) type manifestSchema1 struct { @@ -202,7 +202,7 @@ func (m *manifestSchema1) convertToManifestSchema2(_ context.Context, options *t d = layerDiffIDs[v2Index] } layers = append(layers, manifest.Schema2Descriptor{ - MediaType: "application/vnd.docker.image.rootfs.diff.tar.gzip", + MediaType: manifest.DockerV2Schema2LayerMediaType, Size: size, Digest: m.m.FSLayers[v1Index].BlobSum, }) @@ -217,7 +217,7 @@ func (m *manifestSchema1) convertToManifestSchema2(_ context.Context, options *t return nil, err } configDescriptor := manifest.Schema2Descriptor{ - MediaType: "application/vnd.docker.container.image.v1+json", + MediaType: manifest.DockerV2Schema2ConfigMediaType, Size: int64(len(configJSON)), Digest: digest.FromBytes(configJSON), } diff --git a/vendor/github.com/containers/image/v5/internal/image/docker_schema2.go b/vendor/go.podman.io/image/v5/internal/image/docker_schema2.go similarity index 98% rename from vendor/github.com/containers/image/v5/internal/image/docker_schema2.go rename to vendor/go.podman.io/image/v5/internal/image/docker_schema2.go index 01219e39..9305524a 100644 --- a/vendor/github.com/containers/image/v5/internal/image/docker_schema2.go +++ b/vendor/go.podman.io/image/v5/internal/image/docker_schema2.go @@ -10,14 +10,14 @@ import ( "fmt" "strings" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/internal/iolimits" - "github.com/containers/image/v5/manifest" - "github.com/containers/image/v5/pkg/blobinfocache/none" - "github.com/containers/image/v5/types" "github.com/opencontainers/go-digest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/internal/iolimits" + "go.podman.io/image/v5/manifest" + "go.podman.io/image/v5/pkg/blobinfocache/none" + "go.podman.io/image/v5/types" ) // GzippedEmptyLayer is a gzip-compressed version of an empty tar file (1024 NULL bytes) diff --git a/vendor/github.com/containers/image/v5/internal/image/manifest.go b/vendor/go.podman.io/image/v5/internal/image/manifest.go similarity index 97% rename from vendor/github.com/containers/image/v5/internal/image/manifest.go rename to vendor/go.podman.io/image/v5/internal/image/manifest.go index ed57e08d..d6ae8b6f 100644 --- a/vendor/github.com/containers/image/v5/internal/image/manifest.go +++ b/vendor/go.podman.io/image/v5/internal/image/manifest.go @@ -4,10 +4,10 @@ import ( "context" "fmt" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/manifest" - "github.com/containers/image/v5/types" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/manifest" + "go.podman.io/image/v5/types" ) // genericManifest is an interface for parsing, modifying image manifests and related data. diff --git a/vendor/github.com/containers/image/v5/internal/image/memory.go b/vendor/go.podman.io/image/v5/internal/image/memory.go similarity index 98% rename from vendor/github.com/containers/image/v5/internal/image/memory.go rename to vendor/go.podman.io/image/v5/internal/image/memory.go index e22c7aaf..9dff3919 100644 --- a/vendor/github.com/containers/image/v5/internal/image/memory.go +++ b/vendor/go.podman.io/image/v5/internal/image/memory.go @@ -4,7 +4,7 @@ import ( "context" "errors" - "github.com/containers/image/v5/types" + "go.podman.io/image/v5/types" ) // memoryImage is a mostly-implementation of types.Image assembled from data diff --git a/vendor/github.com/containers/image/v5/internal/image/oci.go b/vendor/go.podman.io/image/v5/internal/image/oci.go similarity index 97% rename from vendor/github.com/containers/image/v5/internal/image/oci.go rename to vendor/go.podman.io/image/v5/internal/image/oci.go index aaef95ff..8b73b91f 100644 --- a/vendor/github.com/containers/image/v5/internal/image/oci.go +++ b/vendor/go.podman.io/image/v5/internal/image/oci.go @@ -7,15 +7,15 @@ import ( "fmt" "slices" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/internal/iolimits" - internalManifest "github.com/containers/image/v5/internal/manifest" - "github.com/containers/image/v5/manifest" - "github.com/containers/image/v5/pkg/blobinfocache/none" - "github.com/containers/image/v5/types" ociencspec "github.com/containers/ocicrypt/spec" "github.com/opencontainers/go-digest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/internal/iolimits" + internalManifest "go.podman.io/image/v5/internal/manifest" + "go.podman.io/image/v5/manifest" + "go.podman.io/image/v5/pkg/blobinfocache/none" + "go.podman.io/image/v5/types" ) type manifestOCI1 struct { diff --git a/vendor/github.com/containers/image/v5/internal/image/oci_index.go b/vendor/go.podman.io/image/v5/internal/image/oci_index.go similarity index 91% rename from vendor/github.com/containers/image/v5/internal/image/oci_index.go rename to vendor/go.podman.io/image/v5/internal/image/oci_index.go index 0e945c85..b9071b55 100644 --- a/vendor/github.com/containers/image/v5/internal/image/oci_index.go +++ b/vendor/go.podman.io/image/v5/internal/image/oci_index.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/containers/image/v5/internal/manifest" - "github.com/containers/image/v5/types" + "go.podman.io/image/v5/internal/manifest" + "go.podman.io/image/v5/types" ) func manifestOCI1FromImageIndex(ctx context.Context, sys *types.SystemContext, src types.ImageSource, manblob []byte) (genericManifest, error) { diff --git a/vendor/github.com/containers/image/v5/internal/image/sourced.go b/vendor/go.podman.io/image/v5/internal/image/sourced.go similarity index 99% rename from vendor/github.com/containers/image/v5/internal/image/sourced.go rename to vendor/go.podman.io/image/v5/internal/image/sourced.go index 661891aa..ba2eaa0c 100644 --- a/vendor/github.com/containers/image/v5/internal/image/sourced.go +++ b/vendor/go.podman.io/image/v5/internal/image/sourced.go @@ -6,7 +6,7 @@ package image import ( "context" - "github.com/containers/image/v5/types" + "go.podman.io/image/v5/types" ) // FromReference returns a types.ImageCloser implementation for the default instance reading from reference. diff --git a/vendor/github.com/containers/image/v5/internal/image/unparsed.go b/vendor/go.podman.io/image/v5/internal/image/unparsed.go similarity index 94% rename from vendor/github.com/containers/image/v5/internal/image/unparsed.go rename to vendor/go.podman.io/image/v5/internal/image/unparsed.go index 1cffe431..45c37238 100644 --- a/vendor/github.com/containers/image/v5/internal/image/unparsed.go +++ b/vendor/go.podman.io/image/v5/internal/image/unparsed.go @@ -4,13 +4,13 @@ import ( "context" "fmt" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/internal/imagesource" - "github.com/containers/image/v5/internal/private" - "github.com/containers/image/v5/internal/signature" - "github.com/containers/image/v5/manifest" - "github.com/containers/image/v5/types" "github.com/opencontainers/go-digest" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/internal/imagesource" + "go.podman.io/image/v5/internal/private" + "go.podman.io/image/v5/internal/signature" + "go.podman.io/image/v5/manifest" + "go.podman.io/image/v5/types" ) // UnparsedImage implements types.UnparsedImage . diff --git a/vendor/github.com/containers/image/v5/internal/imagedestination/impl/compat.go b/vendor/go.podman.io/image/v5/internal/imagedestination/impl/compat.go similarity index 96% rename from vendor/github.com/containers/image/v5/internal/imagedestination/impl/compat.go rename to vendor/go.podman.io/image/v5/internal/imagedestination/impl/compat.go index 70b207d9..9a8d1871 100644 --- a/vendor/github.com/containers/image/v5/internal/imagedestination/impl/compat.go +++ b/vendor/go.podman.io/image/v5/internal/imagedestination/impl/compat.go @@ -4,11 +4,11 @@ import ( "context" "io" - "github.com/containers/image/v5/internal/blobinfocache" - "github.com/containers/image/v5/internal/private" - "github.com/containers/image/v5/internal/signature" - "github.com/containers/image/v5/types" "github.com/opencontainers/go-digest" + "go.podman.io/image/v5/internal/blobinfocache" + "go.podman.io/image/v5/internal/private" + "go.podman.io/image/v5/internal/signature" + "go.podman.io/image/v5/types" ) // Compat implements the obsolete parts of types.ImageDestination diff --git a/vendor/github.com/containers/image/v5/internal/imagedestination/impl/helpers.go b/vendor/go.podman.io/image/v5/internal/imagedestination/impl/helpers.go similarity index 82% rename from vendor/github.com/containers/image/v5/internal/imagedestination/impl/helpers.go rename to vendor/go.podman.io/image/v5/internal/imagedestination/impl/helpers.go index 9b42cfbe..b12beff0 100644 --- a/vendor/github.com/containers/image/v5/internal/imagedestination/impl/helpers.go +++ b/vendor/go.podman.io/image/v5/internal/imagedestination/impl/helpers.go @@ -1,8 +1,8 @@ package impl import ( - "github.com/containers/image/v5/internal/manifest" - "github.com/containers/image/v5/internal/private" + "go.podman.io/image/v5/internal/manifest" + "go.podman.io/image/v5/internal/private" ) // OriginalCandidateMatchesTryReusingBlobOptions returns true if the original blob passed to TryReusingBlobWithOptions diff --git a/vendor/github.com/containers/image/v5/internal/imagedestination/impl/properties.go b/vendor/go.podman.io/image/v5/internal/imagedestination/impl/properties.go similarity index 98% rename from vendor/github.com/containers/image/v5/internal/imagedestination/impl/properties.go rename to vendor/go.podman.io/image/v5/internal/imagedestination/impl/properties.go index 704812e9..1aab4b06 100644 --- a/vendor/github.com/containers/image/v5/internal/imagedestination/impl/properties.go +++ b/vendor/go.podman.io/image/v5/internal/imagedestination/impl/properties.go @@ -1,6 +1,6 @@ package impl -import "github.com/containers/image/v5/types" +import "go.podman.io/image/v5/types" // Properties collects properties of an ImageDestination that are constant throughout its lifetime // (but might differ across instances). diff --git a/vendor/github.com/containers/image/v5/internal/imagedestination/stubs/original_oci_config.go b/vendor/go.podman.io/image/v5/internal/imagedestination/stubs/original_oci_config.go similarity index 100% rename from vendor/github.com/containers/image/v5/internal/imagedestination/stubs/original_oci_config.go rename to vendor/go.podman.io/image/v5/internal/imagedestination/stubs/original_oci_config.go diff --git a/vendor/github.com/containers/image/v5/internal/imagedestination/stubs/put_blob_partial.go b/vendor/go.podman.io/image/v5/internal/imagedestination/stubs/put_blob_partial.go similarity index 95% rename from vendor/github.com/containers/image/v5/internal/imagedestination/stubs/put_blob_partial.go rename to vendor/go.podman.io/image/v5/internal/imagedestination/stubs/put_blob_partial.go index 22bed4b0..573ad832 100644 --- a/vendor/github.com/containers/image/v5/internal/imagedestination/stubs/put_blob_partial.go +++ b/vendor/go.podman.io/image/v5/internal/imagedestination/stubs/put_blob_partial.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/containers/image/v5/internal/private" - "github.com/containers/image/v5/types" + "go.podman.io/image/v5/internal/private" + "go.podman.io/image/v5/types" ) // NoPutBlobPartialInitialize implements parts of private.ImageDestination diff --git a/vendor/github.com/containers/image/v5/internal/imagedestination/stubs/signatures.go b/vendor/go.podman.io/image/v5/internal/imagedestination/stubs/signatures.go similarity index 97% rename from vendor/github.com/containers/image/v5/internal/imagedestination/stubs/signatures.go rename to vendor/go.podman.io/image/v5/internal/imagedestination/stubs/signatures.go index 7015fd06..c046449b 100644 --- a/vendor/github.com/containers/image/v5/internal/imagedestination/stubs/signatures.go +++ b/vendor/go.podman.io/image/v5/internal/imagedestination/stubs/signatures.go @@ -4,8 +4,8 @@ import ( "context" "errors" - "github.com/containers/image/v5/internal/signature" "github.com/opencontainers/go-digest" + "go.podman.io/image/v5/internal/signature" ) // NoSignaturesInitialize implements parts of private.ImageDestination diff --git a/vendor/github.com/containers/image/v5/internal/imagedestination/stubs/stubs.go b/vendor/go.podman.io/image/v5/internal/imagedestination/stubs/stubs.go similarity index 100% rename from vendor/github.com/containers/image/v5/internal/imagedestination/stubs/stubs.go rename to vendor/go.podman.io/image/v5/internal/imagedestination/stubs/stubs.go diff --git a/vendor/github.com/containers/image/v5/internal/imagesource/impl/compat.go b/vendor/go.podman.io/image/v5/internal/imagesource/impl/compat.go similarity index 94% rename from vendor/github.com/containers/image/v5/internal/imagesource/impl/compat.go rename to vendor/go.podman.io/image/v5/internal/imagesource/impl/compat.go index 7d859c31..4d56f435 100644 --- a/vendor/github.com/containers/image/v5/internal/imagesource/impl/compat.go +++ b/vendor/go.podman.io/image/v5/internal/imagesource/impl/compat.go @@ -3,9 +3,9 @@ package impl import ( "context" - "github.com/containers/image/v5/internal/private" - "github.com/containers/image/v5/internal/signature" "github.com/opencontainers/go-digest" + "go.podman.io/image/v5/internal/private" + "go.podman.io/image/v5/internal/signature" ) // Compat implements the obsolete parts of types.ImageSource diff --git a/vendor/github.com/containers/image/v5/internal/imagesource/impl/layer_infos.go b/vendor/go.podman.io/image/v5/internal/imagesource/impl/layer_infos.go similarity index 96% rename from vendor/github.com/containers/image/v5/internal/imagesource/impl/layer_infos.go rename to vendor/go.podman.io/image/v5/internal/imagesource/impl/layer_infos.go index d5eae635..63016f33 100644 --- a/vendor/github.com/containers/image/v5/internal/imagesource/impl/layer_infos.go +++ b/vendor/go.podman.io/image/v5/internal/imagesource/impl/layer_infos.go @@ -3,8 +3,8 @@ package impl import ( "context" - "github.com/containers/image/v5/types" "github.com/opencontainers/go-digest" + "go.podman.io/image/v5/types" ) // DoesNotAffectLayerInfosForCopy implements LayerInfosForCopy() that returns nothing. diff --git a/vendor/github.com/containers/image/v5/internal/imagesource/impl/properties.go b/vendor/go.podman.io/image/v5/internal/imagesource/impl/properties.go similarity index 100% rename from vendor/github.com/containers/image/v5/internal/imagesource/impl/properties.go rename to vendor/go.podman.io/image/v5/internal/imagesource/impl/properties.go diff --git a/vendor/github.com/containers/image/v5/internal/imagesource/impl/signatures.go b/vendor/go.podman.io/image/v5/internal/imagesource/impl/signatures.go similarity index 93% rename from vendor/github.com/containers/image/v5/internal/imagesource/impl/signatures.go rename to vendor/go.podman.io/image/v5/internal/imagesource/impl/signatures.go index b3a8c7e8..749e42a0 100644 --- a/vendor/github.com/containers/image/v5/internal/imagesource/impl/signatures.go +++ b/vendor/go.podman.io/image/v5/internal/imagesource/impl/signatures.go @@ -3,8 +3,8 @@ package impl import ( "context" - "github.com/containers/image/v5/internal/signature" "github.com/opencontainers/go-digest" + "go.podman.io/image/v5/internal/signature" ) // NoSignatures implements GetSignatures() that returns nothing. diff --git a/vendor/github.com/containers/image/v5/internal/imagesource/stubs/get_blob_at.go b/vendor/go.podman.io/image/v5/internal/imagesource/stubs/get_blob_at.go similarity index 95% rename from vendor/github.com/containers/image/v5/internal/imagesource/stubs/get_blob_at.go rename to vendor/go.podman.io/image/v5/internal/imagesource/stubs/get_blob_at.go index 286ae524..b1fe9b9a 100644 --- a/vendor/github.com/containers/image/v5/internal/imagesource/stubs/get_blob_at.go +++ b/vendor/go.podman.io/image/v5/internal/imagesource/stubs/get_blob_at.go @@ -5,8 +5,8 @@ import ( "fmt" "io" - "github.com/containers/image/v5/internal/private" - "github.com/containers/image/v5/types" + "go.podman.io/image/v5/internal/private" + "go.podman.io/image/v5/types" ) // NoGetBlobAtInitialize implements parts of private.ImageSource diff --git a/vendor/github.com/containers/image/v5/internal/imagesource/stubs/stubs.go b/vendor/go.podman.io/image/v5/internal/imagesource/stubs/stubs.go similarity index 100% rename from vendor/github.com/containers/image/v5/internal/imagesource/stubs/stubs.go rename to vendor/go.podman.io/image/v5/internal/imagesource/stubs/stubs.go diff --git a/vendor/github.com/containers/image/v5/internal/imagesource/wrapper.go b/vendor/go.podman.io/image/v5/internal/imagesource/wrapper.go similarity index 90% rename from vendor/github.com/containers/image/v5/internal/imagesource/wrapper.go rename to vendor/go.podman.io/image/v5/internal/imagesource/wrapper.go index f0d1d042..00bf8893 100644 --- a/vendor/github.com/containers/image/v5/internal/imagesource/wrapper.go +++ b/vendor/go.podman.io/image/v5/internal/imagesource/wrapper.go @@ -3,11 +3,11 @@ package imagesource import ( "context" - "github.com/containers/image/v5/internal/imagesource/stubs" - "github.com/containers/image/v5/internal/private" - "github.com/containers/image/v5/internal/signature" - "github.com/containers/image/v5/types" "github.com/opencontainers/go-digest" + "go.podman.io/image/v5/internal/imagesource/stubs" + "go.podman.io/image/v5/internal/private" + "go.podman.io/image/v5/internal/signature" + "go.podman.io/image/v5/types" ) // wrapped provides the private.ImageSource operations diff --git a/vendor/github.com/containers/image/v5/internal/iolimits/iolimits.go b/vendor/go.podman.io/image/v5/internal/iolimits/iolimits.go similarity index 100% rename from vendor/github.com/containers/image/v5/internal/iolimits/iolimits.go rename to vendor/go.podman.io/image/v5/internal/iolimits/iolimits.go diff --git a/vendor/github.com/containers/image/v5/internal/manifest/common.go b/vendor/go.podman.io/image/v5/internal/manifest/common.go similarity index 100% rename from vendor/github.com/containers/image/v5/internal/manifest/common.go rename to vendor/go.podman.io/image/v5/internal/manifest/common.go diff --git a/vendor/github.com/containers/image/v5/internal/manifest/docker_schema2.go b/vendor/go.podman.io/image/v5/internal/manifest/docker_schema2.go similarity index 100% rename from vendor/github.com/containers/image/v5/internal/manifest/docker_schema2.go rename to vendor/go.podman.io/image/v5/internal/manifest/docker_schema2.go diff --git a/vendor/github.com/containers/image/v5/internal/manifest/docker_schema2_list.go b/vendor/go.podman.io/image/v5/internal/manifest/docker_schema2_list.go similarity index 98% rename from vendor/github.com/containers/image/v5/internal/manifest/docker_schema2_list.go rename to vendor/go.podman.io/image/v5/internal/manifest/docker_schema2_list.go index 4c1589ef..fdcc4208 100644 --- a/vendor/github.com/containers/image/v5/internal/manifest/docker_schema2_list.go +++ b/vendor/go.podman.io/image/v5/internal/manifest/docker_schema2_list.go @@ -5,11 +5,11 @@ import ( "fmt" "slices" - platform "github.com/containers/image/v5/internal/pkg/platform" - compression "github.com/containers/image/v5/pkg/compression/types" - "github.com/containers/image/v5/types" "github.com/opencontainers/go-digest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" + platform "go.podman.io/image/v5/internal/pkg/platform" + compression "go.podman.io/image/v5/pkg/compression/types" + "go.podman.io/image/v5/types" ) // Schema2PlatformSpec describes the platform which a particular manifest is diff --git a/vendor/github.com/containers/image/v5/internal/manifest/errors.go b/vendor/go.podman.io/image/v5/internal/manifest/errors.go similarity index 100% rename from vendor/github.com/containers/image/v5/internal/manifest/errors.go rename to vendor/go.podman.io/image/v5/internal/manifest/errors.go diff --git a/vendor/github.com/containers/image/v5/internal/manifest/list.go b/vendor/go.podman.io/image/v5/internal/manifest/list.go similarity index 97% rename from vendor/github.com/containers/image/v5/internal/manifest/list.go rename to vendor/go.podman.io/image/v5/internal/manifest/list.go index 1c614d12..100d1c86 100644 --- a/vendor/github.com/containers/image/v5/internal/manifest/list.go +++ b/vendor/go.podman.io/image/v5/internal/manifest/list.go @@ -3,10 +3,10 @@ package manifest import ( "fmt" - compression "github.com/containers/image/v5/pkg/compression/types" - "github.com/containers/image/v5/types" digest "github.com/opencontainers/go-digest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" + compression "go.podman.io/image/v5/pkg/compression/types" + "go.podman.io/image/v5/types" ) // ListPublic is a subset of List which is a part of the public API; diff --git a/vendor/github.com/containers/image/v5/internal/manifest/manifest.go b/vendor/go.podman.io/image/v5/internal/manifest/manifest.go similarity index 99% rename from vendor/github.com/containers/image/v5/internal/manifest/manifest.go rename to vendor/go.podman.io/image/v5/internal/manifest/manifest.go index 3fb52104..7dfe7784 100644 --- a/vendor/github.com/containers/image/v5/internal/manifest/manifest.go +++ b/vendor/go.podman.io/image/v5/internal/manifest/manifest.go @@ -4,10 +4,10 @@ import ( "encoding/json" "slices" - compressiontypes "github.com/containers/image/v5/pkg/compression/types" "github.com/containers/libtrust" digest "github.com/opencontainers/go-digest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" + compressiontypes "go.podman.io/image/v5/pkg/compression/types" ) // FIXME: Should we just use docker/distribution and docker/docker implementations directly? diff --git a/vendor/github.com/containers/image/v5/internal/manifest/oci_index.go b/vendor/go.podman.io/image/v5/internal/manifest/oci_index.go similarity index 99% rename from vendor/github.com/containers/image/v5/internal/manifest/oci_index.go rename to vendor/go.podman.io/image/v5/internal/manifest/oci_index.go index 719deccb..046d8e60 100644 --- a/vendor/github.com/containers/image/v5/internal/manifest/oci_index.go +++ b/vendor/go.podman.io/image/v5/internal/manifest/oci_index.go @@ -9,12 +9,12 @@ import ( "runtime" "slices" - platform "github.com/containers/image/v5/internal/pkg/platform" - compression "github.com/containers/image/v5/pkg/compression/types" - "github.com/containers/image/v5/types" "github.com/opencontainers/go-digest" imgspec "github.com/opencontainers/image-spec/specs-go" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" + platform "go.podman.io/image/v5/internal/pkg/platform" + compression "go.podman.io/image/v5/pkg/compression/types" + "go.podman.io/image/v5/types" ) const ( diff --git a/vendor/github.com/containers/image/v5/internal/multierr/multierr.go b/vendor/go.podman.io/image/v5/internal/multierr/multierr.go similarity index 100% rename from vendor/github.com/containers/image/v5/internal/multierr/multierr.go rename to vendor/go.podman.io/image/v5/internal/multierr/multierr.go diff --git a/vendor/github.com/containers/image/v5/internal/pkg/platform/platform_matcher.go b/vendor/go.podman.io/image/v5/internal/pkg/platform/platform_matcher.go similarity index 99% rename from vendor/github.com/containers/image/v5/internal/pkg/platform/platform_matcher.go rename to vendor/go.podman.io/image/v5/internal/pkg/platform/platform_matcher.go index 3a16dad6..17143889 100644 --- a/vendor/github.com/containers/image/v5/internal/pkg/platform/platform_matcher.go +++ b/vendor/go.podman.io/image/v5/internal/pkg/platform/platform_matcher.go @@ -24,9 +24,9 @@ import ( "slices" "strings" - "github.com/containers/image/v5/types" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/types" ) // For Linux, the kernel has already detected the ABI, ISA and Features. diff --git a/vendor/github.com/containers/image/v5/internal/private/private.go b/vendor/go.podman.io/image/v5/internal/private/private.go similarity index 98% rename from vendor/github.com/containers/image/v5/internal/private/private.go rename to vendor/go.podman.io/image/v5/internal/private/private.go index ae0cbdf2..a5d2057a 100644 --- a/vendor/github.com/containers/image/v5/internal/private/private.go +++ b/vendor/go.podman.io/image/v5/internal/private/private.go @@ -5,13 +5,13 @@ import ( "io" "time" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/internal/blobinfocache" - "github.com/containers/image/v5/internal/signature" - compression "github.com/containers/image/v5/pkg/compression/types" - "github.com/containers/image/v5/types" "github.com/opencontainers/go-digest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/internal/blobinfocache" + "go.podman.io/image/v5/internal/signature" + compression "go.podman.io/image/v5/pkg/compression/types" + "go.podman.io/image/v5/types" ) // ImageSourceInternalOnly is the part of private.ImageSource that is not diff --git a/vendor/github.com/containers/image/v5/internal/putblobdigest/put_blob_digest.go b/vendor/go.podman.io/image/v5/internal/putblobdigest/put_blob_digest.go similarity index 98% rename from vendor/github.com/containers/image/v5/internal/putblobdigest/put_blob_digest.go rename to vendor/go.podman.io/image/v5/internal/putblobdigest/put_blob_digest.go index b8d3a7e5..ce505427 100644 --- a/vendor/github.com/containers/image/v5/internal/putblobdigest/put_blob_digest.go +++ b/vendor/go.podman.io/image/v5/internal/putblobdigest/put_blob_digest.go @@ -3,8 +3,8 @@ package putblobdigest import ( "io" - "github.com/containers/image/v5/types" "github.com/opencontainers/go-digest" + "go.podman.io/image/v5/types" ) // Digester computes a digest of the provided stream, if not known yet. diff --git a/vendor/github.com/containers/image/v5/internal/rootless/rootless.go b/vendor/go.podman.io/image/v5/internal/rootless/rootless.go similarity index 100% rename from vendor/github.com/containers/image/v5/internal/rootless/rootless.go rename to vendor/go.podman.io/image/v5/internal/rootless/rootless.go diff --git a/vendor/github.com/containers/image/v5/internal/set/set.go b/vendor/go.podman.io/image/v5/internal/set/set.go similarity index 100% rename from vendor/github.com/containers/image/v5/internal/set/set.go rename to vendor/go.podman.io/image/v5/internal/set/set.go diff --git a/vendor/github.com/containers/image/v5/internal/signature/signature.go b/vendor/go.podman.io/image/v5/internal/signature/signature.go similarity index 100% rename from vendor/github.com/containers/image/v5/internal/signature/signature.go rename to vendor/go.podman.io/image/v5/internal/signature/signature.go diff --git a/vendor/github.com/containers/image/v5/internal/signature/sigstore.go b/vendor/go.podman.io/image/v5/internal/signature/sigstore.go similarity index 100% rename from vendor/github.com/containers/image/v5/internal/signature/sigstore.go rename to vendor/go.podman.io/image/v5/internal/signature/sigstore.go diff --git a/vendor/github.com/containers/image/v5/internal/signature/simple.go b/vendor/go.podman.io/image/v5/internal/signature/simple.go similarity index 100% rename from vendor/github.com/containers/image/v5/internal/signature/simple.go rename to vendor/go.podman.io/image/v5/internal/signature/simple.go diff --git a/vendor/github.com/containers/image/v5/internal/streamdigest/stream_digest.go b/vendor/go.podman.io/image/v5/internal/streamdigest/stream_digest.go similarity index 89% rename from vendor/github.com/containers/image/v5/internal/streamdigest/stream_digest.go rename to vendor/go.podman.io/image/v5/internal/streamdigest/stream_digest.go index d5a5436a..83608e04 100644 --- a/vendor/github.com/containers/image/v5/internal/streamdigest/stream_digest.go +++ b/vendor/go.podman.io/image/v5/internal/streamdigest/stream_digest.go @@ -5,9 +5,9 @@ import ( "io" "os" - "github.com/containers/image/v5/internal/putblobdigest" - "github.com/containers/image/v5/internal/tmpdir" - "github.com/containers/image/v5/types" + "go.podman.io/image/v5/internal/putblobdigest" + "go.podman.io/image/v5/internal/tmpdir" + "go.podman.io/image/v5/types" ) // ComputeBlobInfo streams a blob to a temporary file and populates Digest and Size in inputInfo. diff --git a/vendor/github.com/containers/image/v5/internal/tmpdir/tmpdir.go b/vendor/go.podman.io/image/v5/internal/tmpdir/tmpdir.go similarity index 91% rename from vendor/github.com/containers/image/v5/internal/tmpdir/tmpdir.go rename to vendor/go.podman.io/image/v5/internal/tmpdir/tmpdir.go index bab73ee3..634b2d06 100644 --- a/vendor/github.com/containers/image/v5/internal/tmpdir/tmpdir.go +++ b/vendor/go.podman.io/image/v5/internal/tmpdir/tmpdir.go @@ -4,12 +4,12 @@ import ( "os" "runtime" - "github.com/containers/image/v5/types" + "go.podman.io/image/v5/types" ) // unixTempDirForBigFiles is the directory path to store big files on non Windows systems. // You can override this at build time with -// -ldflags '-X github.com/containers/image/v5/internal/tmpdir.unixTempDirForBigFiles=$your_path' +// -ldflags '-X go.podman.io/image/v5/internal/tmpdir.unixTempDirForBigFiles=$your_path' var unixTempDirForBigFiles = builtinUnixTempDirForBigFiles // builtinUnixTempDirForBigFiles is the directory path to store big files. diff --git a/vendor/github.com/containers/image/v5/internal/uploadreader/upload_reader.go b/vendor/go.podman.io/image/v5/internal/uploadreader/upload_reader.go similarity index 100% rename from vendor/github.com/containers/image/v5/internal/uploadreader/upload_reader.go rename to vendor/go.podman.io/image/v5/internal/uploadreader/upload_reader.go diff --git a/vendor/github.com/containers/image/v5/internal/useragent/useragent.go b/vendor/go.podman.io/image/v5/internal/useragent/useragent.go similarity index 83% rename from vendor/github.com/containers/image/v5/internal/useragent/useragent.go rename to vendor/go.podman.io/image/v5/internal/useragent/useragent.go index 7ac49693..54d8fcb7 100644 --- a/vendor/github.com/containers/image/v5/internal/useragent/useragent.go +++ b/vendor/go.podman.io/image/v5/internal/useragent/useragent.go @@ -1,6 +1,6 @@ package useragent -import "github.com/containers/image/v5/version" +import "go.podman.io/image/v5/version" // DefaultUserAgent is a value that should be used by User-Agent headers, unless the user specifically instructs us otherwise. var DefaultUserAgent = "containers/" + version.Version + " (github.com/containers/image)" diff --git a/vendor/github.com/containers/image/v5/manifest/common.go b/vendor/go.podman.io/image/v5/manifest/common.go similarity index 98% rename from vendor/github.com/containers/image/v5/manifest/common.go rename to vendor/go.podman.io/image/v5/manifest/common.go index 8d9d5795..dde1bf3c 100644 --- a/vendor/github.com/containers/image/v5/manifest/common.go +++ b/vendor/go.podman.io/image/v5/manifest/common.go @@ -3,9 +3,9 @@ package manifest import ( "fmt" - compressiontypes "github.com/containers/image/v5/pkg/compression/types" - "github.com/containers/image/v5/types" "github.com/sirupsen/logrus" + compressiontypes "go.podman.io/image/v5/pkg/compression/types" + "go.podman.io/image/v5/types" ) // layerInfosToStrings converts a list of layer infos, presumably obtained from a Manifest.LayerInfos() diff --git a/vendor/github.com/containers/image/v5/manifest/docker_schema1.go b/vendor/go.podman.io/image/v5/manifest/docker_schema1.go similarity index 97% rename from vendor/github.com/containers/image/v5/manifest/docker_schema1.go rename to vendor/go.podman.io/image/v5/manifest/docker_schema1.go index f4b1fc03..28c9fea3 100644 --- a/vendor/github.com/containers/image/v5/manifest/docker_schema1.go +++ b/vendor/go.podman.io/image/v5/manifest/docker_schema1.go @@ -8,14 +8,14 @@ import ( "strings" "time" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/internal/manifest" - "github.com/containers/image/v5/internal/set" - compressiontypes "github.com/containers/image/v5/pkg/compression/types" - "github.com/containers/image/v5/types" - "github.com/containers/storage/pkg/regexp" "github.com/docker/docker/api/types/versions" "github.com/opencontainers/go-digest" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/internal/manifest" + "go.podman.io/image/v5/internal/set" + compressiontypes "go.podman.io/image/v5/pkg/compression/types" + "go.podman.io/image/v5/types" + "go.podman.io/storage/pkg/regexp" ) // Schema1FSLayers is an entry of the "fsLayers" array in docker/distribution schema 1. diff --git a/vendor/github.com/containers/image/v5/manifest/docker_schema2.go b/vendor/go.podman.io/image/v5/manifest/docker_schema2.go similarity index 98% rename from vendor/github.com/containers/image/v5/manifest/docker_schema2.go rename to vendor/go.podman.io/image/v5/manifest/docker_schema2.go index 7e53f4f5..b4255d88 100644 --- a/vendor/github.com/containers/image/v5/manifest/docker_schema2.go +++ b/vendor/go.podman.io/image/v5/manifest/docker_schema2.go @@ -5,11 +5,11 @@ import ( "fmt" "time" - "github.com/containers/image/v5/internal/manifest" - compressiontypes "github.com/containers/image/v5/pkg/compression/types" - "github.com/containers/image/v5/pkg/strslice" - "github.com/containers/image/v5/types" "github.com/opencontainers/go-digest" + "go.podman.io/image/v5/internal/manifest" + compressiontypes "go.podman.io/image/v5/pkg/compression/types" + "go.podman.io/image/v5/pkg/strslice" + "go.podman.io/image/v5/types" ) // Schema2Descriptor is a “descriptor” in docker/distribution schema 2. diff --git a/vendor/github.com/containers/image/v5/manifest/docker_schema2_list.go b/vendor/go.podman.io/image/v5/manifest/docker_schema2_list.go similarity index 95% rename from vendor/github.com/containers/image/v5/manifest/docker_schema2_list.go rename to vendor/go.podman.io/image/v5/manifest/docker_schema2_list.go index c958a3fa..158f7949 100644 --- a/vendor/github.com/containers/image/v5/manifest/docker_schema2_list.go +++ b/vendor/go.podman.io/image/v5/manifest/docker_schema2_list.go @@ -1,7 +1,7 @@ package manifest import ( - "github.com/containers/image/v5/internal/manifest" + "go.podman.io/image/v5/internal/manifest" ) // Schema2PlatformSpec describes the platform which a particular manifest is diff --git a/vendor/github.com/containers/image/v5/manifest/list.go b/vendor/go.podman.io/image/v5/manifest/list.go similarity index 95% rename from vendor/github.com/containers/image/v5/manifest/list.go rename to vendor/go.podman.io/image/v5/manifest/list.go index 1d6fdc9f..846ea7d4 100644 --- a/vendor/github.com/containers/image/v5/manifest/list.go +++ b/vendor/go.podman.io/image/v5/manifest/list.go @@ -1,8 +1,8 @@ package manifest import ( - "github.com/containers/image/v5/internal/manifest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" + "go.podman.io/image/v5/internal/manifest" ) var ( diff --git a/vendor/github.com/containers/image/v5/manifest/manifest.go b/vendor/go.podman.io/image/v5/manifest/manifest.go similarity index 98% rename from vendor/github.com/containers/image/v5/manifest/manifest.go rename to vendor/go.podman.io/image/v5/manifest/manifest.go index d8f37eb4..45118fa4 100644 --- a/vendor/github.com/containers/image/v5/manifest/manifest.go +++ b/vendor/go.podman.io/image/v5/manifest/manifest.go @@ -3,11 +3,11 @@ package manifest import ( "fmt" - "github.com/containers/image/v5/internal/manifest" - "github.com/containers/image/v5/types" "github.com/containers/libtrust" digest "github.com/opencontainers/go-digest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" + "go.podman.io/image/v5/internal/manifest" + "go.podman.io/image/v5/types" ) // FIXME: Should we just use docker/distribution and docker/docker implementations directly? diff --git a/vendor/github.com/containers/image/v5/manifest/oci.go b/vendor/go.podman.io/image/v5/manifest/oci.go similarity index 98% rename from vendor/github.com/containers/image/v5/manifest/oci.go rename to vendor/go.podman.io/image/v5/manifest/oci.go index a18425d0..286d58c4 100644 --- a/vendor/github.com/containers/image/v5/manifest/oci.go +++ b/vendor/go.podman.io/image/v5/manifest/oci.go @@ -6,13 +6,13 @@ import ( "slices" "strings" - "github.com/containers/image/v5/internal/manifest" - compressiontypes "github.com/containers/image/v5/pkg/compression/types" - "github.com/containers/image/v5/types" ociencspec "github.com/containers/ocicrypt/spec" "github.com/opencontainers/go-digest" "github.com/opencontainers/image-spec/specs-go" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" + "go.podman.io/image/v5/internal/manifest" + compressiontypes "go.podman.io/image/v5/pkg/compression/types" + "go.podman.io/image/v5/types" ) // BlobInfoFromOCI1Descriptor returns a types.BlobInfo based on the input OCI1 descriptor. diff --git a/vendor/github.com/containers/image/v5/manifest/oci_index.go b/vendor/go.podman.io/image/v5/manifest/oci_index.go similarity index 94% rename from vendor/github.com/containers/image/v5/manifest/oci_index.go rename to vendor/go.podman.io/image/v5/manifest/oci_index.go index 193b0893..84dae607 100644 --- a/vendor/github.com/containers/image/v5/manifest/oci_index.go +++ b/vendor/go.podman.io/image/v5/manifest/oci_index.go @@ -1,8 +1,8 @@ package manifest import ( - "github.com/containers/image/v5/internal/manifest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" + "go.podman.io/image/v5/internal/manifest" ) // OCI1Index is just an alias for the OCI index type, but one which we can diff --git a/vendor/github.com/containers/image/v5/pkg/blobinfocache/none/none.go b/vendor/go.podman.io/image/v5/pkg/blobinfocache/none/none.go similarity index 97% rename from vendor/github.com/containers/image/v5/pkg/blobinfocache/none/none.go rename to vendor/go.podman.io/image/v5/pkg/blobinfocache/none/none.go index 9a2219e7..88c9024f 100644 --- a/vendor/github.com/containers/image/v5/pkg/blobinfocache/none/none.go +++ b/vendor/go.podman.io/image/v5/pkg/blobinfocache/none/none.go @@ -2,9 +2,9 @@ package none import ( - "github.com/containers/image/v5/internal/blobinfocache" - "github.com/containers/image/v5/types" "github.com/opencontainers/go-digest" + "go.podman.io/image/v5/internal/blobinfocache" + "go.podman.io/image/v5/types" ) // noCache implements a dummy BlobInfoCache which records no data. diff --git a/vendor/github.com/containers/image/v5/pkg/compression/internal/types.go b/vendor/go.podman.io/image/v5/pkg/compression/internal/types.go similarity index 100% rename from vendor/github.com/containers/image/v5/pkg/compression/internal/types.go rename to vendor/go.podman.io/image/v5/pkg/compression/internal/types.go diff --git a/vendor/github.com/containers/image/v5/pkg/compression/types/types.go b/vendor/go.podman.io/image/v5/pkg/compression/types/types.go similarity index 97% rename from vendor/github.com/containers/image/v5/pkg/compression/types/types.go rename to vendor/go.podman.io/image/v5/pkg/compression/types/types.go index 43d03b60..197122c7 100644 --- a/vendor/github.com/containers/image/v5/pkg/compression/types/types.go +++ b/vendor/go.podman.io/image/v5/pkg/compression/types/types.go @@ -1,7 +1,7 @@ package types import ( - "github.com/containers/image/v5/pkg/compression/internal" + "go.podman.io/image/v5/pkg/compression/internal" ) // DecompressorFunc returns the decompressed stream, given a compressed stream. diff --git a/vendor/github.com/containers/image/v5/pkg/docker/config/config.go b/vendor/go.podman.io/image/v5/pkg/docker/config/config.go similarity index 98% rename from vendor/github.com/containers/image/v5/pkg/docker/config/config.go rename to vendor/go.podman.io/image/v5/pkg/docker/config/config.go index 243b13c8..56d4eb91 100644 --- a/vendor/github.com/containers/image/v5/pkg/docker/config/config.go +++ b/vendor/go.podman.io/image/v5/pkg/docker/config/config.go @@ -14,17 +14,17 @@ import ( "runtime" "strings" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/internal/multierr" - "github.com/containers/image/v5/internal/set" - "github.com/containers/image/v5/pkg/sysregistriesv2" - "github.com/containers/image/v5/types" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/homedir" - "github.com/containers/storage/pkg/ioutils" helperclient "github.com/docker/docker-credential-helpers/client" "github.com/docker/docker-credential-helpers/credentials" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/internal/multierr" + "go.podman.io/image/v5/internal/set" + "go.podman.io/image/v5/pkg/sysregistriesv2" + "go.podman.io/image/v5/types" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/homedir" + "go.podman.io/storage/pkg/ioutils" ) type dockerAuthConfig struct { diff --git a/vendor/github.com/containers/image/v5/pkg/strslice/README.md b/vendor/go.podman.io/image/v5/pkg/strslice/README.md similarity index 100% rename from vendor/github.com/containers/image/v5/pkg/strslice/README.md rename to vendor/go.podman.io/image/v5/pkg/strslice/README.md diff --git a/vendor/github.com/containers/image/v5/pkg/strslice/strslice.go b/vendor/go.podman.io/image/v5/pkg/strslice/strslice.go similarity index 100% rename from vendor/github.com/containers/image/v5/pkg/strslice/strslice.go rename to vendor/go.podman.io/image/v5/pkg/strslice/strslice.go diff --git a/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/paths_common.go b/vendor/go.podman.io/image/v5/pkg/sysregistriesv2/paths_common.go similarity index 100% rename from vendor/github.com/containers/image/v5/pkg/sysregistriesv2/paths_common.go rename to vendor/go.podman.io/image/v5/pkg/sysregistriesv2/paths_common.go diff --git a/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/paths_freebsd.go b/vendor/go.podman.io/image/v5/pkg/sysregistriesv2/paths_freebsd.go similarity index 100% rename from vendor/github.com/containers/image/v5/pkg/sysregistriesv2/paths_freebsd.go rename to vendor/go.podman.io/image/v5/pkg/sysregistriesv2/paths_freebsd.go diff --git a/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/shortnames.go b/vendor/go.podman.io/image/v5/pkg/sysregistriesv2/shortnames.go similarity index 97% rename from vendor/github.com/containers/image/v5/pkg/sysregistriesv2/shortnames.go rename to vendor/go.podman.io/image/v5/pkg/sysregistriesv2/shortnames.go index 677629c5..8c72ce7f 100644 --- a/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/shortnames.go +++ b/vendor/go.podman.io/image/v5/pkg/sysregistriesv2/shortnames.go @@ -9,13 +9,13 @@ import ( "strings" "github.com/BurntSushi/toml" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/internal/multierr" - "github.com/containers/image/v5/internal/rootless" - "github.com/containers/image/v5/types" - "github.com/containers/storage/pkg/homedir" - "github.com/containers/storage/pkg/lockfile" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/internal/multierr" + "go.podman.io/image/v5/internal/rootless" + "go.podman.io/image/v5/types" + "go.podman.io/storage/pkg/homedir" + "go.podman.io/storage/pkg/lockfile" ) // defaultShortNameMode is the default mode of registries.conf files if the diff --git a/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/system_registries_v2.go b/vendor/go.podman.io/image/v5/pkg/sysregistriesv2/system_registries_v2.go similarity index 98% rename from vendor/github.com/containers/image/v5/pkg/sysregistriesv2/system_registries_v2.go rename to vendor/go.podman.io/image/v5/pkg/sysregistriesv2/system_registries_v2.go index 318988f0..1a1fcccf 100644 --- a/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/system_registries_v2.go +++ b/vendor/go.podman.io/image/v5/pkg/sysregistriesv2/system_registries_v2.go @@ -14,24 +14,24 @@ import ( "sync" "github.com/BurntSushi/toml" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/types" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/homedir" - "github.com/containers/storage/pkg/regexp" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/types" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/homedir" + "go.podman.io/storage/pkg/regexp" ) // systemRegistriesConfPath is the path to the system-wide registry // configuration file and is used to add/subtract potential registries for // obtaining images. You can override this at build time with -// -ldflags '-X github.com/containers/image/v5/sysregistries.systemRegistriesConfPath=$your_path' +// -ldflags '-X go.podman.io/image/v5/sysregistries.systemRegistriesConfPath=$your_path' var systemRegistriesConfPath = builtinRegistriesConfPath // systemRegistriesConfDirPath is the path to the system-wide registry // configuration directory and is used to add/subtract potential registries for // obtaining images. You can override this at build time with -// -ldflags '-X github.com/containers/image/v5/sysregistries.systemRegistriesConfDirectoryPath=$your_path' +// -ldflags '-X go.podman.io/image/v5/sysregistries.systemRegistriesConfDirectoryPath=$your_path' var systemRegistriesConfDirPath = builtinRegistriesConfDirPath // AuthenticationFileHelper is a special key for credential helpers indicating diff --git a/vendor/github.com/containers/image/v5/pkg/tlsclientconfig/tlsclientconfig.go b/vendor/go.podman.io/image/v5/pkg/tlsclientconfig/tlsclientconfig.go similarity index 100% rename from vendor/github.com/containers/image/v5/pkg/tlsclientconfig/tlsclientconfig.go rename to vendor/go.podman.io/image/v5/pkg/tlsclientconfig/tlsclientconfig.go diff --git a/vendor/github.com/containers/image/v5/transports/stub.go b/vendor/go.podman.io/image/v5/transports/stub.go similarity index 97% rename from vendor/github.com/containers/image/v5/transports/stub.go rename to vendor/go.podman.io/image/v5/transports/stub.go index 2c186a90..ae44fd42 100644 --- a/vendor/github.com/containers/image/v5/transports/stub.go +++ b/vendor/go.podman.io/image/v5/transports/stub.go @@ -3,7 +3,7 @@ package transports import ( "fmt" - "github.com/containers/image/v5/types" + "go.podman.io/image/v5/types" ) // stubTransport is an implementation of types.ImageTransport which has a name, but rejects any references with “the transport $name: is not supported in this build”. diff --git a/vendor/github.com/containers/image/v5/transports/transports.go b/vendor/go.podman.io/image/v5/transports/transports.go similarity index 96% rename from vendor/github.com/containers/image/v5/transports/transports.go rename to vendor/go.podman.io/image/v5/transports/transports.go index 4c9c0889..04f05292 100644 --- a/vendor/github.com/containers/image/v5/transports/transports.go +++ b/vendor/go.podman.io/image/v5/transports/transports.go @@ -5,8 +5,8 @@ import ( "sort" "sync" - "github.com/containers/image/v5/internal/set" - "github.com/containers/image/v5/types" + "go.podman.io/image/v5/internal/set" + "go.podman.io/image/v5/types" ) // knownTransports is a registry of known ImageTransport instances. diff --git a/vendor/github.com/containers/image/v5/types/types.go b/vendor/go.podman.io/image/v5/types/types.go similarity index 99% rename from vendor/github.com/containers/image/v5/types/types.go rename to vendor/go.podman.io/image/v5/types/types.go index a9395178..41f1a632 100644 --- a/vendor/github.com/containers/image/v5/types/types.go +++ b/vendor/go.podman.io/image/v5/types/types.go @@ -6,10 +6,10 @@ import ( "net/url" "time" - "github.com/containers/image/v5/docker/reference" - compression "github.com/containers/image/v5/pkg/compression/types" digest "github.com/opencontainers/go-digest" v1 "github.com/opencontainers/image-spec/specs-go/v1" + "go.podman.io/image/v5/docker/reference" + compression "go.podman.io/image/v5/pkg/compression/types" ) // ImageTransport is a top-level namespace for ways to store/load an image. diff --git a/vendor/github.com/containers/image/v5/version/version.go b/vendor/go.podman.io/image/v5/version/version.go similarity index 93% rename from vendor/github.com/containers/image/v5/version/version.go rename to vendor/go.podman.io/image/v5/version/version.go index 5510e2e7..e577735e 100644 --- a/vendor/github.com/containers/image/v5/version/version.go +++ b/vendor/go.podman.io/image/v5/version/version.go @@ -6,9 +6,9 @@ const ( // VersionMajor is for an API incompatible changes VersionMajor = 5 // VersionMinor is for functionality in a backwards-compatible manner - VersionMinor = 36 + VersionMinor = 37 // VersionPatch is for backwards-compatible bug fixes - VersionPatch = 1 + VersionPatch = 0 // VersionDev indicates development branch. Releases will be empty string. VersionDev = "" diff --git a/vendor/github.com/containers/storage/AUTHORS b/vendor/go.podman.io/storage/AUTHORS similarity index 100% rename from vendor/github.com/containers/storage/AUTHORS rename to vendor/go.podman.io/storage/AUTHORS diff --git a/vendor/github.com/containers/storage/LICENSE b/vendor/go.podman.io/storage/LICENSE similarity index 100% rename from vendor/github.com/containers/storage/LICENSE rename to vendor/go.podman.io/storage/LICENSE diff --git a/vendor/github.com/containers/storage/NOTICE b/vendor/go.podman.io/storage/NOTICE similarity index 100% rename from vendor/github.com/containers/storage/NOTICE rename to vendor/go.podman.io/storage/NOTICE diff --git a/vendor/github.com/containers/storage/internal/rawfilelock/rawfilelock.go b/vendor/go.podman.io/storage/internal/rawfilelock/rawfilelock.go similarity index 100% rename from vendor/github.com/containers/storage/internal/rawfilelock/rawfilelock.go rename to vendor/go.podman.io/storage/internal/rawfilelock/rawfilelock.go diff --git a/vendor/github.com/containers/storage/internal/rawfilelock/rawfilelock_unix.go b/vendor/go.podman.io/storage/internal/rawfilelock/rawfilelock_unix.go similarity index 100% rename from vendor/github.com/containers/storage/internal/rawfilelock/rawfilelock_unix.go rename to vendor/go.podman.io/storage/internal/rawfilelock/rawfilelock_unix.go diff --git a/vendor/github.com/containers/storage/internal/rawfilelock/rawfilelock_windows.go b/vendor/go.podman.io/storage/internal/rawfilelock/rawfilelock_windows.go similarity index 100% rename from vendor/github.com/containers/storage/internal/rawfilelock/rawfilelock_windows.go rename to vendor/go.podman.io/storage/internal/rawfilelock/rawfilelock_windows.go diff --git a/vendor/github.com/containers/storage/pkg/fileutils/exists_freebsd.go b/vendor/go.podman.io/storage/pkg/fileutils/exists_freebsd.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/fileutils/exists_freebsd.go rename to vendor/go.podman.io/storage/pkg/fileutils/exists_freebsd.go diff --git a/vendor/github.com/containers/storage/pkg/fileutils/exists_unix.go b/vendor/go.podman.io/storage/pkg/fileutils/exists_unix.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/fileutils/exists_unix.go rename to vendor/go.podman.io/storage/pkg/fileutils/exists_unix.go diff --git a/vendor/github.com/containers/storage/pkg/fileutils/exists_windows.go b/vendor/go.podman.io/storage/pkg/fileutils/exists_windows.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/fileutils/exists_windows.go rename to vendor/go.podman.io/storage/pkg/fileutils/exists_windows.go diff --git a/vendor/github.com/containers/storage/pkg/fileutils/fileutils.go b/vendor/go.podman.io/storage/pkg/fileutils/fileutils.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/fileutils/fileutils.go rename to vendor/go.podman.io/storage/pkg/fileutils/fileutils.go diff --git a/vendor/github.com/containers/storage/pkg/fileutils/fileutils_darwin.go b/vendor/go.podman.io/storage/pkg/fileutils/fileutils_darwin.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/fileutils/fileutils_darwin.go rename to vendor/go.podman.io/storage/pkg/fileutils/fileutils_darwin.go diff --git a/vendor/github.com/containers/storage/pkg/fileutils/fileutils_solaris.go b/vendor/go.podman.io/storage/pkg/fileutils/fileutils_solaris.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/fileutils/fileutils_solaris.go rename to vendor/go.podman.io/storage/pkg/fileutils/fileutils_solaris.go diff --git a/vendor/github.com/containers/storage/pkg/fileutils/fileutils_unix.go b/vendor/go.podman.io/storage/pkg/fileutils/fileutils_unix.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/fileutils/fileutils_unix.go rename to vendor/go.podman.io/storage/pkg/fileutils/fileutils_unix.go diff --git a/vendor/github.com/containers/storage/pkg/fileutils/fileutils_windows.go b/vendor/go.podman.io/storage/pkg/fileutils/fileutils_windows.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/fileutils/fileutils_windows.go rename to vendor/go.podman.io/storage/pkg/fileutils/fileutils_windows.go diff --git a/vendor/github.com/containers/storage/pkg/fileutils/reflink_linux.go b/vendor/go.podman.io/storage/pkg/fileutils/reflink_linux.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/fileutils/reflink_linux.go rename to vendor/go.podman.io/storage/pkg/fileutils/reflink_linux.go diff --git a/vendor/github.com/containers/storage/pkg/fileutils/reflink_unsupported.go b/vendor/go.podman.io/storage/pkg/fileutils/reflink_unsupported.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/fileutils/reflink_unsupported.go rename to vendor/go.podman.io/storage/pkg/fileutils/reflink_unsupported.go diff --git a/vendor/github.com/containers/storage/pkg/homedir/homedir.go b/vendor/go.podman.io/storage/pkg/homedir/homedir.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/homedir/homedir.go rename to vendor/go.podman.io/storage/pkg/homedir/homedir.go diff --git a/vendor/github.com/containers/storage/pkg/homedir/homedir_unix.go b/vendor/go.podman.io/storage/pkg/homedir/homedir_unix.go similarity index 99% rename from vendor/github.com/containers/storage/pkg/homedir/homedir_unix.go rename to vendor/go.podman.io/storage/pkg/homedir/homedir_unix.go index f351b48b..b088c2a8 100644 --- a/vendor/github.com/containers/storage/pkg/homedir/homedir_unix.go +++ b/vendor/go.podman.io/storage/pkg/homedir/homedir_unix.go @@ -14,8 +14,8 @@ import ( "sync" "syscall" - "github.com/containers/storage/pkg/unshare" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/unshare" ) // Key returns the env var name for the user's home dir based on diff --git a/vendor/github.com/containers/storage/pkg/homedir/homedir_windows.go b/vendor/go.podman.io/storage/pkg/homedir/homedir_windows.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/homedir/homedir_windows.go rename to vendor/go.podman.io/storage/pkg/homedir/homedir_windows.go diff --git a/vendor/github.com/containers/storage/pkg/idtools/idtools.go b/vendor/go.podman.io/storage/pkg/idtools/idtools.go similarity index 99% rename from vendor/github.com/containers/storage/pkg/idtools/idtools.go rename to vendor/go.podman.io/storage/pkg/idtools/idtools.go index 13277f09..6fcba9b3 100644 --- a/vendor/github.com/containers/storage/pkg/idtools/idtools.go +++ b/vendor/go.podman.io/storage/pkg/idtools/idtools.go @@ -14,8 +14,8 @@ import ( "sync" "syscall" - "github.com/containers/storage/pkg/system" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/system" ) // IDMap contains a single entry for user namespace range remapping. An array diff --git a/vendor/github.com/containers/storage/pkg/idtools/idtools_supported.go b/vendor/go.podman.io/storage/pkg/idtools/idtools_supported.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/idtools/idtools_supported.go rename to vendor/go.podman.io/storage/pkg/idtools/idtools_supported.go diff --git a/vendor/github.com/containers/storage/pkg/idtools/idtools_unix.go b/vendor/go.podman.io/storage/pkg/idtools/idtools_unix.go similarity index 98% rename from vendor/github.com/containers/storage/pkg/idtools/idtools_unix.go rename to vendor/go.podman.io/storage/pkg/idtools/idtools_unix.go index 1da7dadb..817b59ae 100644 --- a/vendor/github.com/containers/storage/pkg/idtools/idtools_unix.go +++ b/vendor/go.podman.io/storage/pkg/idtools/idtools_unix.go @@ -12,9 +12,9 @@ import ( "sync" "syscall" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/system" "github.com/moby/sys/user" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/system" ) var ( diff --git a/vendor/github.com/containers/storage/pkg/idtools/idtools_unsupported.go b/vendor/go.podman.io/storage/pkg/idtools/idtools_unsupported.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/idtools/idtools_unsupported.go rename to vendor/go.podman.io/storage/pkg/idtools/idtools_unsupported.go diff --git a/vendor/github.com/containers/storage/pkg/idtools/idtools_windows.go b/vendor/go.podman.io/storage/pkg/idtools/idtools_windows.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/idtools/idtools_windows.go rename to vendor/go.podman.io/storage/pkg/idtools/idtools_windows.go diff --git a/vendor/github.com/containers/storage/pkg/idtools/parser.go b/vendor/go.podman.io/storage/pkg/idtools/parser.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/idtools/parser.go rename to vendor/go.podman.io/storage/pkg/idtools/parser.go diff --git a/vendor/github.com/containers/storage/pkg/idtools/usergroupadd_linux.go b/vendor/go.podman.io/storage/pkg/idtools/usergroupadd_linux.go similarity index 99% rename from vendor/github.com/containers/storage/pkg/idtools/usergroupadd_linux.go rename to vendor/go.podman.io/storage/pkg/idtools/usergroupadd_linux.go index ac27718d..d2ff4466 100644 --- a/vendor/github.com/containers/storage/pkg/idtools/usergroupadd_linux.go +++ b/vendor/go.podman.io/storage/pkg/idtools/usergroupadd_linux.go @@ -7,7 +7,7 @@ import ( "strings" "sync" - "github.com/containers/storage/pkg/regexp" + "go.podman.io/storage/pkg/regexp" ) // add a user and/or group to Linux /etc/passwd, /etc/group using standard diff --git a/vendor/github.com/containers/storage/pkg/idtools/usergroupadd_unsupported.go b/vendor/go.podman.io/storage/pkg/idtools/usergroupadd_unsupported.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/idtools/usergroupadd_unsupported.go rename to vendor/go.podman.io/storage/pkg/idtools/usergroupadd_unsupported.go diff --git a/vendor/github.com/containers/storage/pkg/idtools/utils_unix.go b/vendor/go.podman.io/storage/pkg/idtools/utils_unix.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/idtools/utils_unix.go rename to vendor/go.podman.io/storage/pkg/idtools/utils_unix.go diff --git a/vendor/github.com/containers/storage/pkg/ioutils/buffer.go b/vendor/go.podman.io/storage/pkg/ioutils/buffer.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/ioutils/buffer.go rename to vendor/go.podman.io/storage/pkg/ioutils/buffer.go diff --git a/vendor/github.com/containers/storage/pkg/ioutils/bytespipe.go b/vendor/go.podman.io/storage/pkg/ioutils/bytespipe.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/ioutils/bytespipe.go rename to vendor/go.podman.io/storage/pkg/ioutils/bytespipe.go diff --git a/vendor/github.com/containers/storage/pkg/ioutils/fswriters.go b/vendor/go.podman.io/storage/pkg/ioutils/fswriters.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/ioutils/fswriters.go rename to vendor/go.podman.io/storage/pkg/ioutils/fswriters.go diff --git a/vendor/github.com/containers/storage/pkg/ioutils/fswriters_linux.go b/vendor/go.podman.io/storage/pkg/ioutils/fswriters_linux.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/ioutils/fswriters_linux.go rename to vendor/go.podman.io/storage/pkg/ioutils/fswriters_linux.go diff --git a/vendor/github.com/containers/storage/pkg/ioutils/fswriters_other.go b/vendor/go.podman.io/storage/pkg/ioutils/fswriters_other.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/ioutils/fswriters_other.go rename to vendor/go.podman.io/storage/pkg/ioutils/fswriters_other.go diff --git a/vendor/github.com/containers/storage/pkg/ioutils/readers.go b/vendor/go.podman.io/storage/pkg/ioutils/readers.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/ioutils/readers.go rename to vendor/go.podman.io/storage/pkg/ioutils/readers.go diff --git a/vendor/github.com/containers/storage/pkg/ioutils/temp_unix.go b/vendor/go.podman.io/storage/pkg/ioutils/temp_unix.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/ioutils/temp_unix.go rename to vendor/go.podman.io/storage/pkg/ioutils/temp_unix.go diff --git a/vendor/github.com/containers/storage/pkg/ioutils/temp_windows.go b/vendor/go.podman.io/storage/pkg/ioutils/temp_windows.go similarity index 87% rename from vendor/github.com/containers/storage/pkg/ioutils/temp_windows.go rename to vendor/go.podman.io/storage/pkg/ioutils/temp_windows.go index 79837fb3..b60ad8f4 100644 --- a/vendor/github.com/containers/storage/pkg/ioutils/temp_windows.go +++ b/vendor/go.podman.io/storage/pkg/ioutils/temp_windows.go @@ -5,7 +5,7 @@ package ioutils import ( "os" - "github.com/containers/storage/pkg/longpath" + "go.podman.io/storage/pkg/longpath" ) // TempDir is the equivalent of os.MkdirTemp, except that the result is in Windows longpath format. diff --git a/vendor/github.com/containers/storage/pkg/ioutils/writeflusher.go b/vendor/go.podman.io/storage/pkg/ioutils/writeflusher.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/ioutils/writeflusher.go rename to vendor/go.podman.io/storage/pkg/ioutils/writeflusher.go diff --git a/vendor/github.com/containers/storage/pkg/ioutils/writers.go b/vendor/go.podman.io/storage/pkg/ioutils/writers.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/ioutils/writers.go rename to vendor/go.podman.io/storage/pkg/ioutils/writers.go diff --git a/vendor/github.com/containers/storage/pkg/lockfile/lastwrite.go b/vendor/go.podman.io/storage/pkg/lockfile/lastwrite.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/lockfile/lastwrite.go rename to vendor/go.podman.io/storage/pkg/lockfile/lastwrite.go diff --git a/vendor/github.com/containers/storage/pkg/lockfile/lockfile.go b/vendor/go.podman.io/storage/pkg/lockfile/lockfile.go similarity index 99% rename from vendor/github.com/containers/storage/pkg/lockfile/lockfile.go rename to vendor/go.podman.io/storage/pkg/lockfile/lockfile.go index dfe81c24..52b4fe59 100644 --- a/vendor/github.com/containers/storage/pkg/lockfile/lockfile.go +++ b/vendor/go.podman.io/storage/pkg/lockfile/lockfile.go @@ -7,7 +7,7 @@ import ( "sync" "time" - "github.com/containers/storage/internal/rawfilelock" + "go.podman.io/storage/internal/rawfilelock" ) // A Locker represents a file lock where the file is used to cache an diff --git a/vendor/github.com/containers/storage/pkg/lockfile/lockfile_unix.go b/vendor/go.podman.io/storage/pkg/lockfile/lockfile_unix.go similarity index 97% rename from vendor/github.com/containers/storage/pkg/lockfile/lockfile_unix.go rename to vendor/go.podman.io/storage/pkg/lockfile/lockfile_unix.go index 14c27c51..780ad8ae 100644 --- a/vendor/github.com/containers/storage/pkg/lockfile/lockfile_unix.go +++ b/vendor/go.podman.io/storage/pkg/lockfile/lockfile_unix.go @@ -5,7 +5,7 @@ package lockfile import ( "time" - "github.com/containers/storage/pkg/system" + "go.podman.io/storage/pkg/system" "golang.org/x/sys/unix" ) diff --git a/vendor/github.com/containers/storage/pkg/lockfile/lockfile_windows.go b/vendor/go.podman.io/storage/pkg/lockfile/lockfile_windows.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/lockfile/lockfile_windows.go rename to vendor/go.podman.io/storage/pkg/lockfile/lockfile_windows.go diff --git a/vendor/github.com/containers/storage/pkg/longpath/longpath.go b/vendor/go.podman.io/storage/pkg/longpath/longpath.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/longpath/longpath.go rename to vendor/go.podman.io/storage/pkg/longpath/longpath.go diff --git a/vendor/github.com/containers/storage/pkg/mount/flags.go b/vendor/go.podman.io/storage/pkg/mount/flags.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/mount/flags.go rename to vendor/go.podman.io/storage/pkg/mount/flags.go diff --git a/vendor/github.com/containers/storage/pkg/mount/flags_freebsd.go b/vendor/go.podman.io/storage/pkg/mount/flags_freebsd.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/mount/flags_freebsd.go rename to vendor/go.podman.io/storage/pkg/mount/flags_freebsd.go diff --git a/vendor/github.com/containers/storage/pkg/mount/flags_linux.go b/vendor/go.podman.io/storage/pkg/mount/flags_linux.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/mount/flags_linux.go rename to vendor/go.podman.io/storage/pkg/mount/flags_linux.go diff --git a/vendor/github.com/containers/storage/pkg/mount/flags_unsupported.go b/vendor/go.podman.io/storage/pkg/mount/flags_unsupported.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/mount/flags_unsupported.go rename to vendor/go.podman.io/storage/pkg/mount/flags_unsupported.go diff --git a/vendor/github.com/containers/storage/pkg/mount/mount.go b/vendor/go.podman.io/storage/pkg/mount/mount.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/mount/mount.go rename to vendor/go.podman.io/storage/pkg/mount/mount.go diff --git a/vendor/github.com/containers/storage/pkg/mount/mounter_freebsd.go b/vendor/go.podman.io/storage/pkg/mount/mounter_freebsd.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/mount/mounter_freebsd.go rename to vendor/go.podman.io/storage/pkg/mount/mounter_freebsd.go diff --git a/vendor/github.com/containers/storage/pkg/mount/mounter_linux.go b/vendor/go.podman.io/storage/pkg/mount/mounter_linux.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/mount/mounter_linux.go rename to vendor/go.podman.io/storage/pkg/mount/mounter_linux.go diff --git a/vendor/github.com/containers/storage/pkg/mount/mounter_unsupported.go b/vendor/go.podman.io/storage/pkg/mount/mounter_unsupported.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/mount/mounter_unsupported.go rename to vendor/go.podman.io/storage/pkg/mount/mounter_unsupported.go diff --git a/vendor/github.com/containers/storage/pkg/mount/mountinfo.go b/vendor/go.podman.io/storage/pkg/mount/mountinfo.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/mount/mountinfo.go rename to vendor/go.podman.io/storage/pkg/mount/mountinfo.go diff --git a/vendor/github.com/containers/storage/pkg/mount/mountinfo_linux.go b/vendor/go.podman.io/storage/pkg/mount/mountinfo_linux.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/mount/mountinfo_linux.go rename to vendor/go.podman.io/storage/pkg/mount/mountinfo_linux.go diff --git a/vendor/github.com/containers/storage/pkg/mount/sharedsubtree_linux.go b/vendor/go.podman.io/storage/pkg/mount/sharedsubtree_linux.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/mount/sharedsubtree_linux.go rename to vendor/go.podman.io/storage/pkg/mount/sharedsubtree_linux.go diff --git a/vendor/github.com/containers/storage/pkg/mount/unmount_unix.go b/vendor/go.podman.io/storage/pkg/mount/unmount_unix.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/mount/unmount_unix.go rename to vendor/go.podman.io/storage/pkg/mount/unmount_unix.go diff --git a/vendor/github.com/containers/storage/pkg/mount/unmount_unsupported.go b/vendor/go.podman.io/storage/pkg/mount/unmount_unsupported.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/mount/unmount_unsupported.go rename to vendor/go.podman.io/storage/pkg/mount/unmount_unsupported.go diff --git a/vendor/github.com/containers/storage/pkg/reexec/README.md b/vendor/go.podman.io/storage/pkg/reexec/README.md similarity index 100% rename from vendor/github.com/containers/storage/pkg/reexec/README.md rename to vendor/go.podman.io/storage/pkg/reexec/README.md diff --git a/vendor/github.com/containers/storage/pkg/reexec/command_freebsd.go b/vendor/go.podman.io/storage/pkg/reexec/command_freebsd.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/reexec/command_freebsd.go rename to vendor/go.podman.io/storage/pkg/reexec/command_freebsd.go diff --git a/vendor/github.com/containers/storage/pkg/reexec/command_linux.go b/vendor/go.podman.io/storage/pkg/reexec/command_linux.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/reexec/command_linux.go rename to vendor/go.podman.io/storage/pkg/reexec/command_linux.go diff --git a/vendor/github.com/containers/storage/pkg/reexec/command_unix.go b/vendor/go.podman.io/storage/pkg/reexec/command_unix.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/reexec/command_unix.go rename to vendor/go.podman.io/storage/pkg/reexec/command_unix.go diff --git a/vendor/github.com/containers/storage/pkg/reexec/command_unsupported.go b/vendor/go.podman.io/storage/pkg/reexec/command_unsupported.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/reexec/command_unsupported.go rename to vendor/go.podman.io/storage/pkg/reexec/command_unsupported.go diff --git a/vendor/github.com/containers/storage/pkg/reexec/command_windows.go b/vendor/go.podman.io/storage/pkg/reexec/command_windows.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/reexec/command_windows.go rename to vendor/go.podman.io/storage/pkg/reexec/command_windows.go diff --git a/vendor/github.com/containers/storage/pkg/reexec/reexec.go b/vendor/go.podman.io/storage/pkg/reexec/reexec.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/reexec/reexec.go rename to vendor/go.podman.io/storage/pkg/reexec/reexec.go diff --git a/vendor/github.com/containers/storage/pkg/regexp/regexp.go b/vendor/go.podman.io/storage/pkg/regexp/regexp.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/regexp/regexp.go rename to vendor/go.podman.io/storage/pkg/regexp/regexp.go diff --git a/vendor/github.com/containers/storage/pkg/regexp/regexp_dontprecompile.go b/vendor/go.podman.io/storage/pkg/regexp/regexp_dontprecompile.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/regexp/regexp_dontprecompile.go rename to vendor/go.podman.io/storage/pkg/regexp/regexp_dontprecompile.go diff --git a/vendor/github.com/containers/storage/pkg/regexp/regexp_precompile.go b/vendor/go.podman.io/storage/pkg/regexp/regexp_precompile.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/regexp/regexp_precompile.go rename to vendor/go.podman.io/storage/pkg/regexp/regexp_precompile.go diff --git a/vendor/github.com/containers/storage/pkg/system/chmod.go b/vendor/go.podman.io/storage/pkg/system/chmod.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/chmod.go rename to vendor/go.podman.io/storage/pkg/system/chmod.go diff --git a/vendor/github.com/containers/storage/pkg/system/chtimes.go b/vendor/go.podman.io/storage/pkg/system/chtimes.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/chtimes.go rename to vendor/go.podman.io/storage/pkg/system/chtimes.go diff --git a/vendor/github.com/containers/storage/pkg/system/chtimes_unix.go b/vendor/go.podman.io/storage/pkg/system/chtimes_unix.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/chtimes_unix.go rename to vendor/go.podman.io/storage/pkg/system/chtimes_unix.go diff --git a/vendor/github.com/containers/storage/pkg/system/chtimes_windows.go b/vendor/go.podman.io/storage/pkg/system/chtimes_windows.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/chtimes_windows.go rename to vendor/go.podman.io/storage/pkg/system/chtimes_windows.go diff --git a/vendor/github.com/containers/storage/pkg/system/errors.go b/vendor/go.podman.io/storage/pkg/system/errors.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/errors.go rename to vendor/go.podman.io/storage/pkg/system/errors.go diff --git a/vendor/github.com/containers/storage/pkg/system/exitcode.go b/vendor/go.podman.io/storage/pkg/system/exitcode.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/exitcode.go rename to vendor/go.podman.io/storage/pkg/system/exitcode.go diff --git a/vendor/github.com/containers/storage/pkg/system/extattr_freebsd.go b/vendor/go.podman.io/storage/pkg/system/extattr_freebsd.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/extattr_freebsd.go rename to vendor/go.podman.io/storage/pkg/system/extattr_freebsd.go diff --git a/vendor/github.com/containers/storage/pkg/system/extattr_unsupported.go b/vendor/go.podman.io/storage/pkg/system/extattr_unsupported.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/extattr_unsupported.go rename to vendor/go.podman.io/storage/pkg/system/extattr_unsupported.go diff --git a/vendor/github.com/containers/storage/pkg/system/init.go b/vendor/go.podman.io/storage/pkg/system/init.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/init.go rename to vendor/go.podman.io/storage/pkg/system/init.go diff --git a/vendor/github.com/containers/storage/pkg/system/init_windows.go b/vendor/go.podman.io/storage/pkg/system/init_windows.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/init_windows.go rename to vendor/go.podman.io/storage/pkg/system/init_windows.go diff --git a/vendor/github.com/containers/storage/pkg/system/lchflags_bsd.go b/vendor/go.podman.io/storage/pkg/system/lchflags_bsd.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/lchflags_bsd.go rename to vendor/go.podman.io/storage/pkg/system/lchflags_bsd.go diff --git a/vendor/github.com/containers/storage/pkg/system/lchown.go b/vendor/go.podman.io/storage/pkg/system/lchown.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/lchown.go rename to vendor/go.podman.io/storage/pkg/system/lchown.go diff --git a/vendor/github.com/containers/storage/pkg/system/lcow_unix.go b/vendor/go.podman.io/storage/pkg/system/lcow_unix.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/lcow_unix.go rename to vendor/go.podman.io/storage/pkg/system/lcow_unix.go diff --git a/vendor/github.com/containers/storage/pkg/system/lcow_windows.go b/vendor/go.podman.io/storage/pkg/system/lcow_windows.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/lcow_windows.go rename to vendor/go.podman.io/storage/pkg/system/lcow_windows.go diff --git a/vendor/github.com/containers/storage/pkg/system/lstat_unix.go b/vendor/go.podman.io/storage/pkg/system/lstat_unix.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/lstat_unix.go rename to vendor/go.podman.io/storage/pkg/system/lstat_unix.go diff --git a/vendor/github.com/containers/storage/pkg/system/lstat_windows.go b/vendor/go.podman.io/storage/pkg/system/lstat_windows.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/lstat_windows.go rename to vendor/go.podman.io/storage/pkg/system/lstat_windows.go diff --git a/vendor/github.com/containers/storage/pkg/system/meminfo.go b/vendor/go.podman.io/storage/pkg/system/meminfo.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/meminfo.go rename to vendor/go.podman.io/storage/pkg/system/meminfo.go diff --git a/vendor/github.com/containers/storage/pkg/system/meminfo_freebsd.go b/vendor/go.podman.io/storage/pkg/system/meminfo_freebsd.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/meminfo_freebsd.go rename to vendor/go.podman.io/storage/pkg/system/meminfo_freebsd.go diff --git a/vendor/github.com/containers/storage/pkg/system/meminfo_linux.go b/vendor/go.podman.io/storage/pkg/system/meminfo_linux.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/meminfo_linux.go rename to vendor/go.podman.io/storage/pkg/system/meminfo_linux.go diff --git a/vendor/github.com/containers/storage/pkg/system/meminfo_solaris.go b/vendor/go.podman.io/storage/pkg/system/meminfo_solaris.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/meminfo_solaris.go rename to vendor/go.podman.io/storage/pkg/system/meminfo_solaris.go diff --git a/vendor/github.com/containers/storage/pkg/system/meminfo_unsupported.go b/vendor/go.podman.io/storage/pkg/system/meminfo_unsupported.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/meminfo_unsupported.go rename to vendor/go.podman.io/storage/pkg/system/meminfo_unsupported.go diff --git a/vendor/github.com/containers/storage/pkg/system/meminfo_windows.go b/vendor/go.podman.io/storage/pkg/system/meminfo_windows.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/meminfo_windows.go rename to vendor/go.podman.io/storage/pkg/system/meminfo_windows.go diff --git a/vendor/github.com/containers/storage/pkg/system/mknod.go b/vendor/go.podman.io/storage/pkg/system/mknod.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/mknod.go rename to vendor/go.podman.io/storage/pkg/system/mknod.go diff --git a/vendor/github.com/containers/storage/pkg/system/mknod_freebsd.go b/vendor/go.podman.io/storage/pkg/system/mknod_freebsd.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/mknod_freebsd.go rename to vendor/go.podman.io/storage/pkg/system/mknod_freebsd.go diff --git a/vendor/github.com/containers/storage/pkg/system/mknod_windows.go b/vendor/go.podman.io/storage/pkg/system/mknod_windows.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/mknod_windows.go rename to vendor/go.podman.io/storage/pkg/system/mknod_windows.go diff --git a/vendor/github.com/containers/storage/pkg/system/path.go b/vendor/go.podman.io/storage/pkg/system/path.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/path.go rename to vendor/go.podman.io/storage/pkg/system/path.go diff --git a/vendor/github.com/containers/storage/pkg/system/path_unix.go b/vendor/go.podman.io/storage/pkg/system/path_unix.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/path_unix.go rename to vendor/go.podman.io/storage/pkg/system/path_unix.go diff --git a/vendor/github.com/containers/storage/pkg/system/path_windows.go b/vendor/go.podman.io/storage/pkg/system/path_windows.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/path_windows.go rename to vendor/go.podman.io/storage/pkg/system/path_windows.go diff --git a/vendor/github.com/containers/storage/pkg/system/process_unix.go b/vendor/go.podman.io/storage/pkg/system/process_unix.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/process_unix.go rename to vendor/go.podman.io/storage/pkg/system/process_unix.go diff --git a/vendor/github.com/containers/storage/pkg/system/rm.go b/vendor/go.podman.io/storage/pkg/system/rm.go similarity index 98% rename from vendor/github.com/containers/storage/pkg/system/rm.go rename to vendor/go.podman.io/storage/pkg/system/rm.go index 12243707..c151c144 100644 --- a/vendor/github.com/containers/storage/pkg/system/rm.go +++ b/vendor/go.podman.io/storage/pkg/system/rm.go @@ -7,8 +7,8 @@ import ( "syscall" "time" - "github.com/containers/storage/pkg/mount" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/mount" ) // EnsureRemoveAll wraps `os.RemoveAll` to check for specific errors that can diff --git a/vendor/github.com/containers/storage/pkg/system/rm_common.go b/vendor/go.podman.io/storage/pkg/system/rm_common.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/rm_common.go rename to vendor/go.podman.io/storage/pkg/system/rm_common.go diff --git a/vendor/github.com/containers/storage/pkg/system/rm_freebsd.go b/vendor/go.podman.io/storage/pkg/system/rm_freebsd.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/rm_freebsd.go rename to vendor/go.podman.io/storage/pkg/system/rm_freebsd.go diff --git a/vendor/github.com/containers/storage/pkg/system/stat_common.go b/vendor/go.podman.io/storage/pkg/system/stat_common.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/stat_common.go rename to vendor/go.podman.io/storage/pkg/system/stat_common.go diff --git a/vendor/github.com/containers/storage/pkg/system/stat_darwin.go b/vendor/go.podman.io/storage/pkg/system/stat_darwin.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/stat_darwin.go rename to vendor/go.podman.io/storage/pkg/system/stat_darwin.go diff --git a/vendor/github.com/containers/storage/pkg/system/stat_freebsd.go b/vendor/go.podman.io/storage/pkg/system/stat_freebsd.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/stat_freebsd.go rename to vendor/go.podman.io/storage/pkg/system/stat_freebsd.go diff --git a/vendor/github.com/containers/storage/pkg/system/stat_linux.go b/vendor/go.podman.io/storage/pkg/system/stat_linux.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/stat_linux.go rename to vendor/go.podman.io/storage/pkg/system/stat_linux.go diff --git a/vendor/github.com/containers/storage/pkg/system/stat_netbsd.go b/vendor/go.podman.io/storage/pkg/system/stat_netbsd.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/stat_netbsd.go rename to vendor/go.podman.io/storage/pkg/system/stat_netbsd.go diff --git a/vendor/github.com/containers/storage/pkg/system/stat_openbsd.go b/vendor/go.podman.io/storage/pkg/system/stat_openbsd.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/stat_openbsd.go rename to vendor/go.podman.io/storage/pkg/system/stat_openbsd.go diff --git a/vendor/github.com/containers/storage/pkg/system/stat_solaris.go b/vendor/go.podman.io/storage/pkg/system/stat_solaris.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/stat_solaris.go rename to vendor/go.podman.io/storage/pkg/system/stat_solaris.go diff --git a/vendor/github.com/containers/storage/pkg/system/stat_unix.go b/vendor/go.podman.io/storage/pkg/system/stat_unix.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/stat_unix.go rename to vendor/go.podman.io/storage/pkg/system/stat_unix.go diff --git a/vendor/github.com/containers/storage/pkg/system/stat_windows.go b/vendor/go.podman.io/storage/pkg/system/stat_windows.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/stat_windows.go rename to vendor/go.podman.io/storage/pkg/system/stat_windows.go diff --git a/vendor/github.com/containers/storage/pkg/system/syscall_unix.go b/vendor/go.podman.io/storage/pkg/system/syscall_unix.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/syscall_unix.go rename to vendor/go.podman.io/storage/pkg/system/syscall_unix.go diff --git a/vendor/github.com/containers/storage/pkg/system/syscall_windows.go b/vendor/go.podman.io/storage/pkg/system/syscall_windows.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/syscall_windows.go rename to vendor/go.podman.io/storage/pkg/system/syscall_windows.go diff --git a/vendor/github.com/containers/storage/pkg/system/umask.go b/vendor/go.podman.io/storage/pkg/system/umask.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/umask.go rename to vendor/go.podman.io/storage/pkg/system/umask.go diff --git a/vendor/github.com/containers/storage/pkg/system/umask_windows.go b/vendor/go.podman.io/storage/pkg/system/umask_windows.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/umask_windows.go rename to vendor/go.podman.io/storage/pkg/system/umask_windows.go diff --git a/vendor/github.com/containers/storage/pkg/system/utimes_freebsd.go b/vendor/go.podman.io/storage/pkg/system/utimes_freebsd.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/utimes_freebsd.go rename to vendor/go.podman.io/storage/pkg/system/utimes_freebsd.go diff --git a/vendor/github.com/containers/storage/pkg/system/utimes_linux.go b/vendor/go.podman.io/storage/pkg/system/utimes_linux.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/utimes_linux.go rename to vendor/go.podman.io/storage/pkg/system/utimes_linux.go diff --git a/vendor/github.com/containers/storage/pkg/system/utimes_unsupported.go b/vendor/go.podman.io/storage/pkg/system/utimes_unsupported.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/utimes_unsupported.go rename to vendor/go.podman.io/storage/pkg/system/utimes_unsupported.go diff --git a/vendor/github.com/containers/storage/pkg/system/xattrs_darwin.go b/vendor/go.podman.io/storage/pkg/system/xattrs_darwin.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/xattrs_darwin.go rename to vendor/go.podman.io/storage/pkg/system/xattrs_darwin.go diff --git a/vendor/github.com/containers/storage/pkg/system/xattrs_freebsd.go b/vendor/go.podman.io/storage/pkg/system/xattrs_freebsd.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/xattrs_freebsd.go rename to vendor/go.podman.io/storage/pkg/system/xattrs_freebsd.go diff --git a/vendor/github.com/containers/storage/pkg/system/xattrs_linux.go b/vendor/go.podman.io/storage/pkg/system/xattrs_linux.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/xattrs_linux.go rename to vendor/go.podman.io/storage/pkg/system/xattrs_linux.go diff --git a/vendor/github.com/containers/storage/pkg/system/xattrs_unsupported.go b/vendor/go.podman.io/storage/pkg/system/xattrs_unsupported.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/xattrs_unsupported.go rename to vendor/go.podman.io/storage/pkg/system/xattrs_unsupported.go diff --git a/vendor/github.com/containers/storage/pkg/unshare/getenv_linux_cgo.go b/vendor/go.podman.io/storage/pkg/unshare/getenv_linux_cgo.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/unshare/getenv_linux_cgo.go rename to vendor/go.podman.io/storage/pkg/unshare/getenv_linux_cgo.go diff --git a/vendor/github.com/containers/storage/pkg/unshare/getenv_linux_nocgo.go b/vendor/go.podman.io/storage/pkg/unshare/getenv_linux_nocgo.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/unshare/getenv_linux_nocgo.go rename to vendor/go.podman.io/storage/pkg/unshare/getenv_linux_nocgo.go diff --git a/vendor/github.com/containers/storage/pkg/unshare/unshare.c b/vendor/go.podman.io/storage/pkg/unshare/unshare.c similarity index 100% rename from vendor/github.com/containers/storage/pkg/unshare/unshare.c rename to vendor/go.podman.io/storage/pkg/unshare/unshare.c diff --git a/vendor/github.com/containers/storage/pkg/unshare/unshare.go b/vendor/go.podman.io/storage/pkg/unshare/unshare.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/unshare/unshare.go rename to vendor/go.podman.io/storage/pkg/unshare/unshare.go diff --git a/vendor/github.com/containers/storage/pkg/unshare/unshare_cgo.go b/vendor/go.podman.io/storage/pkg/unshare/unshare_cgo.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/unshare/unshare_cgo.go rename to vendor/go.podman.io/storage/pkg/unshare/unshare_cgo.go diff --git a/vendor/github.com/containers/storage/pkg/unshare/unshare_darwin.go b/vendor/go.podman.io/storage/pkg/unshare/unshare_darwin.go similarity index 97% rename from vendor/github.com/containers/storage/pkg/unshare/unshare_darwin.go rename to vendor/go.podman.io/storage/pkg/unshare/unshare_darwin.go index 5d0a7a68..a9daf714 100644 --- a/vendor/github.com/containers/storage/pkg/unshare/unshare_darwin.go +++ b/vendor/go.podman.io/storage/pkg/unshare/unshare_darwin.go @@ -5,8 +5,8 @@ package unshare import ( "os" - "github.com/containers/storage/pkg/idtools" "github.com/opencontainers/runtime-spec/specs-go" + "go.podman.io/storage/pkg/idtools" ) const ( diff --git a/vendor/github.com/containers/storage/pkg/unshare/unshare_freebsd.c b/vendor/go.podman.io/storage/pkg/unshare/unshare_freebsd.c similarity index 100% rename from vendor/github.com/containers/storage/pkg/unshare/unshare_freebsd.c rename to vendor/go.podman.io/storage/pkg/unshare/unshare_freebsd.c diff --git a/vendor/github.com/containers/storage/pkg/unshare/unshare_freebsd.go b/vendor/go.podman.io/storage/pkg/unshare/unshare_freebsd.go similarity index 98% rename from vendor/github.com/containers/storage/pkg/unshare/unshare_freebsd.go rename to vendor/go.podman.io/storage/pkg/unshare/unshare_freebsd.go index 37a87fa5..2b81f896 100644 --- a/vendor/github.com/containers/storage/pkg/unshare/unshare_freebsd.go +++ b/vendor/go.podman.io/storage/pkg/unshare/unshare_freebsd.go @@ -13,8 +13,8 @@ import ( "strconv" "syscall" - "github.com/containers/storage/pkg/reexec" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/reexec" ) // Cmd wraps an exec.Cmd created by the reexec package in unshare(), diff --git a/vendor/github.com/containers/storage/pkg/unshare/unshare_gccgo.go b/vendor/go.podman.io/storage/pkg/unshare/unshare_gccgo.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/unshare/unshare_gccgo.go rename to vendor/go.podman.io/storage/pkg/unshare/unshare_gccgo.go diff --git a/vendor/github.com/containers/storage/pkg/unshare/unshare_linux.go b/vendor/go.podman.io/storage/pkg/unshare/unshare_linux.go similarity index 99% rename from vendor/github.com/containers/storage/pkg/unshare/unshare_linux.go rename to vendor/go.podman.io/storage/pkg/unshare/unshare_linux.go index 9e0e562d..7cb069c7 100644 --- a/vendor/github.com/containers/storage/pkg/unshare/unshare_linux.go +++ b/vendor/go.podman.io/storage/pkg/unshare/unshare_linux.go @@ -18,11 +18,11 @@ import ( "sync" "syscall" - "github.com/containers/storage/pkg/idtools" - "github.com/containers/storage/pkg/reexec" "github.com/moby/sys/capability" "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/idtools" + "go.podman.io/storage/pkg/reexec" ) // Cmd wraps an exec.Cmd created by the reexec package in unshare(), and diff --git a/vendor/github.com/containers/storage/pkg/unshare/unshare_unsupported.go b/vendor/go.podman.io/storage/pkg/unshare/unshare_unsupported.go similarity index 97% rename from vendor/github.com/containers/storage/pkg/unshare/unshare_unsupported.go rename to vendor/go.podman.io/storage/pkg/unshare/unshare_unsupported.go index 05706b8f..3b463627 100644 --- a/vendor/github.com/containers/storage/pkg/unshare/unshare_unsupported.go +++ b/vendor/go.podman.io/storage/pkg/unshare/unshare_unsupported.go @@ -5,8 +5,8 @@ package unshare import ( "os" - "github.com/containers/storage/pkg/idtools" "github.com/opencontainers/runtime-spec/specs-go" + "go.podman.io/storage/pkg/idtools" ) const ( diff --git a/vendor/github.com/containers/storage/pkg/unshare/unshare_unsupported_cgo.go b/vendor/go.podman.io/storage/pkg/unshare/unshare_unsupported_cgo.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/unshare/unshare_unsupported_cgo.go rename to vendor/go.podman.io/storage/pkg/unshare/unshare_unsupported_cgo.go diff --git a/vendor/golang.org/x/net/http2/http2.go b/vendor/golang.org/x/net/http2/http2.go index 6c18ea23..ea5ae629 100644 --- a/vendor/golang.org/x/net/http2/http2.go +++ b/vendor/golang.org/x/net/http2/http2.go @@ -11,8 +11,6 @@ // requires Go 1.6 or later) // // See https://http2.github.io/ for more information on HTTP/2. -// -// See https://http2.golang.org/ for a test server running this code. package http2 // import "golang.org/x/net/http2" import ( diff --git a/vendor/golang.org/x/term/term_windows.go b/vendor/golang.org/x/term/term_windows.go index df6bf948..0ddd81c0 100644 --- a/vendor/golang.org/x/term/term_windows.go +++ b/vendor/golang.org/x/term/term_windows.go @@ -20,12 +20,14 @@ func isTerminal(fd int) bool { return err == nil } +// This is intended to be used on a console input handle. +// See https://learn.microsoft.com/en-us/windows/console/setconsolemode func makeRaw(fd int) (*State, error) { var st uint32 if err := windows.GetConsoleMode(windows.Handle(fd), &st); err != nil { return nil, err } - raw := st &^ (windows.ENABLE_ECHO_INPUT | windows.ENABLE_PROCESSED_INPUT | windows.ENABLE_LINE_INPUT | windows.ENABLE_PROCESSED_OUTPUT) + raw := st &^ (windows.ENABLE_ECHO_INPUT | windows.ENABLE_PROCESSED_INPUT | windows.ENABLE_LINE_INPUT) raw |= windows.ENABLE_VIRTUAL_TERMINAL_INPUT if err := windows.SetConsoleMode(windows.Handle(fd), raw); err != nil { return nil, err diff --git a/vendor/golang.org/x/term/terminal.go b/vendor/golang.org/x/term/terminal.go index 13e9a64a..bddb2e2a 100644 --- a/vendor/golang.org/x/term/terminal.go +++ b/vendor/golang.org/x/term/terminal.go @@ -146,6 +146,7 @@ const ( keyCtrlD = 4 keyCtrlU = 21 keyEnter = '\r' + keyLF = '\n' keyEscape = 27 keyBackspace = 127 keyUnknown = 0xd800 /* UTF-16 surrogate area */ + iota @@ -497,7 +498,7 @@ func (t *Terminal) historyAdd(entry string) { // handleKey processes the given key and, optionally, returns a line of text // that the user has entered. func (t *Terminal) handleKey(key rune) (line string, ok bool) { - if t.pasteActive && key != keyEnter { + if t.pasteActive && key != keyEnter && key != keyLF { t.addKeyToLine(key) return } @@ -567,7 +568,7 @@ func (t *Terminal) handleKey(key rune) (line string, ok bool) { t.setLine(runes, len(runes)) } } - case keyEnter: + case keyEnter, keyLF: t.moveCursorToPos(len(t.line)) t.queue([]rune("\r\n")) line = string(t.line) @@ -812,6 +813,10 @@ func (t *Terminal) readLine() (line string, err error) { if !t.pasteActive { lineIsPasted = false } + // If we have CR, consume LF if present (CRLF sequence) to avoid returning an extra empty line. + if key == keyEnter && len(rest) > 0 && rest[0] == keyLF { + rest = rest[1:] + } line, lineOk = t.handleKey(key) } if len(rest) > 0 { diff --git a/vendor/modules.txt b/vendor/modules.txt index 6f75419d..beaff9b8 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -66,62 +66,12 @@ github.com/containerd/platforms # github.com/containerd/typeurl/v2 v2.2.3 ## explicit; go 1.21 github.com/containerd/typeurl/v2 -# github.com/containers/image/v5 v5.36.1 -## explicit; go 1.23.3 -github.com/containers/image/v5/docker -github.com/containers/image/v5/docker/policyconfiguration -github.com/containers/image/v5/docker/reference -github.com/containers/image/v5/internal/blobinfocache -github.com/containers/image/v5/internal/image -github.com/containers/image/v5/internal/imagedestination/impl -github.com/containers/image/v5/internal/imagedestination/stubs -github.com/containers/image/v5/internal/imagesource -github.com/containers/image/v5/internal/imagesource/impl -github.com/containers/image/v5/internal/imagesource/stubs -github.com/containers/image/v5/internal/iolimits -github.com/containers/image/v5/internal/manifest -github.com/containers/image/v5/internal/multierr -github.com/containers/image/v5/internal/pkg/platform -github.com/containers/image/v5/internal/private -github.com/containers/image/v5/internal/putblobdigest -github.com/containers/image/v5/internal/rootless -github.com/containers/image/v5/internal/set -github.com/containers/image/v5/internal/signature -github.com/containers/image/v5/internal/streamdigest -github.com/containers/image/v5/internal/tmpdir -github.com/containers/image/v5/internal/uploadreader -github.com/containers/image/v5/internal/useragent -github.com/containers/image/v5/manifest -github.com/containers/image/v5/pkg/blobinfocache/none -github.com/containers/image/v5/pkg/compression/internal -github.com/containers/image/v5/pkg/compression/types -github.com/containers/image/v5/pkg/docker/config -github.com/containers/image/v5/pkg/strslice -github.com/containers/image/v5/pkg/sysregistriesv2 -github.com/containers/image/v5/pkg/tlsclientconfig -github.com/containers/image/v5/transports -github.com/containers/image/v5/types -github.com/containers/image/v5/version # github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 ## explicit github.com/containers/libtrust # github.com/containers/ocicrypt v1.2.1 ## explicit; go 1.22 github.com/containers/ocicrypt/spec -# github.com/containers/storage v1.59.1 -## explicit; go 1.23.0 -github.com/containers/storage/internal/rawfilelock -github.com/containers/storage/pkg/fileutils -github.com/containers/storage/pkg/homedir -github.com/containers/storage/pkg/idtools -github.com/containers/storage/pkg/ioutils -github.com/containers/storage/pkg/lockfile -github.com/containers/storage/pkg/longpath -github.com/containers/storage/pkg/mount -github.com/containers/storage/pkg/reexec -github.com/containers/storage/pkg/regexp -github.com/containers/storage/pkg/system -github.com/containers/storage/pkg/unshare # github.com/crazy-max/cron/v3 v3.1.1 ## explicit; go 1.12 github.com/crazy-max/cron/v3 @@ -504,7 +454,57 @@ go.opentelemetry.io/otel/trace go.opentelemetry.io/otel/trace/embedded go.opentelemetry.io/otel/trace/internal/telemetry go.opentelemetry.io/otel/trace/noop -# golang.org/x/crypto v0.40.0 +# go.podman.io/image/v5 v5.37.0 +## explicit; go 1.23.3 +go.podman.io/image/v5/docker +go.podman.io/image/v5/docker/policyconfiguration +go.podman.io/image/v5/docker/reference +go.podman.io/image/v5/internal/blobinfocache +go.podman.io/image/v5/internal/image +go.podman.io/image/v5/internal/imagedestination/impl +go.podman.io/image/v5/internal/imagedestination/stubs +go.podman.io/image/v5/internal/imagesource +go.podman.io/image/v5/internal/imagesource/impl +go.podman.io/image/v5/internal/imagesource/stubs +go.podman.io/image/v5/internal/iolimits +go.podman.io/image/v5/internal/manifest +go.podman.io/image/v5/internal/multierr +go.podman.io/image/v5/internal/pkg/platform +go.podman.io/image/v5/internal/private +go.podman.io/image/v5/internal/putblobdigest +go.podman.io/image/v5/internal/rootless +go.podman.io/image/v5/internal/set +go.podman.io/image/v5/internal/signature +go.podman.io/image/v5/internal/streamdigest +go.podman.io/image/v5/internal/tmpdir +go.podman.io/image/v5/internal/uploadreader +go.podman.io/image/v5/internal/useragent +go.podman.io/image/v5/manifest +go.podman.io/image/v5/pkg/blobinfocache/none +go.podman.io/image/v5/pkg/compression/internal +go.podman.io/image/v5/pkg/compression/types +go.podman.io/image/v5/pkg/docker/config +go.podman.io/image/v5/pkg/strslice +go.podman.io/image/v5/pkg/sysregistriesv2 +go.podman.io/image/v5/pkg/tlsclientconfig +go.podman.io/image/v5/transports +go.podman.io/image/v5/types +go.podman.io/image/v5/version +# go.podman.io/storage v1.60.0 +## explicit; go 1.23.3 +go.podman.io/storage/internal/rawfilelock +go.podman.io/storage/pkg/fileutils +go.podman.io/storage/pkg/homedir +go.podman.io/storage/pkg/idtools +go.podman.io/storage/pkg/ioutils +go.podman.io/storage/pkg/lockfile +go.podman.io/storage/pkg/longpath +go.podman.io/storage/pkg/mount +go.podman.io/storage/pkg/reexec +go.podman.io/storage/pkg/regexp +go.podman.io/storage/pkg/system +go.podman.io/storage/pkg/unshare +# golang.org/x/crypto v0.41.0 ## explicit; go 1.23.0 golang.org/x/crypto/pbkdf2 golang.org/x/crypto/scrypt @@ -512,7 +512,7 @@ golang.org/x/crypto/sha3 # golang.org/x/mod v0.27.0 ## explicit; go 1.23.0 golang.org/x/mod/semver -# golang.org/x/net v0.41.0 +# golang.org/x/net v0.43.0 ## explicit; go 1.23.0 golang.org/x/net/html golang.org/x/net/html/atom @@ -539,10 +539,10 @@ golang.org/x/sys/cpu golang.org/x/sys/plan9 golang.org/x/sys/unix golang.org/x/sys/windows -# golang.org/x/term v0.33.0 +# golang.org/x/term v0.34.0 ## explicit; go 1.23.0 golang.org/x/term -# golang.org/x/text v0.27.0 +# golang.org/x/text v0.28.0 ## explicit; go 1.23.0 golang.org/x/text/cases golang.org/x/text/internal