diff --git a/bcc-tools/Dockerfile b/bcc-tools/Dockerfile index 8b86185..d2938c1 100644 --- a/bcc-tools/Dockerfile +++ b/bcc-tools/Dockerfile @@ -9,8 +9,7 @@ FROM debian:buster-slim MAINTAINER Jessica Frazelle -ENV PATH /go/bin:/usr/local/go/bin:$PATH -ENV GOPATH /go +ENV PATH /usr/share/bcc/tools:$PATH # Add non-free apt sources RUN sed -i "s#deb http://deb.debian.org/debian buster main#deb http://deb.debian.org/debian buster main contrib non-free#g" /etc/apt/sources.list @@ -54,37 +53,17 @@ RUN apt-get update && apt-get install -y \ && rm -rf /var/lib/apt/lists/* # Build libbcc -ENV BCC_VERSION v0.7.0 +ENV BCC_VERSION v1 RUN git clone --depth 1 --branch "$BCC_VERSION" https://github.com/iovisor/bcc.git /usr/src/bcc -WORKDIR /usr/src/bcc -RUN mkdir build \ - && cd build \ - && cmake .. -DCMAKE_INSTALL_PREFIX=/usr \ - && make \ - && make install - -# Install Go -ENV GO_VERSION 1.11 -RUN curl -fsSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" \ - | tar -xzC /usr/local - -# Install google/protobuf -ENV PROTOBUF_VERSION v3.6.1 -RUN set -x \ - && export PROTOBUF_PATH="$(mktemp -d)" \ - && curl -fsSL "https://github.com/google/protobuf/archive/${PROTOBUF_VERSION}.tar.gz" \ - | tar -xzC "$PROTOBUF_PATH" --strip-components=1 \ - && ( \ - cd "$PROTOBUF_PATH" \ - && ./autogen.sh \ - && ./configure --prefix=/usr/local \ +RUN ( \ + cd /usr/src/bcc \ + && mkdir build \ + && cd build \ + && cmake .. -DCMAKE_INSTALL_PREFIX=/usr \ && make \ && make install \ - && ldconfig \ ) \ - && rm -rf "$PROTOBUFPATH" - -ENV PATH /usr/share/bcc/tools:$PATH + && rm -rf /usr/src/bcc COPY entrypoint.sh /usr/local/bin/entrypoint.sh diff --git a/latest-versions.sh b/latest-versions.sh index c8ad8c1..ce1ce97 100755 --- a/latest-versions.sh +++ b/latest-versions.sh @@ -95,6 +95,7 @@ compare() { projects=( noelbundick/azure-cli-extension-noelbundick +iovisor/bcc browsh-org/browsh certbot/certbot hashicorp/consul