From 63bff5a797ce7d802bd2dab8b5df683e06db76a0 Mon Sep 17 00:00:00 2001 From: Jess Frazelle Date: Thu, 5 Dec 2019 17:29:13 -0800 Subject: [PATCH] update Signed-off-by: Jess Frazelle --- bcc-tools/Dockerfile | 2 +- clair/Dockerfile | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/bcc-tools/Dockerfile b/bcc-tools/Dockerfile index b500913..ea90cd0 100644 --- a/bcc-tools/Dockerfile +++ b/bcc-tools/Dockerfile @@ -39,7 +39,7 @@ RUN apt-get update && apt-get install -y \ clang-format \ python \ python-netaddr \ - python-pyroute2 \ + python3-pyroute2 \ luajit \ libluajit-5.1-dev \ arping \ diff --git a/clair/Dockerfile b/clair/Dockerfile index 601fdc5..979b91e 100644 --- a/clair/Dockerfile +++ b/clair/Dockerfile @@ -2,7 +2,8 @@ FROM golang:alpine as builder RUN apk --no-cache add \ ca-certificates \ - git + git \ + make ENV PATH /go/bin:/usr/local/go/bin:$PATH ENV GOPATH /go @@ -15,7 +16,7 @@ WORKDIR /go/src/github.com/quay/clair RUN git checkout "${CLAIR_VERSION}" -RUN make build +RUN go install ./cmd/clair FROM alpine:latest @@ -25,6 +26,6 @@ RUN apk --no-cache add \ rpm \ xz -COPY --from=builder /go/src/github.com/coreos/clair/cmd/clair /usr/bin/clair +COPY --from=builder /go/bin/clair /usr/bin/clair ENTRYPOINT [ "clair" ]