update docker images

docker/registrator/Dockerfile

@@ -1,10 +1,9 @@
-FROM golang:1.9.4-alpine3.7 AS builder
+FROM golang:1-alpine AS build
+LABEL maintainer aynic.os <support+docker@asycn.io>
 ARG DOCKER_BUILD_DIR
 ARG GIT_AUTHOR_NAME
 ARG GIT_AUTHOR_EMAIL
 
-LABEL maintainer aynic.os <support+docker@asycn.io>
-
 ENV GIT_AUTHOR_NAME=${GIT_AUTHOR_NAME}
 ENV GIT_AUTHOR_EMAIL=${GIT_AUTHOR_EMAIL}
 ENV GIT_COMMITTER_NAME=${GIT_AUTHOR_NAME}
@@ -14,29 +13,37 @@ WORKDIR /go/src/github.com/gliderlabs/registrator/
 RUN \
     apk add --no-cache curl git \
     && git clone https://github.com/gliderlabs/registrator/ . \
-# TEMPORARY DISABLED - TODO: check with new upstream master
-#    && git reset --hard da90d170da9dd7e1a8d9a13429d44686dc3d118f \
-#    # -useIpFromNetwork command line option \
-#    && git fetch origin pull/596/head \
-#    && git merge --no-edit 8d904c60949e310893a25c8af3636b0151334dd4 \
-#    # convert check.Script to check.Args \
-#    && git fetch origin pull/627/head \
-#    && git merge --no-edit ed053c364e3ba941aeca9ab0d8791b051ff4dede \
-#    # skip tls verification \
+    && git reset --hard 4322fe00304d6de661865721b073dc5c7e750bd2 \
+    # -useIpFromNetwork \
+    && git fetch origin pull/596/head \
+    && git merge --no-edit 8d904c60949e310893a25c8af3636b0151334dd4 \
+    # fix SERVICE_CHECK_SCRIPT
+    && git fetch origin pull/686/head \
+    && git merge --no-edit 097305157a6a2c0c236fa430c17498c895536782 \
+#    # skip tls verification
 #    && git fetch origin pull/661/head \
 #    && git merge --no-edit 38fc83ac07b4a070be71079cb810429d94a60205 \
+#    # prevent publishing ip twice \
+#    && git fetch origin pull/703/head \
+#    && git merge --no-edit b628dcd0edacfb2d3e5f0a6f486b23339f35e82a \
+#    # -useIpFromEnv
+#    && git fetch origin pull/674/head \
+#    && git merge --no-edit 4fe9e216d9747e25ae5aa9d40f2246861c032dd1 \
     && curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh \
     && dep ensure -vendor-only \
+    && go mod init \
+    && go mod vendor \
     && CGO_ENABLED=0 GOOS=linux go build \
         -a -installsuffix cgo \
         -ldflags "-X main.Version=$(cat VERSION)" \
-        -o bin/registrator \
+        -o /go/bin/registrator \
         .
 
-FROM alpine:3.7 as dist
+FROM alpine:latest as dist
 ARG DOCKER_BUILD_DIR
+
 RUN apk add --no-cache ca-certificates
-COPY --from=builder /go/src/github.com/gliderlabs/registrator/bin/registrator /bin/registrator
+COPY --from=build /go/bin/registrator /bin/registrator
 
 ENTRYPOINT ["/bin/registrator"]