Skip to content

Commit 6d1c75e

Browse files
committed
Fork go-containerregistry
Signed-off-by: Eric Curtin <[email protected]>
1 parent 22ec140 commit 6d1c75e

File tree

520 files changed

+67105
-67
lines changed

Some content is hidden

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

520 files changed

+67105
-67
lines changed

cmd/cli/commands/package.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
"github.com/docker/model-runner/pkg/distribution/tarball"
1818
"github.com/docker/model-runner/pkg/distribution/types"
1919

20-
"github.com/google/go-containerregistry/pkg/name"
20+
"github.com/docker/model-runner/pkg/go-containerregistry/pkg/name"
2121
"github.com/spf13/cobra"
2222

2323
"github.com/docker/model-runner/cmd/cli/commands/completion"

cmd/cli/commands/tag.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"github.com/docker/model-runner/cmd/cli/commands/completion"
88
"github.com/docker/model-runner/cmd/cli/desktop"
99
"github.com/docker/model-runner/pkg/distribution/registry"
10-
"github.com/google/go-containerregistry/pkg/name"
10+
"github.com/docker/model-runner/pkg/go-containerregistry/pkg/name"
1111
"github.com/spf13/cobra"
1212
)
1313

cmd/cli/commands/utils.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"github.com/docker/model-runner/cmd/cli/desktop"
1212
"github.com/docker/model-runner/cmd/cli/pkg/standalone"
1313
"github.com/docker/model-runner/pkg/inference/backends/vllm"
14-
"github.com/google/go-containerregistry/pkg/name"
14+
"github.com/docker/model-runner/pkg/go-containerregistry/pkg/name"
1515
"github.com/moby/term"
1616
"github.com/spf13/cobra"
1717
)

cmd/cli/go.mod

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ require (
1111
github.com/docker/go-connections v0.6.0
1212
github.com/docker/go-units v0.5.0
1313
github.com/docker/model-runner v0.0.0
14+
github.com/docker/model-runner/pkg/go-containerregistry v0.0.0-00010101000000-000000000000
1415
github.com/emirpasic/gods/v2 v2.0.0-alpha
1516
github.com/fatih/color v1.18.0
16-
github.com/google/go-containerregistry v0.20.6
1717
github.com/mattn/go-runewidth v0.0.16
1818
github.com/moby/term v0.5.2
1919
github.com/muesli/termenv v0.16.0
@@ -154,3 +154,5 @@ require (
154154
replace github.com/kolesnikovae/go-winjob => github.com/docker/go-winjob v0.0.0-20250829235554-57b487ebcbc5
155155

156156
replace github.com/docker/model-runner => ../..
157+
158+
replace github.com/docker/model-runner/pkg/go-containerregistry => ../../pkg/go-containerregistry

cmd/cli/go.sum

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,6 @@ github.com/google/certificate-transparency-go v1.0.10-0.20180222191210-5ab67e519
155155
github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
156156
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
157157
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
158-
github.com/google/go-containerregistry v0.20.6 h1:cvWX87UxxLgaH76b4hIvya6Dzz9qHB31qAwjAohdSTU=
159-
github.com/google/go-containerregistry v0.20.6/go.mod h1:T0x8MuoAoKX/873bkeSfLD2FAkwCDf9/HZgsFJ02E2Y=
160158
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
161159
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
162160
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=

go.mod

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ require (
66
github.com/containerd/containerd/v2 v2.1.5
77
github.com/containerd/platforms v1.0.0-rc.1
88
github.com/docker/go-units v0.5.0
9+
github.com/docker/model-runner/pkg/go-containerregistry v0.0.0-00010101000000-000000000000
910
github.com/elastic/go-sysinfo v1.15.4
10-
github.com/google/go-containerregistry v0.20.6
1111
github.com/gpustack/gguf-parser-go v0.22.1
1212
github.com/jaypipes/ghw v0.19.1
1313
github.com/kolesnikovae/go-winjob v1.0.0
@@ -72,3 +72,5 @@ require (
7272
)
7373

7474
replace github.com/kolesnikovae/go-winjob => github.com/docker/go-winjob v0.0.0-20250829235554-57b487ebcbc5
75+
76+
replace github.com/docker/model-runner/pkg/go-containerregistry => ./pkg/go-containerregistry

go.sum

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,6 @@ github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l
6060
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
6161
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
6262
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
63-
github.com/google/go-containerregistry v0.20.6 h1:cvWX87UxxLgaH76b4hIvya6Dzz9qHB31qAwjAohdSTU=
64-
github.com/google/go-containerregistry v0.20.6/go.mod h1:T0x8MuoAoKX/873bkeSfLD2FAkwCDf9/HZgsFJ02E2Y=
6563
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
6664
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
6765
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=

pkg/distribution/builder/builder.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"fmt"
66
"io"
77

8-
v1 "github.com/google/go-containerregistry/pkg/v1"
8+
v1 "github.com/docker/model-runner/pkg/go-containerregistry/pkg/v1"
99

1010
"github.com/docker/model-runner/pkg/distribution/internal/gguf"
1111
"github.com/docker/model-runner/pkg/distribution/internal/mutate"

pkg/distribution/builder/builder_test.go

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

1111
"github.com/docker/model-runner/pkg/distribution/builder"
1212
"github.com/docker/model-runner/pkg/distribution/types"
13-
v1 "github.com/google/go-containerregistry/pkg/v1"
13+
v1 "github.com/docker/model-runner/pkg/go-containerregistry/pkg/v1"
1414
)
1515

1616
func TestBuilder(t *testing.T) {

pkg/distribution/distribution/client_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ import (
1616
"strings"
1717
"testing"
1818

19-
"github.com/google/go-containerregistry/pkg/name"
20-
"github.com/google/go-containerregistry/pkg/registry"
21-
"github.com/google/go-containerregistry/pkg/v1/remote"
19+
"github.com/docker/model-runner/pkg/go-containerregistry/pkg/name"
20+
"github.com/docker/model-runner/pkg/go-containerregistry/pkg/registry"
21+
"github.com/docker/model-runner/pkg/go-containerregistry/pkg/v1/remote"
2222
"github.com/sirupsen/logrus"
2323

2424
"github.com/docker/model-runner/pkg/distribution/internal/gguf"

0 commit comments

Comments
 (0)