Skip to content

Commit 1713717

Browse files
estespestesp
authored
Merge pull request #244 from estesp/handle-removed-configdir
Update vendors and remove use of deprecated function
2 parents 48fc5b4 + 55d37c5 commit 1713717

Some content is hidden

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

52 files changed

+4198
-462
lines changed

‎v2/cmd/manifest-tool/main.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"os"
66
"path/filepath"
77

8-
"github.com/docker/docker/cli/config"
8+
"github.com/estesp/manifest-tool/v2/pkg/util"
99
"github.com/sirupsen/logrus"
1010
"github.com/urfave/cli/v2"
1111
)
@@ -15,7 +15,7 @@ var gitCommit = ""
1515
var version = ""
1616

1717
const (
18-
usage = "registry client to inspect and push multi-platform OCI & Docker v2 images"
18+
usage = "registry client to inspect and push multi-platform OCI & Docker v2 images"
1919
)
2020

2121
func main() {
@@ -56,7 +56,7 @@ func runApplication() error {
5656
},
5757
&cli.StringFlag{
5858
Name: "docker-cfg",
59-
Value: config.Dir(),
59+
Value: util.ConfigDir(),
6060
Usage: "either a directory path containing a Docker-formatted config.json or a specific JSON file formatted for registry auth",
6161
},
6262
}
@@ -69,7 +69,7 @@ func runApplication() error {
6969
dockerAuthPath := c.String("docker-cfg")
7070
// if set to the default, we don't check for validity because it may not
7171
// even exist
72-
if dockerAuthPath == config.Dir() {
72+
if dockerAuthPath == util.ConfigDir() {
7373
if err := c.Set("docker-cfg", filepath.Join(dockerAuthPath, "config.json")); err != nil {
7474
return fmt.Errorf("unable to update docker-cfg flag in context: %w", err)
7575
}

‎v2/go.mod

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ module github.com/estesp/manifest-tool/v2
33
go 1.19
44

55
require (
6-
github.com/containerd/containerd v1.7.8
7-
github.com/docker/cli v23.0.7+incompatible
6+
github.com/containerd/containerd v1.7.9
7+
github.com/docker/cli v24.0.7+incompatible
88
github.com/docker/distribution v2.8.2+incompatible
9-
github.com/docker/docker v23.0.7+incompatible
9+
github.com/docker/docker v24.0.7+incompatible
1010
github.com/fatih/color v1.10.0
1111
github.com/opencontainers/go-digest v1.0.0
1212
github.com/opencontainers/image-spec v1.1.0-rc4
@@ -19,11 +19,11 @@ require (
1919

2020
require (
2121
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
22-
github.com/Microsoft/hcsshim v0.11.1 // indirect
22+
github.com/Microsoft/hcsshim v0.11.4 // indirect
2323
github.com/containerd/log v0.1.0 // indirect
2424
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
2525
github.com/docker/docker-credential-helpers v0.7.0 // indirect
26-
github.com/go-logr/logr v1.2.3 // indirect
26+
github.com/go-logr/logr v1.2.4 // indirect
2727
github.com/go-logr/stdr v1.2.2 // indirect
2828
github.com/golang/protobuf v1.5.3 // indirect
2929
github.com/klauspost/compress v1.16.0 // indirect
@@ -34,8 +34,9 @@ require (
3434
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
3535
github.com/russross/blackfriday/v2 v2.1.0 // indirect
3636
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
37-
go.opentelemetry.io/otel v1.14.0 // indirect
38-
go.opentelemetry.io/otel/trace v1.14.0 // indirect
37+
go.opentelemetry.io/otel v1.19.0 // indirect
38+
go.opentelemetry.io/otel/metric v1.19.0 // indirect
39+
go.opentelemetry.io/otel/trace v1.19.0 // indirect
3940
golang.org/x/sync v0.3.0 // indirect
4041
golang.org/x/sys v0.13.0 // indirect
4142
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect

‎v2/go.sum

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 h1:bvDV9vkmnHYOMsOr4WLk+Vo07yKIzd94sVoIqshQ4bU=
22
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24/go.mod h1:8o94RPi1/7XTJvwPpRSzSUedZrtlirdB3r9Z20bi2f8=
33
github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow=
4-
github.com/Microsoft/hcsshim v0.11.1 h1:hJ3s7GbWlGK4YVV92sO88BQSyF4ZLVy7/awqOlPxFbA=
5-
github.com/Microsoft/hcsshim v0.11.1/go.mod h1:nFJmaO4Zr5Y7eADdFOpYswDDlNVbvcIJJNJLECr5JQg=
4+
github.com/Microsoft/hcsshim v0.11.4 h1:68vKo2VN8DE9AdN4tnkWnmdhqdbpUFM8OF3Airm7fz8=
5+
github.com/Microsoft/hcsshim v0.11.4/go.mod h1:smjE4dvqPX9Zldna+t5FG3rnoHhaB7QYxPRqGcpAD9w=
66
github.com/containerd/cgroups v1.1.0 h1:v8rEWFl6EoqHB+swVNjVoCJE8o3jX7e8nqBGPLaDFBM=
7-
github.com/containerd/containerd v1.7.8 h1:RkwgOW3AVUT3H/dyT0W03Dc8AzlpMG65lX48KftOFSM=
8-
github.com/containerd/containerd v1.7.8/go.mod h1:L/Hn9qylJtUFT7cPeM0Sr3fATj+WjHwRQ0lyrYk3OPY=
7+
github.com/containerd/containerd v1.7.9 h1:KOhK01szQbM80YfW1H6RZKh85PHGqY/9OcEZ35Je8sc=
8+
github.com/containerd/containerd v1.7.9/go.mod h1:0/W44LWEYfSHoxBtsHIiNU/duEkgpMokemafHVCpq9Y=
99
github.com/containerd/continuity v0.4.2 h1:v3y/4Yz5jwnvqPKJJ+7Wf93fyWoCB3F5EclWG023MDM=
1010
github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
1111
github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
@@ -15,19 +15,19 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3
1515
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
1616
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
1717
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
18-
github.com/docker/cli v23.0.7+incompatible h1:b+cDxRx/f6P1JR6asBXJOneubySm4nE8CB1B/3g59Sw=
19-
github.com/docker/cli v23.0.7+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
18+
github.com/docker/cli v24.0.7+incompatible h1:wa/nIwYFW7BVTGa7SWPVyyXU9lgORqUb1xfI36MSkFg=
19+
github.com/docker/cli v24.0.7+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
2020
github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8=
2121
github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
22-
github.com/docker/docker v23.0.7+incompatible h1:6RD6ZfR9LYacFt90L41R/6/SyO+RZ1zWU7+bt6tdRNk=
23-
github.com/docker/docker v23.0.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
22+
github.com/docker/docker v24.0.7+incompatible h1:Wo6l37AuwP3JaMnZa226lzVXGA3F9Ig1seQen0cKYlM=
23+
github.com/docker/docker v24.0.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
2424
github.com/docker/docker-credential-helpers v0.7.0 h1:xtCHsjxogADNZcdv1pKUHXryefjlVRqWqIhk/uXJp0A=
2525
github.com/docker/docker-credential-helpers v0.7.0/go.mod h1:rETQfLdHNT3foU5kuNkFR1R1V12OJRRO5lzt2D1b5X0=
2626
github.com/fatih/color v1.10.0 h1:s36xzo75JdqLaaWoiEHk767eHiwo0598uUxyfiPkDsg=
2727
github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM=
2828
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
29-
github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0=
30-
github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
29+
github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
30+
github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
3131
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
3232
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
3333
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
@@ -73,10 +73,12 @@ github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRT
7373
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
7474
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
7575
go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
76-
go.opentelemetry.io/otel v1.14.0 h1:/79Huy8wbf5DnIPhemGB+zEPVwnN6fuQybr/SRXa6hM=
77-
go.opentelemetry.io/otel v1.14.0/go.mod h1:o4buv+dJzx8rohcUeRmWUZhqupFvzWis188WlggnNeU=
78-
go.opentelemetry.io/otel/trace v1.14.0 h1:wp2Mmvj41tDsyAJXiWDWpfNsOiIyd38fy85pyKcFq/M=
79-
go.opentelemetry.io/otel/trace v1.14.0/go.mod h1:8avnQLK+CG77yNLUae4ea2JDQ6iT+gozhnZjy/rw9G8=
76+
go.opentelemetry.io/otel v1.19.0 h1:MuS/TNf4/j4IXsZuJegVzI1cwut7Qc00344rgH7p8bs=
77+
go.opentelemetry.io/otel v1.19.0/go.mod h1:i0QyjOq3UPoTzff0PJB2N66fb4S0+rSbSB15/oyH9fY=
78+
go.opentelemetry.io/otel/metric v1.19.0 h1:aTzpGtV0ar9wlV4Sna9sdJyII5jTVJEvKETPiOKwvpE=
79+
go.opentelemetry.io/otel/metric v1.19.0/go.mod h1:L5rUsV9kM1IxCj1MmSdS+JQAcVm319EUrDVLrt7jqt8=
80+
go.opentelemetry.io/otel/trace v1.19.0 h1:DFVQmlVbfVeOuBRrwdtaehRrWiL1JoVs9CPIQ1Dzxpg=
81+
go.opentelemetry.io/otel/trace v1.19.0/go.mod h1:mfaSyvGyEJEI0nyV2I4qhNQnbBOUUmYZpYojqMnX2vo=
8082
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
8183
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
8284
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=

‎v2/pkg/util/resolver.go

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"fmt"
66
"net/http"
77
"os"
8+
"path/filepath"
89
"strings"
910

1011
"github.com/containerd/containerd/remotes"
@@ -13,10 +14,15 @@ import (
1314
"github.com/docker/cli/cli/config/configfile"
1415
"github.com/docker/cli/cli/config/credentials"
1516
"github.com/docker/distribution/reference"
17+
"github.com/docker/docker/pkg/homedir"
1618
"github.com/sirupsen/logrus"
1719
)
1820

19-
var registryHost docker.RegistryHost
21+
var (
22+
configDir = os.Getenv("DOCKER_CONFIG")
23+
configFileDir = ".docker"
24+
registryHost docker.RegistryHost
25+
)
2026

2127
func CreateRegistryHost(imageRef reference.Named, username, password string, insecure, plainHTTP bool, dockerConfigPath string, pushOp bool) error {
2228

@@ -57,8 +63,8 @@ func CreateRegistryHost(imageRef reference.Named, username, password string, ins
5763
err error
5864
cfg *configfile.ConfigFile
5965
)
60-
if dockerConfigPath == "" || dockerConfigPath == config.Dir() {
61-
cfg, err = config.Load(config.Dir())
66+
if dockerConfigPath == "" || dockerConfigPath == configDir {
67+
cfg, err = config.Load(configDir)
6268
if err != nil {
6369
logrus.Warnf("unable to load default Docker auth config: %v", err)
6470
}
@@ -116,3 +122,13 @@ func resolveHostname(hostname string) string {
116122
}
117123
return hostname
118124
}
125+
126+
func init() {
127+
if configDir == "" {
128+
configDir = filepath.Join(homedir.Get(), configFileDir)
129+
}
130+
}
131+
132+
func ConfigDir() string {
133+
return configDir
134+
}

‎v2/vendor/github.com/containerd/containerd/images/labels.go

Lines changed: 21 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎v2/vendor/github.com/containerd/containerd/version/version.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎v2/vendor/github.com/docker/cli/cli/config/configfile/file.go

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎v2/vendor/github.com/docker/docker/AUTHORS

Lines changed: 18 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎v2/vendor/github.com/docker/docker/cli/config/configdir.go

Lines changed: 0 additions & 27 deletions
This file was deleted.

0 commit comments

Comments
 (0)