Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
Signed-off-by: Jess Frazelle <[email protected]>
  • Loading branch information
jessfraz committed Dec 6, 2019
1 parent aa667a3 commit 0cb9e81
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 6 deletions.
12 changes: 10 additions & 2 deletions clair/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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" ]
2 changes: 1 addition & 1 deletion coredns/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.12-alpine as builder
FROM golang:alpine as builder
LABEL maintainer "Jessie Frazelle <[email protected]>"

ENV PATH /go/bin:/usr/local/go/bin:$PATH
Expand Down
1 change: 1 addition & 0 deletions latest-versions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ iovisor/bpftrace
browsh-org/browsh
certbot/certbot
cloudflare/cfssl
quay/clair
hashicorp/consul
coredns/coredns
CouchPotato/CouchPotatoServer
Expand Down
2 changes: 1 addition & 1 deletion tor-browser/alpha/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tor-browser/stable/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion virtualbox/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/*
Expand Down

0 comments on commit 0cb9e81

Please sign in to comment.