Skip to content

Commit

Permalink
Fix rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
mbussolotto authored and admd committed May 23, 2024
1 parent 1d9b886 commit af89809
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions mgrpxy/shared/podman/podman.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ func GenerateSystemdService(httpdImage string, saltBrokerImage string, squidImag
dataPod := templates.PodTemplateData{
Ports: ports,
HttpProxyFile: httpProxyConfig,
Args: strings.Join(flags.Podman.Args, " "),
Network: podman.UyuniNetwork,
}
podEnv := fmt.Sprintf(`Environment="PODMAN_EXTRA_ARGS=%s"`, strings.Join(flags.Podman.Args, " "))
Expand Down Expand Up @@ -154,7 +153,7 @@ func getHttpProxyConfig() string {
// GetContainerImage returns a proxy image URL.
func GetContainerImage(flags *utils.ProxyImageFlags, name string) (string, error) {
image := flags.GetContainerImage(name)
inspectedHostValues, err := shared_utils.InspectHost(false)
inspectedHostValues, err := shared_utils.InspectHost(true)
if err != nil {
return "", shared_utils.Errorf(err, L("cannot inspect host values"))
}
Expand Down Expand Up @@ -227,7 +226,7 @@ func Upgrade(globalFlags *types.GlobalFlags, flags *PodmanProxyFlags, cmd *cobra

func getContainerImage(flags *utils.ProxyImageFlags, name string) (string, error) {
image := flags.GetContainerImage(name)
inspectedHostValues, err := shared_utils.InspectHost(false)
inspectedHostValues, err := shared_utils.InspectHost(true)
if err != nil {
return "", shared_utils.Errorf(err, L("cannot inspect host values"))
}
Expand Down

0 comments on commit af89809

Please sign in to comment.