Merge pull request #9 from m-lab/more-docker

fix docker entry point err

Author: yachang

Dockerfile

@@ -1,4 +1,10 @@
-FROM ubuntu:latest as ubun
+FROM golang:alpine as build
+RUN apk update && apk add bash git pkgconfig geoip-dev geoip gcc libc-dev
+ADD . /go/src/github.com/m-lab/traceroute-caller
+RUN GOARCH=amd64 CGO_ENABLED=0 GOOS=linux go get github.com/m-lab/traceroute-caller
+RUN chmod -R a+rx /go/bin/traceroute-caller
+
+FROM ubuntu:latest
 # Install all the standard packages we need
 RUN apt-get update && apt-get install -y python python-pip make iproute2 coreutils
 
@@ -15,16 +21,8 @@ RUN make install
 
 RUN chmod 4755 /usr/local/bin/scamper
 
-FROM golang:alpine as build
-RUN apk update && apk add bash git pkgconfig geoip-dev geoip gcc libc-dev
-ADD . /go/src/github.com/m-lab/traceroute-caller
-RUN go get github.com/m-lab/traceroute-caller
-RUN chmod -R a+rx /go/bin/traceroute-caller
-
-FROM golang:alpine
-RUN apk update
 COPY --from=build /go/bin/traceroute-caller /
-COPY --from=ubun /usr/local/bin/scamper /
+
 WORKDIR /
 
-ENTRYPOINT ["/traceroute-caller"]
+ENTRYPOINT ["/traceroute-caller"]