Skip to content

Commit

Permalink
Bump bpftrace to v0.9.4 using new bpftrace docker image
Browse files Browse the repository at this point in the history
  • Loading branch information
dalehamel authored and fntlnz committed Mar 4, 2020
1 parent 59139b3 commit 2e97e64
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ IMAGE_INITCONTAINER_LATEST := $(IMAGE_NAME_INIT):latest

IMAGE_BUILD_FLAGS ?= "--no-cache"

BPFTRACEVERSION ?= "0.9.2-1"
BPFTRACEVERSION ?= "v0.9.4"

LDFLAGS := -ldflags '-X github.com/iovisor/kubectl-trace/pkg/version.buildTime=$(shell date +%s) -X github.com/iovisor/kubectl-trace/pkg/version.gitCommit=${GIT_COMMIT} -X github.com/iovisor/kubectl-trace/pkg/cmd.ImageNameTag=${IMAGE_TRACERUNNER_COMMIT} -X github.com/iovisor/kubectl-trace/pkg/cmd.InitImageNameTag=${IMAGE_INITCONTAINER_COMMIT}'
TESTPACKAGES := $(shell go list ./... | grep -v github.com/iovisor/kubectl-trace/integration)
Expand Down
8 changes: 4 additions & 4 deletions build/Dockerfile.tracerunner
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
ARG bpftraceversion=v0.9.4
FROM quay.io/iovisor/bpftrace:$bpftraceversion as bpftrace

FROM golang:1.11.4-stretch as gobuilder

RUN apt-get update
Expand All @@ -9,11 +12,8 @@ WORKDIR /go/src/github.com/iovisor/kubectl-trace
RUN make _output/bin/trace-runner

FROM ubuntu:19.10
ARG bpftraceversion=0.9.2-1
RUN apt-get update && apt-get install -y bpftrace=${bpftraceversion} && \
rm -rf /var/lib/apt/lists/* && apt-get clean && \
rmdir /usr/src && ln -sf /usr-host/src /usr/src

COPY --from=gobuilder /go/src/github.com/iovisor/kubectl-trace/_output/bin/trace-runner /bin/trace-runner
COPY --from=bpftrace /usr/bin/bpftrace /usr/bin/bpftrace

ENTRYPOINT ["/bin/trace-runner"]

0 comments on commit 2e97e64

Please sign in to comment.