From 25233eb03dfa6d150836565646a11e89b0185595 Mon Sep 17 00:00:00 2001 From: Matt Robenolt Date: Mon, 8 Jun 2015 20:34:23 -0700 Subject: [PATCH] bump to heka@32cadf80a587054d4ef00b26a9ca14faeafd16fe --- Dockerfile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index b395aa3..090bd85 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,16 @@ FROM golang:1.4 -ENV BUILD_DEPS cmake python-sphinx protobuf-compiler patch libgeoip-dev +ENV BUILD_DEPS \ + cmake python-sphinx protobuf-compiler \ + patch libgeoip-dev debhelper fakeroot -ENV HEKA_VERSION 0.9.2 +ENV HEKA_VERSION 32cadf80a587054d4ef00b26a9ca14faeafd16fe COPY plugin_loader.cmake /tmp/plugin_loader.cmake RUN apt-get update && apt-get install -y libgeoip1 $BUILD_DEPS --no-install-recommends \ - && git clone https://github.com/mozilla-services/heka --depth=1 --branch=v$HEKA_VERSION /usr/src/heka \ + && git clone https://github.com/mozilla-services/heka /usr/src/heka \ + && cd /usr/src/heka/ && git checkout $HEKA_VERSION \ && mv /tmp/plugin_loader.cmake /usr/src/heka/cmake \ && cd /usr/src/heka/ && ./build.sh 2>&1 \ && mv /usr/src/heka/build/heka/bin/* /usr/local/bin \ @@ -22,7 +25,7 @@ RUN apt-get update && apt-get install -y libgeoip1 $BUILD_DEPS --no-install-reco && cp /usr/src/heka/sandbox/lua/encoders/* /usr/share/heka/lua_encoders \ && cp /usr/src/heka/sandbox/lua/filters/* /usr/share/heka/lua_filters \ && cp /usr/src/heka/sandbox/lua/modules/* /usr/share/heka/lua_modules \ - && cp /usr/src/heka/build/heka/modules/*.lua /usr/share/heka/lua_modules \ + && cp /usr/local/lib/luasandbox/modules/* /usr/share/heka/lua_modules \ && cp -r /usr/src/heka/dasher/* /usr/share/heka/dasher \ && rm -rf /usr/src/heka \ && apt-get purge -y $BUILD_DEPS && apt-get autoremove -y \