Signed-off-by: Jess Frazelle <acidburn@jessfraz.com>
This commit is contained in:
Jess Frazelle 2019-09-16 14:00:18 -07:00
parent e484e6662f
commit aaf7e424aa
No known key found for this signature in database
GPG Key ID: C0B444E6A3EFD4C1
7 changed files with 26 additions and 16 deletions

View File

@ -6,7 +6,7 @@
# -v /etc/localtime:/etc/localtime:ro \ # -v /etc/localtime:/etc/localtime:ro \
# r.j3ss.co/bcc-tools # r.j3ss.co/bcc-tools
# #
FROM debian:bullseye-slim FROM debian:sid-slim
MAINTAINER Jessica Frazelle <jess@linux.com> MAINTAINER Jessica Frazelle <jess@linux.com>
ENV PATH /usr/share/bcc/tools:$PATH ENV PATH /usr/share/bcc/tools:$PATH

View File

@ -1,4 +1,4 @@
FROM golang:latest as builder FROM golang:1.12 as builder
MAINTAINER Jessica Frazelle <jess@linux.com> MAINTAINER Jessica Frazelle <jess@linux.com>
ENV PATH /go/bin:/usr/local/go/bin:$PATH ENV PATH /go/bin:/usr/local/go/bin:$PATH
@ -29,9 +29,9 @@ RUN apt-get update && apt-get install -y \
--no-install-recommends \ --no-install-recommends \
&& rm -rf /var/lib/apt/lists/* && 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 WORKDIR /go/src/github.com/hashicorp/consul

View File

@ -1,4 +1,4 @@
FROM golang:alpine as builder FROM golang:1.12-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

@ -1,4 +1,4 @@
FROM golang:alpine as builder FROM golang:1.12-alpine as builder
MAINTAINER Jessica Frazelle <jess@linux.com> MAINTAINER Jessica Frazelle <jess@linux.com>
ENV PATH /go/bin:/usr/local/go/bin:$PATH ENV PATH /go/bin:/usr/local/go/bin:$PATH
@ -24,10 +24,10 @@ COPY *.go /go/src/k8scan/
RUN set -x \ RUN set -x \
&& go get -d . \ && go get -d . \
&& gofmt -s -l . \ && gofmt -s -l . \
&& go test ./... \
&& go vet ./... \ && go vet ./... \
&& golint ./... \ && golint ./... \
&& staticcheck ./... \ && staticcheck ./... \
&& go test ./... \
&& CGO_ENABLED=0 go build -a -tags netgo -ldflags '-w -extldflags "-static"' -o /usr/bin/k8scan *.go \ && CGO_ENABLED=0 go build -a -tags netgo -ldflags '-w -extldflags "-static"' -o /usr/bin/k8scan *.go \
&& echo "Build complete." && echo "Build complete."

View File

@ -1,4 +1,4 @@
FROM golang:alpine as builder FROM golang:1.12-alpine as builder
LABEL maintainer "Jessie Frazelle <jess@linux.com>" LABEL maintainer "Jessie Frazelle <jess@linux.com>"
RUN apk --no-cache add \ RUN apk --no-cache add \

View File

@ -1,21 +1,31 @@
FROM debian:bullseye-slim FROM ubuntu:bionic
LABEL maintainer "Jessie Frazelle <jess@linux.com>" LABEL maintainer "Jessie Frazelle <jess@linux.com>"
RUN apt-get update && apt-get install -y \ ENV DEBIAN_FRONTEND noninteractive
ca-certificates \
libc++1-7 \
--no-install-recommends \
&& rm -rf /var/lib/apt/lists/*
ENV OSQUERY_VERSION 4.0.0 RUN apt-get update && apt-get install -y \
apt-transport-https \
ca-certificates \
curl \
gnupg2 \
libc++1 \
--no-install-recommends \
&& 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.2
RUN buildDeps=' \ RUN buildDeps=' \
bison \
clang \ clang \
cmake \ cmake \
flex \
git \ git \
libc++-dev \ libc++-dev \
libc++abi-dev \ libc++abi-dev \
liblzma-dev \ liblzma-dev \
libssl-dev \
llvm \ llvm \
make \ make \
python \ python \

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.0a4 ENV TOR_VERSION 9.0a6
ENV TOR_FINGERPRINT 0x4E2C6E8793298290 ENV TOR_FINGERPRINT 0x4E2C6E8793298290
# download tor and check signature # download tor and check signature