Skip to content

Commit 7434747

Browse files
committed
Move to ubuntu eaon for bpftrace 0.9.2
1 parent 3d13a58 commit 7434747

6 files changed

+19
-102
lines changed

Makefile

+1-20
Original file line numberDiff line numberDiff line change
@@ -39,26 +39,6 @@ ${trace_runner}:
3939
clean:
4040
rm -Rf _output
4141

42-
.PHONY: image/build-alpine
43-
image/build-alpine:
44-
$(DOCKER) build \
45-
--build-arg bpftracesha=$(BPFTRACESHA) \
46-
--build-arg imagenamebase="$(IMAGE_NAME_BASE_ALPINE)" \
47-
$(IMAGE_BUILD_FLAGS) \
48-
-t "$(IMAGE_TRACERUNNER_BRANCH_ALPINE)" \
49-
-f build/Dockerfile.tracerunner-alpine .
50-
$(DOCKER) tag "$(IMAGE_TRACERUNNER_BRANCH_ALPINE)" $(IMAGE_TRACERUNNER_COMMIT_ALPINE)
51-
52-
.PHONY: image/build-ubuntu
53-
image/build-ubuntu:
54-
$(DOCKER) build \
55-
--build-arg bpftracesha=$(BPFTRACESHA) \
56-
--build-arg imagenamebase="$(IMAGE_NAME_BASE_UBUNTU)" \
57-
$(IMAGE_BUILD_FLAGS) \
58-
-t "$(IMAGE_TRACERUNNER_BRANCH_UBUNTU)" \
59-
-f build/Dockerfile.tracerunner-ubuntu .
60-
$(DOCKER) tag $(IMAGE_TRACERUNNER_BRANCH_UBUNTU) $(IMAGE_TRACERUNNER_COMMIT_UBUNTU)
61-
6242
.PHONY: image/build-init
6343
image/build-init:
6444
$(DOCKER) build \
@@ -76,6 +56,7 @@ image/build:
7656
$(DOCKER) tag $(IMAGE_TRACERUNNER_BRANCH) $(IMAGE_TRACERUNNER_COMMIT)
7757
$(DOCKER) tag "$(IMAGE_TRACERUNNER_BRANCH)" $(IMAGE_TRACERUNNER_BRANCH)
7858

59+
7960
.PHONY: image/push
8061
image/push:
8162
$(DOCKER) push $(IMAGE_TRACERUNNER_BRANCH)

build/Dockerfile.bpftracebase-ubuntu

-27
This file was deleted.

build/Dockerfile.tracerunner

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
FROM golang:1.11.4-stretch as gobuilder
2+
3+
RUN apt-get update
4+
RUN apt-get install -y make bash git
5+
6+
ADD . /go/src/github.com/iovisor/kubectl-trace
7+
WORKDIR /go/src/github.com/iovisor/kubectl-trace
8+
9+
RUN make _output/bin/trace-runner
10+
11+
FROM ubuntu:19.10
12+
13+
RUN apt-get update && apt-get install -y bpftrace && \
14+
rm -rf /var/lib/apt/lists/* && apt-get clean
15+
16+
COPY --from=gobuilder /go/src/github.com/iovisor/kubectl-trace/_output/bin/trace-runner /bin/trace-runner
17+
18+
ENTRYPOINT ["/bin/trace-runner"]

build/Dockerfile.tracerunner-alpine

-22
This file was deleted.

build/Dockerfile.tracerunner-ubuntu

-25
This file was deleted.

build/sources.list

-8
This file was deleted.

0 commit comments

Comments
 (0)