Skip to content

Commit

Permalink
preparing for v3 release with automated releases
Browse files Browse the repository at this point in the history
  • Loading branch information
progrium committed Feb 16, 2015
1 parent 149ea71 commit 7764c80
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 7 deletions.
23 changes: 23 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -16,4 +16,4 @@ deps:
clean:
rm -rf release

.PHONY: release clean
.PHONY: release
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
4 changes: 1 addition & 3 deletions cedar14/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
FROM ubuntu-debootstrap:14.04
MAINTAINER Jeff Lindsay <[email protected]>

ADD ./cedar-14.sh /tmp/build.sh
COPY ./cedar-14.sh /tmp/build.sh
RUN LC_ALL=C DEBIAN_FRONTEND=noninteractive /tmp/build.sh
2 changes: 1 addition & 1 deletion cedar14/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@ clean:
docker rmi cedar14-build 2> /dev/null || true
rm -rf build

.PHONY: build update clean
.PHONY: build

0 comments on commit 7764c80

Please sign in to comment.