From 4d381fccb0be041ba68e2b8ffcbe678cbdf8d70d Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar Date: Sun, 28 Jun 2015 20:19:59 -0700 Subject: [PATCH] Modernize Dockerfile to use the golang image --- Dockerfile | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 33b72df..15a8866 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,4 @@ -FROM ubuntu - -RUN apt-get -qy update -RUN apt-get -y install golang-go -RUN apt-get -y install git -RUN apt-get -y install mercurial subversion - -ENV GOPATH $HOME/go +FROM golang RUN mkdir -p $GOPATH/src/github.com/ActiveState/tail/ ADD . $GOPATH/src/github.com/ActiveState/tail/ @@ -17,11 +10,10 @@ RUN go get -v github.com/ActiveState/tail RUN go test -v github.com/ActiveState/tail # expecting to install successfully -RUN go install -v github.com/ActiveState/tail +RUN go install -v github.com/ActiveState/tail RUN go install -v github.com/ActiveState/tail/cmd/gotail RUN $GOPATH/bin/gotail -h || true ENV PATH $GOPATH/bin:$PATH CMD ["gotail"] -