Bring dockerbuild up to date

Author: xrl

Dockerfile

@@ -1,5 +1,5 @@
 # heka_base image
-FROM debian:jessie
+FROM golang:1.4
 
 MAINTAINER Chance Zibolski <[email protected]> (@chance)
 
@@ -18,27 +18,15 @@ RUN     apt-get update && \
         ruby-dev \
         protobuf-compiler \
         python-sphinx \
-        wget
-
-# Install Go 1.3.1
-RUN curl -s https://storage.googleapis.com/golang/go1.3.1.linux-amd64.tar.gz -o /tmp/go.tar.gz && \
-        echo "3af011cc19b21c7180f2604fd85fbc4ddde97143 /tmp/go.tar.gz" | sha1sum -c && \
-        tar -C /usr/local -xzf /tmp/go.tar.gz
+        wget \
+        debhelper \
+        fakeroot \
+        libgeoip-dev \
+        libgeoip1 \
+        golang-goprotobuf-dev
 
 WORKDIR /heka
 
-ENV GOROOT /usr/local/go
-ENV PATH $PATH:/usr/local/go/bin:/go/bin
-
-ENV CTEST_OUTPUT_ON_FAILURE 1
-ENV BUILD_DIR   /heka/build
-ENV GOPATH      $BUILD_DIR/heka
-ENV GOBIN       $GOPATH/bin
-ENV PATH        $PATH:$GOBIN
-# Build faster
-ENV NUM_JOBS    10
-
 EXPOSE 4352
 
 COPY . /heka
-RUN ./build.sh

docker/Dockerfile

@@ -3,8 +3,10 @@
 # and builds a new image which installs that dpkg
 FROM mozilla/heka_base
 
+RUN cd /heka && . ./build.sh
+RUN cd /heka && . ./env.sh && cd /heka/build && make deb
+
 RUN mkdir -p /heka_docker
-RUN cd /heka/build && make deb
 RUN find /heka/build -name "*.deb" -exec cp {} /heka_docker/heka.deb \;
 COPY Dockerfile.final /heka_docker/Dockerfile
 
@@ -13,4 +15,4 @@ RUN curl -sSL https://get.docker.io/builds/Linux/x86_64/docker-1.2.0 -o /tmp/doc
     mv /tmp/docker /usr/local/bin/docker && \
     chmod +x /usr/local/bin/docker
 
-CMD docker build -t mozilla/heka /heka_docker
+CMD docker build -t mozilla/heka /heka_docker

docker/Dockerfile.final

@@ -4,7 +4,8 @@ FROM debian:jessie
 MAINTAINER Chance Zibolski <[email protected]> (@chance)
 
 COPY heka.deb /tmp/heka.deb
+RUN apt-get update && apt-get install -y libgeoip1
 RUN dpkg -i /tmp/heka.deb && rm /tmp/heka.deb
 
 EXPOSE 4352
-ENTRYPOINT ["hekad"]
+ENTRYPOINT ["hekad"]