Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Optionally use ssh for docker-env instead of tcp #9548

Merged
merged 10 commits into from
Dec 9, 2020
Merged

Optionally use ssh for docker-env instead of tcp #9548

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7841aea
Optionally use ssh for docker-env instead of tcp
afbjorklund Oct 25, 2020
b57bf9a
Refactor dockerUnsetScript with a helper function
afbjorklund Nov 1, 2020
274be7f
Split template for docker tcp and ssh in two vars
afbjorklund Nov 1, 2020
d2e2eca
Add option to add the ssh key to the ssh agent
afbjorklund Nov 8, 2020
88b8843
Show result from running the ssh-add command
afbjorklund Nov 8, 2020
0542724
Merge tag 'v1.15.0' into docker-env-ssh
afbjorklund Nov 15, 2020
bf73bcc
Merge tag 'v1.15.1' into docker-env-ssh
afbjorklund Nov 19, 2020
807bec0
Merge branch 'master' into docker-env-ssh
afbjorklund Nov 22, 2020
9189069
Merge branch 'master' into docker-env-ssh
afbjorklund Nov 24, 2020
45befa0
Merge branch 'master' into docker-env-ssh
afbjorklund Dec 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Split template for docker tcp and ssh in two vars
  • Loading branch information
@afbjorklund
afbjorklund committed Nov 1, 2020
commit 274be7f52df1156535a08a7eb71254d9eb4d54a1
10 changes: 9 additions & 1 deletion cmd/minikube/cmd/docker-env.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,9 @@ import (
"k8s.io/minikube/pkg/minikube/sysinit"
)

var dockerEnvTmpl = fmt.Sprintf("{{ if .DockerTLSVerify }}{{ .Prefix }}%s{{ .Delimiter }}{{ .DockerTLSVerify }}{{ .Suffix }}{{ end }}{{ .Prefix }}%s{{ .Delimiter }}{{ .DockerHost }}{{ .Suffix }}{{ if .DockerCertPath }}{{ .Prefix }}%s{{ .Delimiter }}{{ .DockerCertPath }}{{ .Suffix }}{{ end }}{{ .Prefix }}%s{{ .Delimiter }}{{ .MinikubeDockerdProfile }}{{ .Suffix }}{{ if .NoProxyVar }}{{ .Prefix }}{{ .NoProxyVar }}{{ .Delimiter }}{{ .NoProxyValue }}{{ .Suffix }}{{ end }}{{ .UsageHint }}", constants.DockerTLSVerifyEnv, constants.DockerHostEnv, constants.DockerCertPathEnv, constants.MinikubeActiveDockerdEnv)
var dockerEnvTCPTmpl = fmt.Sprintf("{{ .Prefix }}%s{{ .Delimiter }}{{ .DockerTLSVerify }}{{ .Suffix }}{{ .Prefix }}%s{{ .Delimiter }}{{ .DockerHost }}{{ .Suffix }}{{ .Prefix }}%s{{ .Delimiter }}{{ .DockerCertPath }}{{ .Suffix }}{{ .Prefix }}%s{{ .Delimiter }}{{ .MinikubeDockerdProfile }}{{ .Suffix }}{{ if .NoProxyVar }}{{ .Prefix }}{{ .NoProxyVar }}{{ .Delimiter }}{{ .NoProxyValue }}{{ .Suffix }}{{end}}{{ .UsageHint }}", constants.DockerTLSVerifyEnv, constants.DockerHostEnv, constants.DockerCertPathEnv, constants.MinikubeActiveDockerdEnv)

var dockerEnvSSHTmpl = fmt.Sprintf("{{ .Prefix }}%s{{ .Delimiter }}{{ .DockerHost }}{{ .Suffix }}{{ .Prefix }}%s{{ .Delimiter }}{{ .MinikubeDockerdProfile }}{{ .Suffix }}{{ .UsageHint }}", constants.DockerHostEnv, constants.MinikubeActiveDockerdEnv)

// DockerShellConfig represents the shell config for Docker
type DockerShellConfig struct {
Expand Down Expand Up @@ -258,6 +260,12 @@ type DockerEnvConfig struct {

// dockerSetScript writes out a shell-compatible 'docker-env' script
func dockerSetScript(ec DockerEnvConfig, w io.Writer) error {
var dockerEnvTmpl string
if ec.ssh {
dockerEnvTmpl = dockerEnvSSHTmpl
} else {
dockerEnvTmpl = dockerEnvTCPTmpl
}
envVars := dockerEnvVars(ec)
return shell.SetScript(ec.EnvConfig, w, dockerEnvTmpl, dockerShellCfgSet(ec, envVars))
}
Expand Down