From 0cb9e81816884a8c8b498c6d612a353724117baa Mon Sep 17 00:00:00 2001 From: Jess Frazelle Date: Thu, 5 Dec 2019 17:14:28 -0800 Subject: [PATCH] update Signed-off-by: Jess Frazelle --- clair/Dockerfile | 12 ++++++++++-- coredns/Dockerfile | 2 +- latest-versions.sh | 1 + tor-browser/alpha/Dockerfile | 2 +- tor-browser/stable/Dockerfile | 2 +- virtualbox/Dockerfile | 2 +- 6 files changed, 15 insertions(+), 6 deletions(-) diff --git a/clair/Dockerfile b/clair/Dockerfile index e4f6c82..601fdc5 100644 --- a/clair/Dockerfile +++ b/clair/Dockerfile @@ -7,7 +7,15 @@ RUN apk --no-cache add \ ENV PATH /go/bin:/usr/local/go/bin:$PATH 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 @@ -17,6 +25,6 @@ RUN apk --no-cache add \ rpm \ 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" ] diff --git a/coredns/Dockerfile b/coredns/Dockerfile index b41ecd0..266d972 100644 --- a/coredns/Dockerfile +++ b/coredns/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.12-alpine as builder +FROM golang:alpine as builder LABEL maintainer "Jessie Frazelle " ENV PATH /go/bin:/usr/local/go/bin:$PATH diff --git a/latest-versions.sh b/latest-versions.sh index 1ed91b8..1220c13 100755 --- a/latest-versions.sh +++ b/latest-versions.sh @@ -105,6 +105,7 @@ iovisor/bpftrace browsh-org/browsh certbot/certbot cloudflare/cfssl +quay/clair hashicorp/consul coredns/coredns CouchPotato/CouchPotatoServer diff --git a/tor-browser/alpha/Dockerfile b/tor-browser/alpha/Dockerfile index 142057a..f5e1ea6 100644 --- a/tor-browser/alpha/Dockerfile +++ b/tor-browser/alpha/Dockerfile @@ -33,7 +33,7 @@ RUN useradd --create-home --home-dir $HOME user \ ENV LANG C.UTF-8 # https://www.torproject.org/download/alpha/ -ENV TOR_VERSION 9.0a6 +ENV TOR_VERSION 9.5a3 ENV TOR_FINGERPRINT 0x4E2C6E8793298290 # download tor and check signature diff --git a/tor-browser/stable/Dockerfile b/tor-browser/stable/Dockerfile index 6427bdb..8d9413c 100644 --- a/tor-browser/stable/Dockerfile +++ b/tor-browser/stable/Dockerfile @@ -33,7 +33,7 @@ RUN useradd --create-home --home-dir $HOME user \ ENV LANG C.UTF-8 # https://www.torproject.org/projects/torbrowser.html.en -ENV TOR_VERSION 8.5.5 +ENV TOR_VERSION 9.0.2 ENV TOR_FINGERPRINT 0x4E2C6E8793298290 # download tor and check signature diff --git a/virtualbox/Dockerfile b/virtualbox/Dockerfile index 22ba53f..b5e815c 100644 --- a/virtualbox/Dockerfile +++ b/virtualbox/Dockerfile @@ -35,7 +35,7 @@ ENV DEBIAN_FRONTEND noninteractive RUN apt-get update && apt-get install -y \ libcurl4 \ - libvpx5 \ + libvpx6 \ procps \ --no-install-recommends \ && rm -rf /var/lib/apt/lists/*