arno/clair
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

*: remove bzr dependency

Browse Source
This commit is contained in:
Jimmy Zelinskie 2018-07-05 19:15:47 -04:00
parent 456af5f48c
commit 5caa821c80
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -20,7 +20,7 @@ EXPOSE 6060 6061
ADD . /go/src/github.com/coreos/clair/ ADD . /go/src/github.com/coreos/clair/
WORKDIR /go/src/github.com/coreos/clair/ WORKDIR /go/src/github.com/coreos/clair/
RUN apk add --no-cache git bzr rpm xz dumb-init && \ RUN apk add --no-cache git rpm xz dumb-init && \
go install -v github.com/coreos/clair/cmd/clair && \ go install -v github.com/coreos/clair/cmd/clair && \
mv /go/bin/clair /clair && \ mv /go/bin/clair /clair && \
rm -rf /go /usr/local/go rm -rf /go /usr/local/go

2
Documentation/running-clair.md
View File

@ -87,14 +87,12 @@ To build Clair, you need to latest stable version of [Go] and a working [Go envi
In addition, Clair requires some additional binaries be installed on the system [$PATH] as runtime dependencies: In addition, Clair requires some additional binaries be installed on the system [$PATH] as runtime dependencies:
* [git] * [git]
* [bzr]
* [rpm] * [rpm]
* [xz] * [xz]
[Go]: https://github.com/golang/go/releases [Go]: https://github.com/golang/go/releases
[Go environment]: https://golang.org/doc/code.html [Go environment]: https://golang.org/doc/code.html
[git]: https://git-scm.com [git]: https://git-scm.com
[bzr]: http://bazaar.canonical.com/en
[rpm]: http://www.rpm.org [rpm]: http://www.rpm.org
[xz]: http://tukaani.org/xz [xz]: http://tukaani.org/xz
[$PATH]: https://en.wikipedia.org/wiki/PATH_(variable) [$PATH]: https://en.wikipedia.org/wiki/PATH_(variable)

2
cmd/clair/main.go
View File

@ -180,7 +180,7 @@ func main() {
flag.Parse() flag.Parse()
// Check for dependencies. // Check for dependencies.
for _, bin := range []string{"git", "bzr", "rpm", "xz"} { for _, bin := range []string{"git", "rpm", "xz"} {
_, err := exec.LookPath(bin) _, err := exec.LookPath(bin)
if err != nil { if err != nil {
log.WithError(err).WithField("dependency", bin).Fatal("failed to find dependency") log.WithError(err).WithField("dependency", bin).Fatal("failed to find dependency")