Skip to content

Commit

Permalink
Move to ubuntu eaon for bpftrace 0.9.2
Browse files Browse the repository at this point in the history
  • Loading branch information
dalehamel authored and leodido committed Aug 31, 2019
1 parent 0c0d587 commit dfbd549
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 145 deletions.
21 changes: 1 addition & 20 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -39,26 +39,6 @@ ${trace_runner}:
clean:
rm -Rf _output

.PHONY: image/build-alpine
image/build-alpine:
$(DOCKER) build \
--build-arg bpftracesha=$(BPFTRACESHA) \
--build-arg imagenamebase="$(IMAGE_NAME_BASE_ALPINE)" \
$(IMAGE_BUILD_FLAGS) \
-t "$(IMAGE_TRACERUNNER_BRANCH_ALPINE)" \
-f build/Dockerfile.tracerunner-alpine .
$(DOCKER) tag "$(IMAGE_TRACERUNNER_BRANCH_ALPINE)" $(IMAGE_TRACERUNNER_COMMIT_ALPINE)

.PHONY: image/build-ubuntu
image/build-ubuntu:
$(DOCKER) build \
--build-arg bpftracesha=$(BPFTRACESHA) \
--build-arg imagenamebase="$(IMAGE_NAME_BASE_UBUNTU)" \
$(IMAGE_BUILD_FLAGS) \
-t "$(IMAGE_TRACERUNNER_BRANCH_UBUNTU)" \
-f build/Dockerfile.tracerunner-ubuntu .
$(DOCKER) tag $(IMAGE_TRACERUNNER_BRANCH_UBUNTU) $(IMAGE_TRACERUNNER_COMMIT_UBUNTU)

.PHONY: image/build-init
image/build-init:
$(DOCKER) build \
Expand All @@ -76,6 +56,7 @@ image/build:
$(DOCKER) tag $(IMAGE_TRACERUNNER_BRANCH) $(IMAGE_TRACERUNNER_COMMIT)
$(DOCKER) tag "$(IMAGE_TRACERUNNER_BRANCH)" $(IMAGE_TRACERUNNER_BRANCH)


.PHONY: image/push
image/push:
$(DOCKER) push $(IMAGE_TRACERUNNER_BRANCH)
Expand Down
43 changes: 0 additions & 43 deletions build/Dockerfile.bpftracebase-alpine

This file was deleted.

27 changes: 0 additions & 27 deletions build/Dockerfile.bpftracebase-ubuntu

This file was deleted.

18 changes: 18 additions & 0 deletions build/Dockerfile.tracerunner
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
FROM golang:1.11.4-stretch as gobuilder

RUN apt-get update
RUN apt-get install -y make bash git

ADD . /go/src/github.com/iovisor/kubectl-trace
WORKDIR /go/src/github.com/iovisor/kubectl-trace

RUN make _output/bin/trace-runner

FROM ubuntu:19.10

RUN apt-get update && apt-get install -y bpftrace && \
rm -rf /var/lib/apt/lists/* && apt-get clean

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

ENTRYPOINT ["/bin/trace-runner"]
22 changes: 0 additions & 22 deletions build/Dockerfile.tracerunner-alpine

This file was deleted.

25 changes: 0 additions & 25 deletions build/Dockerfile.tracerunner-ubuntu

This file was deleted.

8 changes: 0 additions & 8 deletions build/sources.list

This file was deleted.

0 comments on commit dfbd549

Please sign in to comment.