From dfbd549af63ea9b51f4c17eb10ff45b2ce1eab1c Mon Sep 17 00:00:00 2001 From: Dale Hamel Date: Fri, 16 Aug 2019 00:51:34 -0400 Subject: [PATCH] Move to ubuntu eaon for bpftrace 0.9.2 --- Makefile | 21 +------------- build/Dockerfile.bpftracebase-alpine | 43 ---------------------------- build/Dockerfile.bpftracebase-ubuntu | 27 ----------------- build/Dockerfile.tracerunner | 18 ++++++++++++ build/Dockerfile.tracerunner-alpine | 22 -------------- build/Dockerfile.tracerunner-ubuntu | 25 ---------------- build/sources.list | 8 ------ 7 files changed, 19 insertions(+), 145 deletions(-) delete mode 100644 build/Dockerfile.bpftracebase-alpine delete mode 100644 build/Dockerfile.bpftracebase-ubuntu create mode 100644 build/Dockerfile.tracerunner delete mode 100644 build/Dockerfile.tracerunner-alpine delete mode 100644 build/Dockerfile.tracerunner-ubuntu delete mode 100644 build/sources.list diff --git a/Makefile b/Makefile index 441d5756..52682575 100644 --- a/Makefile +++ b/Makefile @@ -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 \ @@ -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) diff --git a/build/Dockerfile.bpftracebase-alpine b/build/Dockerfile.bpftracebase-alpine deleted file mode 100644 index 64bef001..00000000 --- a/build/Dockerfile.bpftracebase-alpine +++ /dev/null @@ -1,43 +0,0 @@ -FROM alpine:3.8 as builder -ARG bpftracesha -ARG bccversion -ENV STATIC_LINKING=ON -ENV RUN_TESTS=0 -RUN apk add --update \ - bison \ - build-base \ - clang-dev \ - clang-static \ - curl \ - cmake \ - elfutils-dev \ - flex-dev \ - git \ - linux-headers \ - llvm5-dev \ - llvm5-static \ - python \ - zlib-dev - -# Put LLVM directories where CMake expects them to be -RUN ln -s /usr/lib/cmake/llvm5 /usr/lib/cmake/llvm -RUN ln -s /usr/include/llvm5/llvm /usr/include/llvm -RUN ln -s /usr/include/llvm5/llvm-c /usr/include/llvm-c - -WORKDIR / -RUN curl -L https://github.com/iovisor/bcc/archive/v${bccversion}.tar.gz \ - --output /bcc.tar.gz -RUN tar xvf /bcc.tar.gz -RUN mv bcc-${bccversion} bcc -RUN cd /bcc && mkdir build && cd build && cmake .. && make install -j4 && \ - cp src/cc/libbcc.a /usr/local/lib64/libbcc.a && \ - cp src/cc/libbcc-loader-static.a /usr/local/lib64/libbcc-loader-static.a && \ - cp src/cc/libbpf.a /usr/local/lib64/libbpf.a - -RUN git clone https://github.com/iovisor/bpftrace /bpftrace && cd /bpftrace && git checkout ${bpftracesha} - -WORKDIR /bpftrace - -WORKDIR /bpftrace/docker - -RUN sh build.sh /bpftrace/build-release Release bpftrace diff --git a/build/Dockerfile.bpftracebase-ubuntu b/build/Dockerfile.bpftracebase-ubuntu deleted file mode 100644 index c0413305..00000000 --- a/build/Dockerfile.bpftracebase-ubuntu +++ /dev/null @@ -1,27 +0,0 @@ -FROM ubuntu:18.04 as builder -ARG bpftracesha -ENV RUN_TESTS=0 - -RUN apt-get update && apt-get install -y wget gnupg && apt-get clean - -RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - -COPY build/sources.list /etc/apt/sources.list.d/llvm.list - -RUN wget -O - https://repo.iovisor.org/GPG-KEY | apt-key add - -RUN echo "deb https://repo.iovisor.org/apt/bionic bionic main" > /etc/apt/sources.list.d/iovisor.list - -RUN apt-get update - -RUN apt-get install -y bison cmake flex g++ git libelf-dev zlib1g-dev libfl-dev -RUN apt-get install -y clang-5.0 libclang-5.0-dev libclang-common-5.0-dev libclang1-5.0 libllvm5.0 llvm-5.0 llvm-5.0-dev llvm-5.0-runtime -RUN apt-get install -y libbcc=0.9.0-1 - -RUN git clone https://github.com/iovisor/bpftrace /bpftrace && cd /bpftrace && git checkout ${bpftracesha} - -RUN mkdir /bpftrace/build - -WORKDIR /bpftrace/build - -RUN cmake -DCMAKE_BUILD_TYPE=DEBUG -DCMAKE_INSTALL_PREFIX=/usr/local/bpftrace .. -RUN make -j9 -RUN make install diff --git a/build/Dockerfile.tracerunner b/build/Dockerfile.tracerunner new file mode 100644 index 00000000..ca2f63a8 --- /dev/null +++ b/build/Dockerfile.tracerunner @@ -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"] diff --git a/build/Dockerfile.tracerunner-alpine b/build/Dockerfile.tracerunner-alpine deleted file mode 100644 index 70a4609d..00000000 --- a/build/Dockerfile.tracerunner-alpine +++ /dev/null @@ -1,22 +0,0 @@ -ARG bpftracesha -ARG imagenamebase - -FROM ${imagenamebase}:${bpftracesha} as bpftrace -FROM golang:1.11.4-alpine3.8 as gobuilder - -RUN apk update -RUN apk add 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 alpine:3.8 - -RUN mkdir /lib64 && ln -s /lib/libc.musl-x86_64.so.1 /lib64/ld-linux-x86-64.so.2 -COPY --from=bpftrace /bpftrace/build-release/src/bpftrace /bin/bpftrace -COPY --from=gobuilder /go/src/github.com/iovisor/kubectl-trace/_output/bin/trace-runner /bin/trace-runner - -ENTRYPOINT ["/bin/trace-runner"] - diff --git a/build/Dockerfile.tracerunner-ubuntu b/build/Dockerfile.tracerunner-ubuntu deleted file mode 100644 index 4eb33466..00000000 --- a/build/Dockerfile.tracerunner-ubuntu +++ /dev/null @@ -1,25 +0,0 @@ -ARG bpftracesha -ARG imagenamebase - -FROM ${imagenamebase}:${bpftracesha} as bpftrace -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:18.04 - -RUN apt-get update && apt-get install -y wget gnupg && \ - echo "deb https://repo.iovisor.org/apt/bionic bionic main" > /etc/apt/sources.list.d/iovisor.list && \ - wget -O - https://repo.iovisor.org/GPG-KEY | apt-key add - && \ - apt-get update && apt-get install -y libbcc=0.9.0-1 libclang1-5.0 libllvm5.0 && rm -rf /var/lib/apt/lists/* && apt-get clean - -COPY --from=bpftrace /usr/local/bpftrace/bin/bpftrace /bin/bpftrace -COPY --from=gobuilder /go/src/github.com/iovisor/kubectl-trace/_output/bin/trace-runner /bin/trace-runner - -ENTRYPOINT ["/bin/trace-runner"] diff --git a/build/sources.list b/build/sources.list deleted file mode 100644 index 847ebcb1..00000000 --- a/build/sources.list +++ /dev/null @@ -1,8 +0,0 @@ -deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial main -deb-src http://apt.llvm.org/xenial/ llvm-toolchain-xenial main -# 5.0 -deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-5.0 main -deb-src http://apt.llvm.org/xenial/ llvm-toolchain-xenial-5.0 main -# 6.0 -deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-6.0 main -deb-src http://apt.llvm.org/xenial/ llvm-toolchain-xenial-6.0 main