From 5caa821c80a4efa2986728d6f223552b44f6ce15 Mon Sep 17 00:00:00 2001 From: Jimmy Zelinskie Date: Thu, 5 Jul 2018 19:15:47 -0400 Subject: [PATCH] *: remove bzr dependency --- Dockerfile | 2 +- Documentation/running-clair.md | 2 -- cmd/clair/main.go | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 112bc42c..cebc06c6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,7 @@ EXPOSE 6060 6061 ADD . /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 && \ mv /go/bin/clair /clair && \ rm -rf /go /usr/local/go diff --git a/Documentation/running-clair.md b/Documentation/running-clair.md index 32212d01..500d115c 100644 --- a/Documentation/running-clair.md +++ b/Documentation/running-clair.md @@ -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: * [git] -* [bzr] * [rpm] * [xz] [Go]: https://github.com/golang/go/releases [Go environment]: https://golang.org/doc/code.html [git]: https://git-scm.com -[bzr]: http://bazaar.canonical.com/en [rpm]: http://www.rpm.org [xz]: http://tukaani.org/xz [$PATH]: https://en.wikipedia.org/wiki/PATH_(variable) diff --git a/cmd/clair/main.go b/cmd/clair/main.go index e802cbbd..dbb360a8 100644 --- a/cmd/clair/main.go +++ b/cmd/clair/main.go @@ -180,7 +180,7 @@ func main() { flag.Parse() // Check for dependencies. - for _, bin := range []string{"git", "bzr", "rpm", "xz"} { + for _, bin := range []string{"git", "rpm", "xz"} { _, err := exec.LookPath(bin) if err != nil { log.WithError(err).WithField("dependency", bin).Fatal("failed to find dependency")