Merge pull request #108 from gliderlabs/master

v5
gliderlabs · Feb 18, 2015 · f1dff6c · f1dff6c
2 parents ee8720d + 50a8099
commit f1dff6c
Show file tree

Hide file tree

Showing 226 changed files with 121 additions and 25,732 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,3 @@
+release
+build
+.git
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,2 @@
 release
-registrator
+build
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,34 @@
+# Change Log
+All notable changes to this project will be documented in this file.
+
+## [Unreleased][unreleased]
+### Fixed
+
+### Added
+
+### Removed
+
+### Changed
+
+
+## [v5] - 2015-02-18
+### Added
+- Automated, PR-driven release process
+- Development Dockerfile and make task
+- CircleCI config with artifacts for every build
+- `--version` flag to see version
+
+### Changed
+- Base container is now Alpine
+- Built entirely in Docker
+- Moved to gliderlabs organization
+- New versioning scheme
+- Release artifact now saved container image
+
+### Removed
+- Dropped unnecessary layers in Dockerfile
+- Dropped Godeps for now
+
+
+[unreleased]: https://github.com/gliderlabs/registrator/compare/v5...HEAD
+[v5]: https://github.com/gliderlabs/registrator/compare/v0.4.0...v5
diff --git a/Dockerfile b/Dockerfile
@@ -1,8 +1,11 @@
-FROM progrium/busybox
-MAINTAINER Jeff Lindsay <[email protected]>
+FROM gliderlabs/alpine:3.1
+ENTRYPOINT ["/bin/registrator"]
 
-ADD https://github.com/progrium/registrator/releases/download/v0.4.0/registrator_0.4.0_linux_x86_64.tgz /tmp/registrator.tgz
-RUN cd /bin && gzip -dc /tmp/registrator.tgz | tar -xf - && rm /tmp/registrator.tgz
-
-ENV DOCKER_HOST unix:///tmp/docker.sock
-ENTRYPOINT ["/bin/registrator"]
+COPY . /go/src/github.com/gliderlabs/registrator
+RUN apk-install -t build-deps go git mercurial \
+	&& cd /go/src/github.com/gliderlabs/registrator \
+	&& export GOPATH=/go \
+	&& go get \
+	&& go build -ldflags "-X main.Version $(cat VERSION)" -o /bin/registrator \
+	&& rm -rf /go \
+	&& apk del --purge build-deps
diff --git a/Dockerfile.dev b/Dockerfile.dev
@@ -0,0 +1,9 @@
+FROM gliderlabs/alpine:3.1
+CMD ["/bin/registrator"]
+
+ENV GOPATH /go
+RUN apk-install go git mercurial
+COPY . /go/src/github.com/gliderlabs/registrator
+RUN cd /go/src/github.com/gliderlabs/registrator \
+	&& go get \
+	&& go build -ldflags "-X main.Version dev" -o /bin/registrator
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/Godeps/Readme b/Godeps/Readme
diff --git a/Godeps/_workspace/.gitignore b/Godeps/_workspace/.gitignore
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/.gitignore b/Godeps/_workspace/src/github.com/Sirupsen/logrus/.gitignore
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/.travis.yml b/Godeps/_workspace/src/github.com/Sirupsen/logrus/.travis.yml
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/LICENSE b/Godeps/_workspace/src/github.com/Sirupsen/logrus/LICENSE