Merge pull request #38 from michaelshobbs/mh-release-0.3.1

v0.3.1

Author: josegonzalez

CHANGELOG.md

@@ -10,6 +10,21 @@ All notable changes to this project will be documented in this file.
 
 ### Changed
 
+## [0.3.1] - 2015-07-09
+### Fixed
+- Fixed directory permission for custom buildpacks
+
+### Added
+- Added ability to build in docker container
+
+### Removed
+- Remove testing play-v1 from play buildpack
+
+### Changed
+- Build from mainline heroku/cedar:14 docker images
+- Bump nodejs/scala buildpack versions
+
+
 ## [0.3.0] - 2015-04-04
 ### Fixed
 - Fixed Scala buildpack and app test

Dockerfile

@@ -1,4 +1,4 @@
-FROM progrium/cedarish:latest
+FROM heroku/cedar:14
 RUN curl https://github.com/gliderlabs/herokuish/releases/download/v0.3.0/herokuish_0.3.0_linux_x86_64.tgz \
 		--silent -L | tar -xzC /bin
 RUN /bin/herokuish buildpack install \

Dockerfile.build

@@ -0,0 +1,2 @@
+FROM golang:1.4-cross
+RUN curl -s -o - https://get.docker.com/builds/Linux/x86_64/docker-1.6.2 > /usr/local/bin/docker && chmod +x /usr/local/bin/docker

Dockerfile.dev

@@ -1,4 +1,4 @@
-FROM progrium/cedarish:latest
+FROM heroku/cedar:14
 COPY ./build/linux/herokuish /bin/herokuish
 RUN /bin/herokuish buildpack install \
 	&& ln -s /bin/herokuish /build \

Makefile

@@ -1,20 +1,30 @@
-NAME=herokuish
-HARDWARE=$(shell uname -m)
-VERSION=0.3.0
+NAME = herokuish
+HARDWARE = $(shell uname -m)
+VERSION ?= 0.3.1
+IMAGE_NAME ?= $(NAME)
+BUILD_TAG ?= dev
 
 build:
 	cat buildpacks/*/buildpack* | sed 'N;s/\n/ /' > include/buildpacks.txt
 	go-bindata include
 	mkdir -p build/linux  && GOOS=linux  go build -ldflags "-X main.Version $(VERSION)" -o build/linux/$(NAME)
 	mkdir -p build/darwin && GOOS=darwin go build -ldflags "-X main.Version $(VERSION)" -o build/darwin/$(NAME)
 ifeq ($(CIRCLECI),true)
-	docker build -t $(NAME):dev .
+	docker build -t $(IMAGE_NAME):$(BUILD_TAG) .
 else
-	docker build -f Dockerfile.dev -t $(NAME):dev .
+	docker build -f Dockerfile.dev -t $(IMAGE_NAME):$(BUILD_TAG) .
 endif
 
+build-in-docker:
+	docker build -f Dockerfile.build -t $(NAME)-build .
+	docker run --rm -v /var/run/docker.sock:/var/run/docker.sock \
+		-v ${PWD}:/usr/src/myapp -w /usr/src/myapp \
+		-e IMAGE_NAME=$(IMAGE_NAME) -e BUILD_TAG=$(BUILD_TAG) -e VERSION=master \
+		$(NAME)-build make -e deps build
+	docker rmi $(NAME)-build || true
+
 deps:
-	docker pull progrium/cedarish:latest
+	docker pull heroku/cedar:14
 	go get -u github.com/jteeuwen/go-bindata/...
 	go get -u github.com/progrium/gh-release/...
 	go get -u github.com/progrium/basht/...
@@ -25,13 +35,14 @@ test:
 
 circleci:
 	docker version
-	rm ~/.gitconfig
+	rm -f ~/.gitconfig
 	mv Dockerfile.dev Dockerfile
 
 release: build
 	rm -rf release && mkdir release
 	tar -zcf release/$(NAME)_$(VERSION)_linux_$(HARDWARE).tgz -C build/linux $(NAME)
 	tar -zcf release/$(NAME)_$(VERSION)_darwin_$(HARDWARE).tgz -C build/darwin $(NAME)
-	gh-release create gliderlabs/$(NAME) $(VERSION) $(shell git rev-parse --abbrev-ref HEAD)
+	gh-release create gliderlabs/$(NAME) $(VERSION) \
+		$(shell git rev-parse --abbrev-ref HEAD) v$(VERSION)
 
 .PHONY: build

README.md

@@ -1,11 +1,16 @@
-# herokuish [![Circle CI](https://circleci.com/gh/gliderlabs/herokuish.png?style=shield)](https://circleci.com/gh/gliderlabs/herokuish)
+# herokuish
+
+[![Circle CI](https://circleci.com/gh/gliderlabs/herokuish.png?style=shield)](https://circleci.com/gh/gliderlabs/herokuish)
+[![IRC Channel](https://img.shields.io/badge/irc-%23gliderlabs-blue.svg)](https://kiwiirc.com/client/irc.freenode.net/#gliderlabs)
 
 A command line tool for emulating Heroku build and runtime tasks in containers.
 
 Herokuish is made for platform authors. The project consolidates and decouples Heroku compatibility logic (running buildpacks, parsing Procfile) and supporting workflow (importing/exporting slugs) from specific platform images like those in Dokku/Buildstep, Deis, Flynn, etc.
 
 The goal is to be the definitive, well maintained and heavily tested Heroku emulation utility shared by all. It is complemented by [progrium/cedarish](https://github.com/progrium/cedarish), which focuses on reproducing the base Heroku system image. Together they form a toolkit for achieving Heroku compatibility.
 
+Herokuish is a community project and is in no way affiliated with Heroku.
+
 ## Getting herokuish
 
 Download and uncompress the latest binary tarball from [releases](https://github.com/gliderlabs/herokuish/releases).
@@ -157,6 +162,8 @@ That said, herokuish was designed based on the experience developing and re-deve
 
 In fact, since I hope this is the final implementation of Heroku emulation I'm involved with, I'd like to finally thank Matt Freeman ([@nonuby](https://twitter.com/nonuby)). I've been more or less copy-and-pasting code he originally wrote for the now defunct [OpenRoku](https://github.com/openruko) since 2012.
 
+Lastly, thank you Heroku for pioneering such a great platform and inspiring all of us to try and take it further.
+
 ## License
 
 BSD

buildpacks/buildpack-nodejs/buildpack-version

@@ -1 +1 @@
-v64
+v76

buildpacks/buildpack-play/tests/play-v1/Procfile

@@ -1 +1 @@
-v54
+v58

buildpacks/buildpack-play/tests/play-v1/README.md

@@ -76,6 +76,8 @@ buildpack-execute() {
 
 		IFS='#' read url commit <<< "$BUILDPACK_URL"
 		buildpack-install "$url" "$commit" custom &> /dev/null
+		
+		chown -R "$unprivileged_user:$unprivileged_group" "$buildpack_path/custom"
 
 		selected_name="$(unprivileged $selected_path/bin/detect $build_path)"
 	else
@@ -102,7 +104,9 @@ buildpack-execute() {
 
 	cd "$build_path"
 	unprivileged "$selected_path/bin/compile" "$build_path" "$cache_path" "$env_path"
-	unprivileged "$selected_path/bin/release" "$build_path" "$cache_path" > "$build_path/.release"
+	if [[ -f "$selected_path/bin/release" ]]; then
+		unprivileged "$selected_path/bin/release" "$build_path" "$cache_path" > "$build_path/.release"
+	fi
 	cd - > /dev/null
 
 	shopt -s dotglob nullglob