Merge pull request #284 from benluddy/fix-podman-panic

ecordell · web-flow · commit 8a8da5b42668 · 2020-04-17T12:13:01.000-04:00
Fix panic in AddToRegistry when using podman.
diff --git a/pkg/lib/registry/registry.go b/pkg/lib/registry/registry.go
@@ -77,6 +77,7 @@ func (r RegistryUpdater) AddToRegistry(request AddToRegistryRequest) error {
 	case containertools.NoneTool:
 		reg, rerr = containerdregistry.NewRegistry(containerdregistry.SkipTLS(request.SkipTLS), containerdregistry.WithRootCAs(rootCAs))
 	case containertools.PodmanTool:
+		fallthrough
 	case containertools.DockerTool:
 		reg, rerr = execregistry.NewRegistry(request.ContainerTool, r.Logger)
 	}

Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,7 @@ func (r RegistryUpdater) AddToRegistry(request AddToRegistryRequest) error {`
`77`	`77`	`case containertools.NoneTool:`
`78`	`78`	`reg, rerr = containerdregistry.NewRegistry(containerdregistry.SkipTLS(request.SkipTLS), containerdregistry.WithRootCAs(rootCAs))`
`79`	`79`	`case containertools.PodmanTool:`
	`80`	`+ fallthrough`
`80`	`81`	`case containertools.DockerTool:`
`81`	`82`	`reg, rerr = execregistry.NewRegistry(request.ContainerTool, r.Logger)`
`82`	`83`	`}`