Skip to content

Commit 6ade6d5

Browse files
jankaluzapraveenkumar
authored andcommitted
Switch containers/[image,storage,common] to go.podman.io
These go packages were migrated to a monorepo, as stated in the https://blog.podman.io/2025/08/migration-to-the-container-libs-monorepo-is-complete/. This commit updates the crc package to use these packages from new locations. It was generated using following commands: ``` $ find . -type f -name '*.go' -exec sed -i -e 's,"github.com/containers/image,"go.podman.io/image,g' {} \; $ find . -type f -name '*.go' -exec sed -i -e 's,"github.com/containers/common,"go.podman.io/common,g' {} \; $ find . -type f -name '*.go' -exec sed -i -e 's,"github.com/containers/storage,"go.podman.io/storage,g' {} \; $ goimports -v -w . $ git checkout vendor/ $ git checkout tools/vendor $ vi go.mod # to change the storage, image and common imports $ go mod tidy $ go mod vendor ``` Signed-off-by: Jan Kaluza <jkaluza@redhat.com>
1 parent f3069a0 commit 6ade6d5

359 files changed

Lines changed: 5041 additions & 2672 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

cmd/crc/cmd/start.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"strings"
1111
"text/template"
1212

13-
"github.com/containers/common/pkg/strongunits"
13+
"go.podman.io/common/pkg/strongunits"
1414

1515
"github.com/Masterminds/semver/v3"
1616
"github.com/crc-org/crc/v2/pkg/crc/cluster"

cmd/crc/cmd/status.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111

1212
"github.com/spf13/cast"
1313

14-
"github.com/containers/common/pkg/strongunits"
14+
"go.podman.io/common/pkg/strongunits"
1515

1616
"github.com/cheggaaa/pb/v3"
1717
"github.com/crc-org/crc/v2/pkg/crc/constants"

go.mod

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ require (
1010
github.com/YourFin/binappend v0.0.0-20181105185800-0add4bf0b9ad
1111
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2
1212
github.com/cheggaaa/pb/v3 v3.1.7
13-
github.com/containers/common v0.64.2
1413
github.com/containers/gvisor-tap-vsock v0.8.7
15-
github.com/containers/image/v5 v5.36.2
1614
github.com/containers/libhvee v0.10.0
1715
github.com/coreos/go-systemd/v22 v22.6.0
1816
github.com/crc-org/admin-helper v0.5.5
@@ -54,6 +52,8 @@ require (
5452
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8
5553
github.com/yusufpapurcu/wmi v1.2.4
5654
github.com/zalando/go-keyring v0.2.6
55+
go.podman.io/common v0.65.1-0.20250925174758-4cf0ff781bfc
56+
go.podman.io/image/v5 v5.37.0
5757
golang.org/x/crypto v0.44.0
5858
golang.org/x/net v0.47.0
5959
golang.org/x/sync v0.18.0
@@ -78,9 +78,9 @@ require (
7878
github.com/areYouLazy/libhosty v1.1.0 // indirect
7979
github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect
8080
github.com/cloudflare/circl v1.6.1 // indirect
81+
github.com/containers/common v0.62.2 // indirect
8182
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 // indirect
8283
github.com/containers/ocicrypt v1.2.1 // indirect
83-
github.com/containers/storage v1.59.1 // indirect
8484
github.com/cpuguy83/go-md2man/v2 v2.0.6 // indirect
8585
github.com/creack/pty v1.1.18 // indirect
8686
github.com/cucumber/gherkin/go/v26 v26.2.0 // indirect
@@ -90,9 +90,9 @@ require (
9090
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
9191
github.com/distribution/reference v0.6.0 // indirect
9292
github.com/docker/distribution v2.8.3+incompatible // indirect
93-
github.com/docker/docker v28.3.3+incompatible // indirect
93+
github.com/docker/docker v28.4.0+incompatible // indirect
9494
github.com/docker/docker-credential-helpers v0.9.3 // indirect
95-
github.com/docker/go-connections v0.5.0 // indirect
95+
github.com/docker/go-connections v0.6.0 // indirect
9696
github.com/ebitengine/purego v0.9.0 // indirect
9797
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
9898
github.com/fatih/color v1.18.0 // indirect
@@ -114,10 +114,10 @@ require (
114114
github.com/google/btree v1.1.2 // indirect
115115
github.com/google/gnostic-models v0.6.8 // indirect
116116
github.com/google/go-cmp v0.7.0 // indirect
117-
github.com/google/go-containerregistry v0.20.3 // indirect
117+
github.com/google/go-containerregistry v0.20.4-0.20250225234217-098045d5e61f // indirect
118118
github.com/google/gofuzz v1.2.0 // indirect
119119
github.com/google/gopacket v1.1.19 // indirect
120-
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
120+
github.com/google/pprof v0.0.0-20250820193118-f64d9cf942d6 // indirect
121121
github.com/google/uuid v1.6.0 // indirect
122122
github.com/gorilla/mux v1.8.1 // indirect
123123
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
@@ -135,7 +135,7 @@ require (
135135
github.com/mailru/easyjson v0.7.7 // indirect
136136
github.com/mattn/go-isatty v0.0.20 // indirect
137137
github.com/mattn/go-runewidth v0.0.16 // indirect
138-
github.com/mattn/go-sqlite3 v1.14.28 // indirect
138+
github.com/mattn/go-sqlite3 v1.14.32 // indirect
139139
github.com/mdlayher/socket v0.4.1 // indirect
140140
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
141141
github.com/miekg/dns v1.1.68 // indirect
@@ -153,13 +153,13 @@ require (
153153
github.com/pierrec/lz4/v4 v4.1.14 // indirect
154154
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
155155
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
156-
github.com/proglottis/gpgme v0.1.4 // indirect
156+
github.com/proglottis/gpgme v0.1.5 // indirect
157157
github.com/rivo/uniseg v0.4.7 // indirect
158158
github.com/russross/blackfriday/v2 v2.1.0 // indirect
159159
github.com/sagikazarmark/locafero v0.11.0 // indirect
160-
github.com/secure-systems-lab/go-securesystemslib v0.9.0 // indirect
160+
github.com/secure-systems-lab/go-securesystemslib v0.9.1 // indirect
161161
github.com/segmentio/backo-go v1.0.1 // indirect
162-
github.com/sigstore/fulcio v1.6.6 // indirect
162+
github.com/sigstore/fulcio v1.7.1 // indirect
163163
github.com/sigstore/protobuf-specs v0.4.1 // indirect
164164
github.com/sigstore/sigstore v1.9.5 // indirect
165165
github.com/smallstep/pkcs7 v0.1.1 // indirect
@@ -176,16 +176,17 @@ require (
176176
github.com/vbatts/tar-split v0.12.1 // indirect
177177
github.com/vbauerster/mpb/v8 v8.10.2 // indirect
178178
github.com/x448/float16 v0.8.4 // indirect
179+
go.podman.io/storage v1.60.0 // indirect
179180
go.yaml.in/yaml/v2 v2.4.2 // indirect
180181
go.yaml.in/yaml/v3 v3.0.4 // indirect
181182
golang.org/x/mod v0.29.0 // indirect
182183
golang.org/x/oauth2 v0.30.0 // indirect
183184
golang.org/x/time v0.11.0 // indirect
184185
golang.org/x/tools v0.38.0 // indirect
185-
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
186-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250313205543-e70fdf4c4cb4 // indirect
186+
google.golang.org/genproto/googleapis/api v0.0.0-20250414145226-207652e42e2e // indirect
187+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250414145226-207652e42e2e // indirect
187188
google.golang.org/grpc v1.72.2 // indirect
188-
google.golang.org/protobuf v1.36.7 // indirect
189+
google.golang.org/protobuf v1.36.8 // indirect
189190
gopkg.in/cenkalti/backoff.v1 v1.1.0 // indirect
190191
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
191192
gopkg.in/inf.v0 v0.9.1 // indirect
@@ -195,5 +196,5 @@ require (
195196
k8s.io/utils v0.0.0-20241210054802-24370beab758 // indirect
196197
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
197198
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
198-
sigs.k8s.io/yaml v1.5.0 // indirect
199+
sigs.k8s.io/yaml v1.6.0 // indirect
199200
)

0 commit comments

Comments
 (0)