Build from git so that --version is accurate

iovisor · Aug 31, 2019 · 0c0d587 · 0c0d587
1 parent d5e4f97
commit 0c0d587
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 10 deletions.
diff --git a/Makefile b/Makefile
@@ -39,8 +39,6 @@ ${trace_runner}:
 clean:
 	rm -Rf _output
 
-<<<<<<< HEAD
-=======
 .PHONY: image/build-alpine
 image/build-alpine:
 	$(DOCKER) build \

diff --git a/build/Dockerfile.bpftracebase-alpine b/build/Dockerfile.bpftracebase-alpine
@@ -34,10 +34,7 @@ RUN cd /bcc && mkdir build && cd build && cmake .. && make install -j4 && \
   cp src/cc/libbcc-loader-static.a /usr/local/lib64/libbcc-loader-static.a && \
   cp src/cc/libbpf.a /usr/local/lib64/libbpf.a
 
-ADD https://github.com/iovisor/bpftrace/archive/${bpftracesha}.tar.gz /bpftrace.tar.gz
-RUN tar -xvf /bpftrace.tar.gz
-
-RUN mv bpftrace-${bpftracesha} /bpftrace
+RUN git clone https://github.com/iovisor/bpftrace /bpftrace && cd /bpftrace && git checkout ${bpftracesha}
 
 WORKDIR /bpftrace
 

diff --git a/build/Dockerfile.bpftracebase-ubuntu b/build/Dockerfile.bpftracebase-ubuntu
@@ -16,10 +16,7 @@ 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
 
-ADD https://github.com/iovisor/bpftrace/archive/${bpftracesha}.tar.gz /bpftrace.tar.gz
-RUN tar -xvf /bpftrace.tar.gz
-
-RUN mv bpftrace-${bpftracesha} /bpftrace
+RUN git clone https://github.com/iovisor/bpftrace /bpftrace && cd /bpftrace && git checkout ${bpftracesha}
 
 RUN mkdir /bpftrace/build