From 732a5b2d61692a8d307ac525c67c5a1a32178f48 Mon Sep 17 00:00:00 2001 From: Xavier Lange Date: Thu, 3 Sep 2015 15:10:29 -0700 Subject: [PATCH] Bad EXEC for starting up heka container --- docker/Dockerfile.final | 2 +- docker/build_docker.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile.final b/docker/Dockerfile.final index 216ceecb3..8d9192474 100644 --- a/docker/Dockerfile.final +++ b/docker/Dockerfile.final @@ -8,4 +8,4 @@ RUN apt-get update && apt-get install -y libgeoip1 RUN dpkg -i /tmp/heka.deb && rm /tmp/heka.deb EXPOSE 4352 -ENTRYPOINT ["hekad"] \ No newline at end of file +ENTRYPOINT ["hekad", "-config=/etc/heka/conf.d"] \ No newline at end of file diff --git a/docker/build_docker.sh b/docker/build_docker.sh index 3a24a6801..41544ffc5 100755 --- a/docker/build_docker.sh +++ b/docker/build_docker.sh @@ -1,5 +1,6 @@ #!/bin/bash -set -e +# verbose/exit on error +set -xe docker build -t mozilla/heka_base .. docker build --rm -t mozilla/heka_build . docker run --rm -v /var/run/docker.sock:/var/run/docker.sock -ti mozilla/heka_build