Signed-off-by: Jess Frazelle <acidburn@jessfraz.com>
This commit is contained in:
Jess Frazelle 2019-12-05 17:14:28 -08:00
parent aa667a3a56
commit 0cb9e81816
No known key found for this signature in database
GPG Key ID: E34EC3D4E4953C4A
6 changed files with 15 additions and 6 deletions

View File

@ -7,7 +7,15 @@ RUN apk --no-cache add \
ENV PATH /go/bin:/usr/local/go/bin:$PATH ENV PATH /go/bin:/usr/local/go/bin:$PATH
ENV GOPATH /go ENV GOPATH /go
RUN go get github.com/coreos/clair/cmd/clair RUN go get github.com/quay/clair/cmd/clair || true
ENV CLAIR_VERSION v2.1.1
WORKDIR /go/src/github.com/quay/clair
RUN git checkout "${CLAIR_VERSION}"
RUN make build
FROM alpine:latest FROM alpine:latest
@ -17,6 +25,6 @@ RUN apk --no-cache add \
rpm \ rpm \
xz xz
COPY --from=builder /go/bin/clair /usr/bin/clair COPY --from=builder /go/src/github.com/coreos/clair/cmd/clair /usr/bin/clair
ENTRYPOINT [ "clair" ] ENTRYPOINT [ "clair" ]

View File

@ -1,4 +1,4 @@
FROM golang:1.12-alpine as builder FROM golang:alpine as builder
LABEL maintainer "Jessie Frazelle <jess@linux.com>" LABEL maintainer "Jessie Frazelle <jess@linux.com>"
ENV PATH /go/bin:/usr/local/go/bin:$PATH ENV PATH /go/bin:/usr/local/go/bin:$PATH

View File

@ -105,6 +105,7 @@ iovisor/bpftrace
browsh-org/browsh browsh-org/browsh
certbot/certbot certbot/certbot
cloudflare/cfssl cloudflare/cfssl
quay/clair
hashicorp/consul hashicorp/consul
coredns/coredns coredns/coredns
CouchPotato/CouchPotatoServer CouchPotato/CouchPotatoServer

View File

@ -33,7 +33,7 @@ RUN useradd --create-home --home-dir $HOME user \
ENV LANG C.UTF-8 ENV LANG C.UTF-8
# https://www.torproject.org/download/alpha/ # https://www.torproject.org/download/alpha/
ENV TOR_VERSION 9.0a6 ENV TOR_VERSION 9.5a3
ENV TOR_FINGERPRINT 0x4E2C6E8793298290 ENV TOR_FINGERPRINT 0x4E2C6E8793298290
# download tor and check signature # download tor and check signature

View File

@ -33,7 +33,7 @@ RUN useradd --create-home --home-dir $HOME user \
ENV LANG C.UTF-8 ENV LANG C.UTF-8
# https://www.torproject.org/projects/torbrowser.html.en # https://www.torproject.org/projects/torbrowser.html.en
ENV TOR_VERSION 8.5.5 ENV TOR_VERSION 9.0.2
ENV TOR_FINGERPRINT 0x4E2C6E8793298290 ENV TOR_FINGERPRINT 0x4E2C6E8793298290
# download tor and check signature # download tor and check signature

View File

@ -35,7 +35,7 @@ ENV DEBIAN_FRONTEND noninteractive
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
libcurl4 \ libcurl4 \
libvpx5 \ libvpx6 \
procps \ procps \
--no-install-recommends \ --no-install-recommends \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*