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 Sep 16, 2019
1 parent e484e66 commit aaf7e42
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 13 deletions.
2 changes: 1 addition & 1 deletion bcc-tools/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# -v /etc/localtime:/etc/localtime:ro \
# r.j3ss.co/bcc-tools
#
FROM debian:bullseye-slim
FROM debian:sid-slim
MAINTAINER Jessica Frazelle <[email protected]>

ENV PATH /usr/share/bcc/tools:$PATH
Expand Down
6 changes: 3 additions & 3 deletions consul/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:latest as builder
FROM golang:1.12 as builder
MAINTAINER Jessica Frazelle <[email protected]>

ENV PATH /go/bin:/usr/local/go/bin:$PATH
Expand Down Expand Up @@ -29,9 +29,9 @@ RUN apt-get update && apt-get install -y \
--no-install-recommends \
&& rm -rf /var/lib/apt/lists/*

ENV CONSUL_VERSION v1.6.0-beta2
ENV CONSUL_VERSION v1.6.1

RUN go get github.com/hashicorp/consul
RUN go get github.com/hashicorp/consul || true

WORKDIR /go/src/github.com/hashicorp/consul

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

ENV PATH /go/bin:/usr/local/go/bin:$PATH
Expand Down
4 changes: 2 additions & 2 deletions k8scan/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:alpine as builder
FROM golang:1.12-alpine as builder
MAINTAINER Jessica Frazelle <[email protected]>

ENV PATH /go/bin:/usr/local/go/bin:$PATH
Expand All @@ -24,10 +24,10 @@ COPY *.go /go/src/k8scan/
RUN set -x \
&& go get -d . \
&& gofmt -s -l . \
&& go test ./... \
&& go vet ./... \
&& golint ./... \
&& staticcheck ./... \
&& go test ./... \
&& CGO_ENABLED=0 go build -a -tags netgo -ldflags '-w -extldflags "-static"' -o /usr/bin/k8scan *.go \
&& echo "Build complete."

Expand Down
2 changes: 1 addition & 1 deletion oauth2-proxy/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:alpine as builder
FROM golang:1.12-alpine as builder
LABEL maintainer "Jessie Frazelle <[email protected]>"

RUN apk --no-cache add \
Expand Down
18 changes: 14 additions & 4 deletions osquery/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,21 +1,31 @@
FROM debian:bullseye-slim
FROM ubuntu:bionic
LABEL maintainer "Jessie Frazelle <[email protected]>"

ENV DEBIAN_FRONTEND noninteractive

RUN apt-get update && apt-get install -y \
apt-transport-https \
ca-certificates \
libc++1-7 \
curl \
gnupg2 \
libc++1 \
--no-install-recommends \
&& rm -rf /var/lib/apt/lists/*
&& rm -rf /var/lib/apt/lists/* \
&& curl -sSL https://apt.kitware.com/keys/kitware-archive-latest.asc | apt-key add - \
&& echo 'deb https://apt.kitware.com/ubuntu/ bionic main' > /etc/apt/sources.list.d/cmake.list

ENV OSQUERY_VERSION 4.0.0
ENV OSQUERY_VERSION 4.0.2

RUN buildDeps=' \
bison \
clang \
cmake \
flex \
git \
libc++-dev \
libc++abi-dev \
liblzma-dev \
libssl-dev \
llvm \
make \
python \
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.0a4
ENV TOR_VERSION 9.0a6
ENV TOR_FINGERPRINT 0x4E2C6E8793298290

# download tor and check signature
Expand Down

0 comments on commit aaf7e42

Please sign in to comment.