Merge pull request #228 from vrothberg/rpm-entrypoint-fix

nkubala · web-flow · commit b5c0512bed00 · 2018-05-09T13:33:06.000-07:00
rpm differ: use entrypoint for execution
diff --git a/differs/rpm_diff.go b/differs/rpm_diff.go
@@ -154,8 +154,8 @@ func rpmDataFromContainer(image pkgutil.Image) (map[string]util.PackageInfo, err
 	}
 
 	contConf := godocker.Config{
-		Cmd:   []string{"rpm", "--nodigest", "--nosignature", "-qa", "--qf", "%{NAME}\t%{VERSION}\t%{SIZE}\n"},
-		Image: imageName,
+		Entrypoint: []string{"rpm", "--nodigest", "--nosignature", "-qa", "--qf", "%{NAME}\t%{VERSION}\t%{SIZE}\n"},
+		Image:      imageName,
 	}
 
 	hostConf := godocker.HostConfig{

Original file line number	Diff line number	Diff line change
`@@ -154,8 +154,8 @@ func rpmDataFromContainer(image pkgutil.Image) (map[string]util.PackageInfo, err`
`154`	`154`	`}`
`155`	`155`
`156`	`156`	`contConf := godocker.Config{`
`157`		`- Cmd: []string{"rpm", "--nodigest", "--nosignature", "-qa", "--qf", "%{NAME}\t%{VERSION}\t%{SIZE}\n"},`
`158`		`- Image: imageName,`
	`157`	`+ Entrypoint: []string{"rpm", "--nodigest", "--nosignature", "-qa", "--qf", "%{NAME}\t%{VERSION}\t%{SIZE}\n"},`
	`158`	`+ Image: imageName,`
`159`	`159`	`}`
`160`	`160`
`161`	`161`	`hostConf := godocker.HostConfig{`