@@ -70,7 +70,7 @@ var podmanUnset bool
70
70
// podmanShellCfgSet generates context variables for "podman-env"
71
71
func podmanShellCfgSet (ec PodmanEnvConfig , envMap map [string ]string ) * PodmanShellConfig {
72
72
profile := ec .profile
73
- const usgPlz = "To point your shell to minikube's podman docker -compatible service, run:"
73
+ const usgPlz = "To point your shell to minikube's Podman Docker -compatible service, run:"
74
74
usgCmd := fmt .Sprintf ("minikube -p %s podman-env" , profile )
75
75
s := & PodmanShellConfig {
76
76
Config : * shell .CfgSet (ec .EnvConfig , usgPlz , usgCmd ),
@@ -86,20 +86,13 @@ func podmanShellCfgSet(ec PodmanEnvConfig, envMap map[string]string) *PodmanShel
86
86
return s
87
87
}
88
88
89
- // isPodmanAvailable checks if podman command is available
90
- func isPodmanAvailable (r command.Runner ) bool {
91
- if _ , err := r .RunCmd (exec .Command ("which" , "podman" )); err != nil {
92
- return false
93
- }
94
-
95
- return true
96
- }
97
89
98
90
// podmanEnvCmd represents the podman-env command
99
91
var podmanEnvCmd = & cobra.Command {
100
92
Use : "podman-env" ,
101
- Short : "Configure environment to use minikube's Podman service" ,
102
- Long : `Sets up Docker client env variables to use minikube's Podman Docker-compatible service.` ,
93
+ Short : "Configure environment to use minikube's Podman Docker-compatible service" ,
94
+ Long : `Sets up Docker client env variables to use minikube's Podman Docker-compatible service.
95
+ Uses Docker client against Podman's Docker API compatibility - no podman binary required.` ,
103
96
Run : func (_ * cobra.Command , _ []string ) {
104
97
sh := shell.EnvConfig {
105
98
Shell : shell .ForceShell ,
@@ -136,14 +129,11 @@ var podmanEnvCmd = &cobra.Command{
136
129
}
137
130
138
131
r := co .CP .Runner
139
- if ok := isPodmanAvailable (r ); ! ok {
140
- exit .Message (reason .EnvPodmanUnavailable , `The podman service within '{{.cluster}}' is not active` , out.V {"cluster" : cname })
141
- }
142
132
143
133
d := co .CP .Host .Driver
144
134
hostIP := co .CP .IP .String ()
145
135
146
- // Use Docker API compatibility - podman supports Docker API on port 2376
136
+ // Use Docker API compatibility - Docker client connects to Docker-compatible API
147
137
port := constants .DockerDaemonPort
148
138
noProxy := false
149
139
0 commit comments