v8

.gitignore

@@ -1,2 +1,3 @@
 release
 build
+vendor

CHANGELOG.md

@@ -10,13 +10,41 @@ All notable changes to this project will be documented in this file.
 
 ### Changed
 
+## [v7] - 2016-03-05
+### Fixed
+- Providing a SERVICE_NAME for a container with multiple ports exposed would cause services to overwrite each other
+- dd3ab2e Fix specific port names not overriding port suffix
+
+### Added
+- bridge.Ping - calls adapter.Ping
+- Consul TCP Health Check
+- Support for Consul unix sockets
+- Basic Zookeper backend
+- Support for Docker multi host networking
+- Default to tcp for PortType if not provided
+- Sync etcd cluster on service registration
+- Support hostip for overlay network
+- Cleanup dangling services
+- Startup backend service connection retry
+
+### Removed
+
+### Changed
+- Upgraded base image to alpine:3.2 and go 1.4
+- bridge.New returns an error instead of calling log.Fatal
+- bridge.New will not attempt to ping an adapter.
+- Specifying a SERVICE_NAME for containers exposing multiple ports will now result in a named service per port. #194
+- Etcd uses port 2379 instead of 4001 #340
+- Setup Docker client from environment
+- Use exit status to determine if container was killed
 
 ## [v6] - 2015-08-07
 ### Fixed
 - Support for etcd v0 and v2
 - Panic from invalid skydns2 URI.
 
 ### Added
+- Basic zookeeper adapter
 - Optional periodic resyncing of services from containers
 - More error logging for registries
 - Support for services on containers with `--net=host`
@@ -54,6 +82,7 @@ All notable changes to this project will be documented in this file.
 - Dropped Godeps for now
 
 
-[unreleased]: https://github.com/gliderlabs/registrator/compare/v6...HEAD
+[unreleased]: https://github.com/gliderlabs/registrator/compare/v7...HEAD
+[v7]: https://github.com/gliderlabs/registrator/compare/v6...v7
 [v6]: https://github.com/gliderlabs/registrator/compare/v5...v6
 [v5]: https://github.com/gliderlabs/registrator/compare/v0.4.0...v5

Dockerfile

@@ -1,11 +1,18 @@
-FROM gliderlabs/alpine:3.1
-ENTRYPOINT ["/bin/registrator"]
-
+FROM alpine:3.7 AS builder
 COPY . /go/src/github.com/gliderlabs/registrator
-RUN apk-install -t build-deps go git mercurial \
+RUN apk --no-cache add -t build-deps build-base go git curl \
+	&& apk --no-cache add ca-certificates \
+	&& export GOPATH=/go && mkdir -p /go/bin && export PATH=$PATH:/go/bin \
+	&& curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh \
 	&& cd /go/src/github.com/gliderlabs/registrator \
 	&& export GOPATH=/go \
-	&& go get \
-	&& go build -ldflags "-X main.Version $(cat VERSION)" -o /bin/registrator \
+  && git config --global http.https://gopkg.in.followRedirects true \
+	&& dep ensure \
+	&& go build -ldflags "-X main.Version=$(cat VERSION)" -o /bin/registrator \
 	&& rm -rf /go \
 	&& apk del --purge build-deps
+
+FROM alpine:3.7
+COPY --from=builder /bin/registrator /bin/registrator
+COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
+ENTRYPOINT ["/bin/registrator"]

Dockerfile.dev

@@ -1,9 +1,10 @@
-FROM gliderlabs/alpine:3.1
+FROM alpine:3.5
 CMD ["/bin/registrator"]
 
 ENV GOPATH /go
-RUN apk-install go git mercurial
+RUN apk --no-cache add build-base go git ca-certificates
 COPY . /go/src/github.com/gliderlabs/registrator
 RUN cd /go/src/github.com/gliderlabs/registrator \
+  && git config --global http.https://gopkg.in.followRedirects true \
 	&& go get \
-	&& go build -ldflags "-X main.Version dev" -o /bin/registrator
+	&& go build -ldflags "-X main.Version=dev" -o /bin/registrator

Gopkg.toml

@@ -0,0 +1,43 @@
+[[constraint]]
+  name = "github.com/cenkalti/backoff"
+  version = "2.0.0"
+
+[[constraint]]
+  name = "github.com/coreos/go-etcd"
+  version = "2.0.0"
+
+[[constraint]]
+  name = "github.com/fsouza/go-dockerclient"
+  version = "1.2.0"
+
+[[override]]
+  name = "github.com/docker/docker"
+  revision = "a422774e593b33bd287d9890544ad9e09b380d8c"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/gliderlabs/pkg"
+
+[[constraint]]
+  name = "github.com/hashicorp/consul"
+  version = "1.0.7"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/hashicorp/go-cleanhttp"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/samuel/go-zookeeper"
+
+[[constraint]]
+  name = "github.com/stretchr/testify"
+  version = "1.2.1"
+
+[[constraint]]
+  name = "gopkg.in/coreos/go-etcd.v0"
+  version = "0.4.6"
+
+[prune]
+  go-tests = true
+  unused-packages = true