Skip to content

Commit a62df10

Browse files
committed
WIP ubuntu image build
1 parent fc5d82c commit a62df10

File tree

4 files changed

+65
-1
lines changed

4 files changed

+65
-1
lines changed

build/Dockerfile.bpftracebase-ubuntu

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
FROM ubuntu:18.04 as builder
2+
ARG bpftracesha
3+
ENV STATIC_LINKING=ON
4+
ENV RUN_TESTS=0
5+
6+
RUN apt-get update && apt-get install -y wget gnupg && apt-get clean
7+
8+
RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
9+
COPY build/sources.list /etc/apt/sources.list.d/llvm.list
10+
11+
RUN wget -O - https://repo.iovisor.org/GPG-KEY | apt-key add -
12+
RUN echo "deb https://repo.iovisor.org/apt/bionic bionic main" > /etc/apt/sources.list.d/iovisor.list
13+
14+
RUN apt-get update
15+
16+
RUN apt-get install -y bison cmake flex g++ git libelf-dev zlib1g-dev libfl-dev
17+
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
18+
RUN apt-get install -y libbcc=0.8.0-1
19+
20+
ADD https://github.com/iovisor/bpftrace/archive/${bpftracesha}.tar.gz /bpftrace.tar.gz
21+
RUN tar -xvf /bpftrace.tar.gz
22+
23+
RUN mv bpftrace-${bpftracesha} /bpftrace
24+
25+
RUN mkdir /bpftrace/build
26+
27+
WORKDIR /bpftrace/build
28+
29+
RUN cmake -DCMAKE_BUILD_TYPE=DEBUG -DCMAKE_INSTALL_PREFIX=/usr/local/bpftrace ..
30+
RUN make -j9
31+
RUN make install

build/Dockerfile.tracerunner-ubuntu

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
ARG bpftracesha
2+
ARG imagenamebase
3+
4+
FROM ${imagenamebase}:${bpftracesha} as bpftrace
5+
FROM golang:1.11.4-stretch as gobuilder
6+
7+
RUN apt-get update
8+
RUN apt-get install -y make bash git
9+
10+
ADD . /go/src/github.com/iovisor/kubectl-trace
11+
WORKDIR /go/src/github.com/iovisor/kubectl-trace
12+
13+
RUN make _output/bin/trace-runner
14+
15+
FROM ubuntu:18.04
16+
17+
RUN apt-get update && apt-get install -y wget gnupg && \
18+
echo "deb https://repo.iovisor.org/apt/bionic bionic main" > /etc/apt/sources.list.d/iovisor.list && \
19+
wget -O - https://repo.iovisor.org/GPG-KEY | apt-key add - && \
20+
apt-get update && apt-get install -y libbcc=0.8.0-1 libclang1-5.0 libllvm5.0 && rm -rf /var/lib/apt/lists/* && apt-get clean
21+
22+
COPY --from=bpftrace /usr/local/bpftrace/bin/bpftrace /bin/bpftrace
23+
COPY --from=gobuilder /go/src/github.com/iovisor/kubectl-trace/_output/bin/trace-runner /bin/trace-runner
24+
25+
ENTRYPOINT ["/bin/trace-runner"]

build/sources.list

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial main
2+
deb-src http://apt.llvm.org/xenial/ llvm-toolchain-xenial main
3+
# 5.0
4+
deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-5.0 main
5+
deb-src http://apt.llvm.org/xenial/ llvm-toolchain-xenial-5.0 main
6+
# 6.0
7+
deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-6.0 main
8+
deb-src http://apt.llvm.org/xenial/ llvm-toolchain-xenial-6.0 main

pkg/version/version.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ var imageName string
1212
var buildTime string
1313
var versionFormat = "git commit: %s\nbuild date: %s"
1414
var imageNameTagFormat = "%s:%s"
15-
var defaultImageName = "quay.io/fntlnz/kubectl-trace-bpftrace"
15+
var defaultImageName = "quay.io/dalehamel/kubectl-trace-bpftrace"
1616
var defaultImageTag = "latest"
1717

1818
// ImageName returns the container image name defined in Makefile

0 commit comments

Comments
 (0)