Skip to content

Commit 126cb98

Browse files
ulyssessouzaulyssessouza
authored
Merge pull request #9817 from ulyssessouza/apply-newly-loaded-envvars
Apply newly loaded envvars to "DockerCli" and "APIClient"
2 parents b80222f + 79af3cd commit 126cb98

3 files changed

Lines changed: 21 additions & 3 deletions

File tree

‎cmd/compose/compose.go‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,15 @@ import (
2525
"strings"
2626
"syscall"
2727

28+
cnabgodocker "github.com/cnabio/cnab-go/driver/docker"
2829
"github.com/compose-spec/compose-go/cli"
2930
"github.com/compose-spec/compose-go/types"
3031
composegoutils "github.com/compose-spec/compose-go/utils"
3132
"github.com/docker/buildx/util/logutil"
3233
dockercli "github.com/docker/cli/cli"
3334
"github.com/docker/cli/cli-plugins/manager"
3435
"github.com/docker/cli/cli/command"
36+
"github.com/docker/docker/client"
3537
"github.com/morikuni/aec"
3638
"github.com/pkg/errors"
3739
"github.com/sirupsen/logrus"
@@ -291,6 +293,16 @@ func RootCommand(dockerCli command.Cli, backend api.Service) *cobra.Command {
291293
if err != nil {
292294
return err
293295
}
296+
// Reset DockerCli and APIClient to get possible `DOCKER_HOST` and/or `DOCKER_CONTEXT` loaded from environment file.
297+
err = dockerCli.Apply(func(cli *command.DockerCli) error {
298+
return cli.Initialize(cnabgodocker.BuildDockerClientOptions(),
299+
command.WithInitializeClient(func(_ *command.DockerCli) (client.APIClient, error) {
300+
return nil, nil
301+
}))
302+
})
303+
if err != nil {
304+
return err
305+
}
294306
parent := cmd.Root()
295307
if parent != nil {
296308
parentPrerun := parent.PersistentPreRunE

‎go.mod‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ go 1.18
55
require (
66
github.com/AlecAivazis/survey/v2 v2.3.5
77
github.com/buger/goterm v1.0.4
8+
github.com/cnabio/cnab-go v0.24.1-0.20220907172316-1ca5c8721bf7
89
github.com/cnabio/cnab-to-oci v0.3.7
910
github.com/compose-spec/compose-go v1.5.0
1011
github.com/containerd/console v1.0.3
@@ -44,7 +45,6 @@ require (
4445
github.com/Microsoft/go-winio v0.5.2 // indirect
4546
github.com/beorn7/perks v1.0.1 // indirect
4647
github.com/cespare/xxhash/v2 v2.1.2 // indirect
47-
github.com/cnabio/cnab-go v0.23.4 // indirect
4848
github.com/containerd/continuity v0.2.3-0.20220330195504-d132b287edc8 // indirect
4949
github.com/containerd/ttrpc v1.1.0 // indirect
5050
github.com/containerd/typeurl v1.0.2 // indirect
@@ -133,6 +133,8 @@ require (
133133
github.com/cenkalti/backoff/v4 v4.1.2 // indirect
134134
github.com/cyberphone/json-canonicalization v0.0.0-20210303052042-6bc126869bf4 // indirect
135135
github.com/googleapis/gnostic v0.5.5 // indirect
136+
github.com/mitchellh/copystructure v1.0.0 // indirect
137+
github.com/mitchellh/reflectwalk v1.0.0 // indirect
136138
github.com/moby/spdystream v0.2.0 // indirect
137139
github.com/serialx/hashring v0.0.0-20190422032157-8b2912629002 // indirect
138140
github.com/zmap/zcrypto v0.0.0-20220605182715-4dfcec6e9a8c // indirect

‎go.sum‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -269,8 +269,8 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk
269269
github.com/cloudflare/cfssl v0.0.0-20180223231731-4e2dcbde5004/go.mod h1:yMWuSON2oQp+43nFtAV/uvKQIFpSPerB57DCt9t8sSA=
270270
github.com/cloudflare/cfssl v0.0.0-20181213083726-b94e044bb51e/go.mod h1:yMWuSON2oQp+43nFtAV/uvKQIFpSPerB57DCt9t8sSA=
271271
github.com/cloudflare/cfssl v1.4.1 h1:vScfU2DrIUI9VPHBVeeAQ0q5A+9yshO1Gz+3QoUQiKw=
272-
github.com/cnabio/cnab-go v0.23.4 h1:jplQcSnvFyQlD6swiqL3BmqRnhbnS+lc/EKdBLH9E80=
273-
github.com/cnabio/cnab-go v0.23.4/go.mod h1:9EmgHR51LFqQStzaC+xHPJlkD4OPsF6Ev5Y8e/YHEns=
272+
github.com/cnabio/cnab-go v0.24.1-0.20220907172316-1ca5c8721bf7 h1:6cETeoyahKaH4hNShuB4KUqkTdjLVKEpTakHW5bpDW8=
273+
github.com/cnabio/cnab-go v0.24.1-0.20220907172316-1ca5c8721bf7/go.mod h1:Zm0HTH8xxzinB64SXm7KFSna7DEN0ZjZwrRwZpfgChU=
274274
github.com/cnabio/cnab-to-oci v0.3.7 h1:wA2AG3HQMaJZhWlr3zsfVoa2m5B1R/SP+YcoFuNfP9o=
275275
github.com/cnabio/cnab-to-oci v0.3.7/go.mod h1:AvVNl0Hh3VBk1zqeLdyE5S3bTQ5EsZPPF4mUUJYyy1Y=
276276
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
@@ -1002,6 +1002,8 @@ github.com/miekg/pkcs11 v1.1.1 h1:Ugu9pdy6vAYku5DEpVWVFPYnzV+bxB+iRdbuFSu7TvU=
10021002
github.com/miekg/pkcs11 v1.1.1/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs=
10031003
github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible/go.mod h1:8AuVvqP/mXw1px98n46wfvcGfQ4ci2FwoAjKYxuo3Z4=
10041004
github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
1005+
github.com/mitchellh/copystructure v1.0.0 h1:Laisrj+bAB6b/yJwB5Bt3ITZhGJdqmxquMKeZ+mmkFQ=
1006+
github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw=
10051007
github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
10061008
github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
10071009
github.com/mitchellh/go-ps v0.0.0-20190716172923-621e5597135b/go.mod h1:r1VsdOzOPt1ZSrGZWFoNhsAedKnEd6r9Np1+5blZCWk=
@@ -1020,6 +1022,8 @@ github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RR
10201022
github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
10211023
github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
10221024
github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod h1:OkQIRizQZAeMln+1tSwduZz7+Af5oFlKirV/MSYes2A=
1025+
github.com/mitchellh/reflectwalk v1.0.0 h1:9D+8oIskB4VJBN5SFlmc27fSlIBZaov1Wpk/IfikLNY=
1026+
github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
10231027
github.com/moby/buildkit v0.8.1/go.mod h1:/kyU1hKy/aYCuP39GZA9MaKioovHku57N6cqlKZIaiQ=
10241028
github.com/moby/buildkit v0.10.1-0.20220403220257-10e6f94bf90d/go.mod h1:WvwAZv8aRScHkqc/+X46cRC2CKMKpqcaX+pRvUTtPes=
10251029
github.com/moby/buildkit v0.10.4 h1:FvC+buO8isGpUFZ1abdSLdGHZVqg9sqI4BbFL8tlzP4=

0 commit comments

Comments
 (0)