Skip to content

Commit 2e97e64

Browse files
dalehamelfntlnz
authored andcommitted
Bump bpftrace to v0.9.4 using new bpftrace docker image
1 parent 59139b3 commit 2e97e64

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ IMAGE_INITCONTAINER_LATEST := $(IMAGE_NAME_INIT):latest
2020

2121
IMAGE_BUILD_FLAGS ?= "--no-cache"
2222

23-
BPFTRACEVERSION ?= "0.9.2-1"
23+
BPFTRACEVERSION ?= "v0.9.4"
2424

2525
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}'
2626
TESTPACKAGES := $(shell go list ./... | grep -v github.com/iovisor/kubectl-trace/integration)

build/Dockerfile.tracerunner

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
ARG bpftraceversion=v0.9.4
2+
FROM quay.io/iovisor/bpftrace:$bpftraceversion as bpftrace
3+
14
FROM golang:1.11.4-stretch as gobuilder
25

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

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

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

1919
ENTRYPOINT ["/bin/trace-runner"]

0 commit comments

Comments
 (0)