pkg/oc/cli/admin/release/extract_tools: Fix Linux openshift-install path

wking · wking · commit 64aa61fa5cc9 · 2019-04-13T08:57:26.000-07:00
The installer Dockerfile has put the binary in /bin since openshift/install@29e4d10eb7 (images/installer: Rewrite tectonic-installer for openshift-install, 2018-09-26, openshift/installer#343). Fixes: $ oc adm release extract --command=openshift-install registry.svc.ci.openshift.org/openshift/origin-release:v4.0 error: image did not contain usr/bin/openshift-install
diff --git a/pkg/oc/cli/admin/release/extract_tools.go b/pkg/oc/cli/admin/release/extract_tools.go
@@ -89,7 +89,7 @@ func (o *ExtractOptions) extractCommand(command string) error {
 		{
 			OS:      "linux",
 			Command: "openshift-install",
-			Mapping: extract.Mapping{Image: "installer", From: "usr/bin/openshift-install"},
+			Mapping: extract.Mapping{Image: "installer", From: "bin/openshift-install"},
 
 			InjectReleaseImage: true,
 			ArchiveFormat:      "openshift-install-linux-%s.tar.gz",

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ func (o *ExtractOptions) extractCommand(command string) error {`
`89`	`89`	`{`
`90`	`90`	`OS: "linux",`
`91`	`91`	`Command: "openshift-install",`
`92`		`- Mapping: extract.Mapping{Image: "installer", From: "usr/bin/openshift-install"},`
	`92`	`+ Mapping: extract.Mapping{Image: "installer", From: "bin/openshift-install"},`
`93`	`93`
`94`	`94`	`InjectReleaseImage: true,`
`95`	`95`	`ArchiveFormat: "openshift-install-linux-%s.tar.gz",`