Skip to content

Commit a62063b

Browse files
Bump mergo to v1.0.0 with new module URL (#2403)
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
1 parent 2feff3f commit a62063b

File tree

3 files changed

+2
-5
lines changed

3 files changed

+2
-5
lines changed

go.mod

+1-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ require (
1414
github.com/docker/go-connections v0.5.0
1515
github.com/go-git/go-billy/v5 v5.5.0
1616
github.com/go-git/go-git/v5 v5.12.0
17-
github.com/imdario/mergo v0.3.16
1817
github.com/joho/godotenv v1.5.1
1918
github.com/julienschmidt/httprouter v1.3.0
2019
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
@@ -38,12 +37,12 @@ require (
3837
)
3938

4039
require (
40+
dario.cat/mergo v1.0.0
4141
github.com/golang-jwt/jwt/v5 v5.2.1
4242
google.golang.org/protobuf v1.34.2
4343
)
4444

4545
require (
46-
dario.cat/mergo v1.0.0 // indirect
4746
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
4847
github.com/Microsoft/go-winio v0.6.1 // indirect
4948
github.com/ProtonMail/go-crypto v1.0.0 // indirect

go.sum

-2
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,6 @@ github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 h1:Wqo399gCIufwto+VfwCSvsnfGpF
9595
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0/go.mod h1:qmOFXW2epJhM0qSnUUYpldc7gVz2KMQwJ/QYCDIa7XU=
9696
github.com/hinshun/vt10x v0.0.0-20220119200601-820417d04eec h1:qv2VnGeEQHchGaZ/u7lxST/RaJw+cv273q79D81Xbog=
9797
github.com/hinshun/vt10x v0.0.0-20220119200601-820417d04eec/go.mod h1:Q48J4R4DvxnHolD5P8pOtXigYlRuPLGl6moFx3ulM68=
98-
github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4=
99-
github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
10098
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
10199
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
102100
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=

pkg/container/docker_run.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import (
1616
"strconv"
1717
"strings"
1818

19+
"dario.cat/mergo"
1920
"github.com/Masterminds/semver"
2021
"github.com/docker/cli/cli/connhelper"
2122
"github.com/docker/docker/api/types"
@@ -28,7 +29,6 @@ import (
2829
"github.com/go-git/go-billy/v5/helper/polyfill"
2930
"github.com/go-git/go-billy/v5/osfs"
3031
"github.com/go-git/go-git/v5/plumbing/format/gitignore"
31-
"github.com/imdario/mergo"
3232
"github.com/joho/godotenv"
3333
"github.com/kballard/go-shellquote"
3434
specs "github.com/opencontainers/image-spec/specs-go/v1"

0 commit comments

Comments
 (0)