From 7764c80bd5a4c7bfaf922de75ce15f2d0a47f47c Mon Sep 17 00:00:00 2001
From: Jeff Lindsay <progrium@gmail.com>
Date: Mon, 16 Feb 2015 10:22:05 -0600
Subject: [PATCH] preparing for v3 release with automated releases

---
 CHANGELOG.md       | 23 +++++++++++++++++++++++
 Makefile           |  6 +++---
 README.md          |  6 ++++++
 cedar14/Dockerfile |  4 +---
 cedar14/Makefile   |  2 +-
 5 files changed, 34 insertions(+), 7 deletions(-)
 create mode 100644 CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..606aa05
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,23 @@
+# Change Log
+All notable changes to this project will be documented in this file.
+
+## [Unreleased][unreleased]
+### Fixed
+
+### Added
+
+### Removed
+
+### Changed
+
+## [v3] - 2015-02-16
+### Added
+- package: openjdk-7-jdk
+- PR driven automated releases
+- changelog
+
+### Changed
+- switched ADD to COPY in Dockerfile
+
+[unreleased]: https://github.com/progrium/cedarish/compare/v3...HEAD
+[v3]: https://github.com/progrium/cedarish/compare/v2...v3
diff --git a/Makefile b/Makefile
index 31e7935..727400b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,11 @@
 NAME=cedarish
-VERSION=2
+VERSION=3
 
 release: cedar14/build/cedar14.tar
 	rm -rf release && mkdir -p release
 	cp cedar14/build/cedar14.tar release/$(NAME)-cedar14_v$(VERSION).tar
 	gzip -9 -c cedar14/build/cedar14.tar > release/$(NAME)-cedar14_v$(VERSION).tar.gz
-	gh-release create progrium/$(NAME) $(VERSION) $(shell git rev-parse --abbrev-ref HEAD)
+	gh-release create progrium/$(NAME) $(VERSION) $(shell git rev-parse --abbrev-ref HEAD) v$(VERSION)
 
 cedar14/build/cedar14.tar:
 	make -C cedar14 build
@@ -16,4 +16,4 @@ deps:
 clean:
 	rm -rf release
 
-.PHONY: release clean
+.PHONY: release
diff --git a/README.md b/README.md
index 1a9a504..4f0d9aa 100644
--- a/README.md
+++ b/README.md
@@ -10,3 +10,9 @@ It doesn't include any buildpacks, just the base environment. This allows us to
 ## Releases
 
 Although the latest release is always available on [Docker Hub](https://registry.hub.docker.com/u/progrium/cedarish/), you can access versioned filesystem [releases](https://github.com/progrium/cedarish/releases) directly. Both a tar and gzipped tar are available. This allows you to ADD the tar directly from custom Dockerfiles, or manually import the gzipped tar for quicker downloads (`docker import <release-url> progrium/cedarish`).
+
+## Contributing
+
+As usual, pull requests are welcome. You can also propose releases by opening a PR against the release branch from master. Please be sure to bump the version and update CHANGELOG.md and include your changelog text in the PR body.
+
+Discuss cedarish development with us on Freenode in #gliderlabs.
diff --git a/cedar14/Dockerfile b/cedar14/Dockerfile
index 07e4b29..515d78e 100644
--- a/cedar14/Dockerfile
+++ b/cedar14/Dockerfile
@@ -1,5 +1,3 @@
 FROM ubuntu-debootstrap:14.04
-MAINTAINER Jeff Lindsay <progrium@gmail.com>
-
-ADD ./cedar-14.sh /tmp/build.sh
+COPY ./cedar-14.sh /tmp/build.sh
 RUN LC_ALL=C DEBIAN_FRONTEND=noninteractive /tmp/build.sh
diff --git a/cedar14/Makefile b/cedar14/Makefile
index 729cf66..9ef6c95 100644
--- a/cedar14/Makefile
+++ b/cedar14/Makefile
@@ -37,4 +37,4 @@ clean:
 	docker rmi cedar14-build 2> /dev/null || true
 	rm -rf build
 
-.PHONY: build update clean
+.PHONY: build