Skip to content

Commit ecad517

Browse files
jankaluzaredbeam
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 <[email protected]>
1 parent c73186a commit ecad517

File tree

359 files changed

+5044
-2673
lines changed

Some content is hidden

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

359 files changed

+5044
-2673
lines changed

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: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
module github.com/crc-org/crc/v2
22

3-
go 1.24.0
3+
go 1.24.2
4+
5+
toolchain go1.24.6
46

57
require (
68
github.com/AlecAivazis/survey/v2 v2.3.7
@@ -10,9 +12,7 @@ require (
1012
github.com/YourFin/binappend v0.0.0-20181105185800-0add4bf0b9ad
1113
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2
1214
github.com/cheggaaa/pb/v3 v3.1.7
13-
github.com/containers/common v0.64.2
1415
github.com/containers/gvisor-tap-vsock v0.8.7
15-
github.com/containers/image/v5 v5.36.2
1616
github.com/containers/libhvee v0.10.0
1717
github.com/coreos/go-systemd/v22 v22.6.0
1818
github.com/crc-org/admin-helper v0.5.5
@@ -56,6 +56,8 @@ require (
5656
github.com/zalando/go-keyring v0.2.6
5757
golang.org/x/crypto v0.43.0
5858
golang.org/x/net v0.46.0
59+
go.podman.io/common v0.65.1-0.20250925174758-4cf0ff781bfc
60+
go.podman.io/image/v5 v5.37.0
5961
golang.org/x/sync v0.17.0
6062
golang.org/x/sys v0.37.0
6163
golang.org/x/term v0.36.0
@@ -78,9 +80,9 @@ require (
7880
github.com/areYouLazy/libhosty v1.1.0 // indirect
7981
github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect
8082
github.com/cloudflare/circl v1.6.1 // indirect
83+
github.com/containers/common v0.62.2 // indirect
8184
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 // indirect
8285
github.com/containers/ocicrypt v1.2.1 // indirect
83-
github.com/containers/storage v1.59.1 // indirect
8486
github.com/cpuguy83/go-md2man/v2 v2.0.6 // indirect
8587
github.com/creack/pty v1.1.18 // indirect
8688
github.com/cucumber/gherkin/go/v26 v26.2.0 // indirect
@@ -90,9 +92,9 @@ require (
9092
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
9193
github.com/distribution/reference v0.6.0 // indirect
9294
github.com/docker/distribution v2.8.3+incompatible // indirect
93-
github.com/docker/docker v28.3.3+incompatible // indirect
95+
github.com/docker/docker v28.4.0+incompatible // indirect
9496
github.com/docker/docker-credential-helpers v0.9.3 // indirect
95-
github.com/docker/go-connections v0.5.0 // indirect
97+
github.com/docker/go-connections v0.6.0 // indirect
9698
github.com/ebitengine/purego v0.9.0 // indirect
9799
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
98100
github.com/fatih/color v1.18.0 // indirect
@@ -114,10 +116,10 @@ require (
114116
github.com/google/btree v1.1.2 // indirect
115117
github.com/google/gnostic-models v0.6.8 // indirect
116118
github.com/google/go-cmp v0.7.0 // indirect
117-
github.com/google/go-containerregistry v0.20.3 // indirect
119+
github.com/google/go-containerregistry v0.20.4-0.20250225234217-098045d5e61f // indirect
118120
github.com/google/gofuzz v1.2.0 // indirect
119121
github.com/google/gopacket v1.1.19 // indirect
120-
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
122+
github.com/google/pprof v0.0.0-20250820193118-f64d9cf942d6 // indirect
121123
github.com/google/uuid v1.6.0 // indirect
122124
github.com/gorilla/mux v1.8.1 // indirect
123125
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
@@ -135,7 +137,7 @@ require (
135137
github.com/mailru/easyjson v0.7.7 // indirect
136138
github.com/mattn/go-isatty v0.0.20 // indirect
137139
github.com/mattn/go-runewidth v0.0.16 // indirect
138-
github.com/mattn/go-sqlite3 v1.14.28 // indirect
140+
github.com/mattn/go-sqlite3 v1.14.32 // indirect
139141
github.com/mdlayher/socket v0.4.1 // indirect
140142
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
141143
github.com/miekg/dns v1.1.68 // indirect
@@ -153,13 +155,13 @@ require (
153155
github.com/pierrec/lz4/v4 v4.1.14 // indirect
154156
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
155157
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
156-
github.com/proglottis/gpgme v0.1.4 // indirect
158+
github.com/proglottis/gpgme v0.1.5 // indirect
157159
github.com/rivo/uniseg v0.4.7 // indirect
158160
github.com/russross/blackfriday/v2 v2.1.0 // indirect
159161
github.com/sagikazarmark/locafero v0.11.0 // indirect
160-
github.com/secure-systems-lab/go-securesystemslib v0.9.0 // indirect
162+
github.com/secure-systems-lab/go-securesystemslib v0.9.1 // indirect
161163
github.com/segmentio/backo-go v1.0.1 // indirect
162-
github.com/sigstore/fulcio v1.6.6 // indirect
164+
github.com/sigstore/fulcio v1.7.1 // indirect
163165
github.com/sigstore/protobuf-specs v0.4.1 // indirect
164166
github.com/sigstore/sigstore v1.9.5 // indirect
165167
github.com/smallstep/pkcs7 v0.1.1 // indirect
@@ -176,17 +178,18 @@ require (
176178
github.com/vbatts/tar-split v0.12.1 // indirect
177179
github.com/vbauerster/mpb/v8 v8.10.2 // indirect
178180
github.com/x448/float16 v0.8.4 // indirect
181+
go.podman.io/storage v1.60.0 // indirect
179182
go.uber.org/automaxprocs v1.6.0 // indirect
180183
go.yaml.in/yaml/v2 v2.4.2 // indirect
181184
go.yaml.in/yaml/v3 v3.0.4 // indirect
182185
golang.org/x/mod v0.28.0 // indirect
183186
golang.org/x/oauth2 v0.30.0 // indirect
184187
golang.org/x/time v0.11.0 // indirect
185188
golang.org/x/tools v0.37.0 // indirect
186-
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
187-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250313205543-e70fdf4c4cb4 // indirect
189+
google.golang.org/genproto/googleapis/api v0.0.0-20250414145226-207652e42e2e // indirect
190+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250414145226-207652e42e2e // indirect
188191
google.golang.org/grpc v1.72.2 // indirect
189-
google.golang.org/protobuf v1.36.7 // indirect
192+
google.golang.org/protobuf v1.36.8 // indirect
190193
gopkg.in/cenkalti/backoff.v1 v1.1.0 // indirect
191194
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
192195
gopkg.in/inf.v0 v0.9.1 // indirect
@@ -196,5 +199,5 @@ require (
196199
k8s.io/utils v0.0.0-20241210054802-24370beab758 // indirect
197200
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
198201
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
199-
sigs.k8s.io/yaml v1.5.0 // indirect
202+
sigs.k8s.io/yaml v1.6.0 // indirect
200203
)

0 commit comments

Comments
 (0)