Merge pull request #51604 from robmry/drop_replace

Drop replace rules
This commit is contained in:
Paweł Gronowski
2025-11-27 14:32:11 +01:00
committed by GitHub
5 changed files with 11 additions and 13 deletions

View File

@@ -10,7 +10,7 @@ require (
github.com/docker/go-connections v0.6.0
github.com/docker/go-units v0.5.0
github.com/google/go-cmp v0.7.0
github.com/moby/moby/api v1.52.0
github.com/moby/moby/api v1.52.1-0.20251127112201-20634eddce67
github.com/moby/term v0.5.2
github.com/opencontainers/go-digest v1.0.0
github.com/opencontainers/image-spec v1.1.1
@@ -32,5 +32,3 @@ require (
go.opentelemetry.io/otel/metric v1.35.0 // indirect
golang.org/x/sys v0.33.0 // indirect
)
replace github.com/moby/moby/api => ../api

View File

@@ -29,6 +29,8 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
github.com/moby/moby/api v1.52.1-0.20251127112201-20634eddce67 h1:n3faoyhuHCuKrrJNJOYaYKYTX5ZbZ9Zp7dMdlsZCOFw=
github.com/moby/moby/api v1.52.1-0.20251127112201-20634eddce67/go.mod h1:8mb+ReTlisw4pS6BRzCMts5M49W5M7bKt1cJy/YbAqc=
github.com/moby/term v0.5.2 h1:6qk3FJAFDs6i/q3W/pQ97SX192qKfZgGjCQqfCJkgzQ=
github.com/moby/term v0.5.2/go.mod h1:d3djjFCrjnB+fl8NJux+EJzu0msscUP+f8it8hPkFLc=
github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=

8
go.mod
View File

@@ -61,8 +61,8 @@ require (
github.com/moby/go-archive v0.1.0
github.com/moby/ipvs v1.1.0
github.com/moby/locker v1.0.1
github.com/moby/moby/api v1.52.0
github.com/moby/moby/client v0.1.0
github.com/moby/moby/api v1.52.1-0.20251127112201-20634eddce67
github.com/moby/moby/client v0.1.1-0.20251127130102-d55f77dbfc3e
github.com/moby/patternmatcher v0.6.0
github.com/moby/policy-helpers v0.0.0-20251105011237-bcaa71c99f14
github.com/moby/profiles/apparmor v0.1.0
@@ -253,7 +253,3 @@ require (
sigs.k8s.io/yaml v1.6.0 // indirect
tags.cncf.io/container-device-interface/specs-go v1.0.0 // indirect
)
replace github.com/moby/moby/api => ./api
replace github.com/moby/moby/client => ./client

4
go.sum
View File

@@ -427,6 +427,10 @@ github.com/moby/ipvs v1.1.0 h1:ONN4pGaZQgAx+1Scz5RvWV4Q7Gb+mvfRh3NsPS+1XQQ=
github.com/moby/ipvs v1.1.0/go.mod h1:4VJMWuf098bsUMmZEiD4Tjk/O7mOn3l1PTD3s4OoYAs=
github.com/moby/locker v1.0.1 h1:fOXqR41zeveg4fFODix+1Ch4mj/gT0NE1XJbp/epuBg=
github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc=
github.com/moby/moby/api v1.52.1-0.20251127112201-20634eddce67 h1:n3faoyhuHCuKrrJNJOYaYKYTX5ZbZ9Zp7dMdlsZCOFw=
github.com/moby/moby/api v1.52.1-0.20251127112201-20634eddce67/go.mod h1:8mb+ReTlisw4pS6BRzCMts5M49W5M7bKt1cJy/YbAqc=
github.com/moby/moby/client v0.1.1-0.20251127130102-d55f77dbfc3e h1:HrWrBVqHS4Oy0xL7RQJFlBlOGyYuu5btzLytX9DXyJc=
github.com/moby/moby/client v0.1.1-0.20251127130102-d55f77dbfc3e/go.mod h1:8rNHNx7Fo0vnFNjztsJuFrOjai5x2qge2VvK5gAz90Y=
github.com/moby/patternmatcher v0.6.0 h1:GmP9lR19aU5GqSSFko+5pRqHi+Ohk1O69aFiKkVGiPk=
github.com/moby/patternmatcher v0.6.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc=
github.com/moby/policy-helpers v0.0.0-20251105011237-bcaa71c99f14 h1:JO22uXMy3CN7wh7A/wrtYQWV1WYQMg2gh6d8YO325k4=

6
vendor/modules.txt vendored
View File

@@ -1028,7 +1028,7 @@ github.com/moby/ipvs
# github.com/moby/locker v1.0.1
## explicit; go 1.13
github.com/moby/locker
# github.com/moby/moby/api v1.52.0 => ./api
# github.com/moby/moby/api v1.52.1-0.20251127112201-20634eddce67
## explicit; go 1.24.0
github.com/moby/moby/api/pkg/authconfig
github.com/moby/moby/api/pkg/stdcopy
@@ -1050,7 +1050,7 @@ github.com/moby/moby/api/types/storage
github.com/moby/moby/api/types/swarm
github.com/moby/moby/api/types/system
github.com/moby/moby/api/types/volume
# github.com/moby/moby/client v0.1.0 => ./client
# github.com/moby/moby/client v0.1.1-0.20251127130102-d55f77dbfc3e
## explicit; go 1.24.0
github.com/moby/moby/client
github.com/moby/moby/client/internal
@@ -1861,5 +1861,3 @@ tags.cncf.io/container-device-interface/pkg/parser
# tags.cncf.io/container-device-interface/specs-go v1.0.0
## explicit; go 1.19
tags.cncf.io/container-device-interface/specs-go
# github.com/moby/moby/api => ./api
# github.com/moby/moby/client => ./client