Merge pull request #198 from gliderlabs/master

release 0.3.21
gliderlabs · Nov 14, 2016 · 99bb075 · 99bb075
2 parents 381e921 + 109bc5f
commit 99bb075
Show file tree

Hide file tree

Showing 43 changed files with 21 additions and 454 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,13 +11,19 @@ All notable changes to this project will be documented in this file.
 ### Changed
 
 
+## [0.3.21] - 2016-11-14
+### Changed
+- @michaelshobbs remove emberjs buildpack from default set
+- @michaelshobbs skip blank lines in .env. closes #195
+
+
 ## [0.3.20] - 2016-11-13
 ### Changed
-- @michaelshobbs michaelshobbs   new .env parser that handles spaces
-- @michaelshobbs michaelshobbs   change readme instructions to use github releases
-- @michaelshobbs michaelshobbs   Update go to version v52
-- @michaelshobbs michaelshobbs   Update php to version v114
-- @michaelshobbs michaelshobbs   Update python to version v83
+- @michaelshobbs new .env parser that handles spaces
+- @michaelshobbs change readme instructions to use github releases
+- @michaelshobbs Update go to version v52
+- @michaelshobbs Update php to version v114
+- @michaelshobbs Update python to version v83
 
 
 ## [0.3.19] - 2016-09-20
@@ -273,7 +279,8 @@ All notable changes to this project will be documented in this file.
 - User for `buildpack-build` is `$USER` or randomized
 - User for `procfile-exec` is `$USER` or detected from `/app`
 
-[unreleased]: https://github.com/gliderlabs/herokuish/compare/v0.3.20...HEAD
+[unreleased]: https://github.com/gliderlabs/herokuish/compare/v0.3.21...HEAD
+[0.3.21]: https://github.com/gliderlabs/herokuish/compare/v0.3.20...v0.3.21
 [0.3.20]: https://github.com/gliderlabs/herokuish/compare/v0.3.19...v0.3.20
 [0.3.19]: https://github.com/gliderlabs/herokuish/compare/v0.3.18...v0.3.19
 [0.3.18]: https://github.com/gliderlabs/herokuish/compare/v0.3.17...v0.3.18

diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 FROM heroku/cedar:14
-RUN curl https://github.com/gliderlabs/herokuish/releases/download/v0.3.20/herokuish_0.3.20_linux_x86_64.tgz \
+RUN curl https://github.com/gliderlabs/herokuish/releases/download/v0.3.21/herokuish_0.3.21_linux_x86_64.tgz \
 		--silent -L | tar -xzC /bin
 RUN /bin/herokuish buildpack install \
 	&& ln -s /bin/herokuish /build \

diff --git a/Makefile b/Makefile
@@ -1,10 +1,10 @@
 NAME = herokuish
 HARDWARE = $(shell uname -m)
-VERSION ?= 0.3.20
+VERSION ?= 0.3.21
 IMAGE_NAME ?= $(NAME)
 BUILD_TAG ?= dev
 
-BUILDPACK_ORDER := multi ruby nodejs clojure python java gradle grails scala play php go erlang static emberjs
+BUILDPACK_ORDER := multi ruby nodejs clojure python java gradle grails scala play php go erlang static
 SHELL := /bin/bash
 
 build:

diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ Download and uncompress the latest binary tarball from [releases](https://github
 For example, you can do this directly in your Dockerfiles installing into `/bin` as one step:
 
 ```
-RUN curl --location --silent https://github.com/gliderlabs/herokuish/releases/download/v0.3.20/herokuish_0.3.20_linux_x86_64.tgz \
+RUN curl --location --silent https://github.com/gliderlabs/herokuish/releases/download/v0.3.21/herokuish_0.3.21_linux_x86_64.tgz \
 		  | tar -xzC /bin
 ```
 

diff --git a/buildpacks/buildpack-emberjs/buildpack-url b/buildpacks/buildpack-emberjs/buildpack-url
diff --git a/buildpacks/buildpack-emberjs/buildpack-version b/buildpacks/buildpack-emberjs/buildpack-version
diff --git a/buildpacks/buildpack-emberjs/tests/emberjs/.bowerrc b/buildpacks/buildpack-emberjs/tests/emberjs/.bowerrc
diff --git a/buildpacks/buildpack-emberjs/tests/emberjs/.editorconfig b/buildpacks/buildpack-emberjs/tests/emberjs/.editorconfig
diff --git a/buildpacks/buildpack-emberjs/tests/emberjs/.ember-cli b/buildpacks/buildpack-emberjs/tests/emberjs/.ember-cli
diff --git a/buildpacks/buildpack-emberjs/tests/emberjs/.env b/buildpacks/buildpack-emberjs/tests/emberjs/.env
diff --git a/buildpacks/buildpack-emberjs/tests/emberjs/.jshintrc b/buildpacks/buildpack-emberjs/tests/emberjs/.jshintrc
diff --git a/buildpacks/buildpack-emberjs/tests/emberjs/app/app.js b/buildpacks/buildpack-emberjs/tests/emberjs/app/app.js
diff --git a/buildpacks/buildpack-emberjs/tests/emberjs/app/components/.gitkeep b/buildpacks/buildpack-emberjs/tests/emberjs/app/components/.gitkeep
diff --git a/buildpacks/buildpack-emberjs/tests/emberjs/app/controllers/.gitkeep b/buildpacks/buildpack-emberjs/tests/emberjs/app/controllers/.gitkeep
diff --git a/buildpacks/buildpack-emberjs/tests/emberjs/app/helpers/.gitkeep b/buildpacks/buildpack-emberjs/tests/emberjs/app/helpers/.gitkeep
diff --git a/buildpacks/buildpack-emberjs/tests/emberjs/app/index.html b/buildpacks/buildpack-emberjs/tests/emberjs/app/index.html
diff --git a/buildpacks/buildpack-emberjs/tests/emberjs/app/models/.gitkeep b/buildpacks/buildpack-emberjs/tests/emberjs/app/models/.gitkeep
diff --git a/buildpacks/buildpack-emberjs/tests/emberjs/app/resolver.js b/buildpacks/buildpack-emberjs/tests/emberjs/app/resolver.js
diff --git a/buildpacks/buildpack-emberjs/tests/emberjs/app/router.js b/buildpacks/buildpack-emberjs/tests/emberjs/app/router.js
diff --git a/buildpacks/buildpack-emberjs/tests/emberjs/app/routes/.gitkeep b/buildpacks/buildpack-emberjs/tests/emberjs/app/routes/.gitkeep
diff --git a/buildpacks/buildpack-emberjs/tests/emberjs/app/styles/app.css b/buildpacks/buildpack-emberjs/tests/emberjs/app/styles/app.css
diff --git a/buildpacks/buildpack-emberjs/tests/emberjs/app/templates/application.hbs b/buildpacks/buildpack-emberjs/tests/emberjs/app/templates/application.hbs
diff --git a/buildpacks/buildpack-emberjs/tests/emberjs/app/templates/components/.gitkeep b/buildpacks/buildpack-emberjs/tests/emberjs/app/templates/components/.gitkeep
diff --git a/buildpacks/buildpack-emberjs/tests/emberjs/bower.json b/buildpacks/buildpack-emberjs/tests/emberjs/bower.json
diff --git a/buildpacks/buildpack-emberjs/tests/emberjs/config/environment.js b/buildpacks/buildpack-emberjs/tests/emberjs/config/environment.js
diff --git a/buildpacks/buildpack-emberjs/tests/emberjs/ember-cli-build.js b/buildpacks/buildpack-emberjs/tests/emberjs/ember-cli-build.js
diff --git a/buildpacks/buildpack-emberjs/tests/emberjs/package.json b/buildpacks/buildpack-emberjs/tests/emberjs/package.json
diff --git a/buildpacks/buildpack-emberjs/tests/emberjs/public/crossdomain.xml b/buildpacks/buildpack-emberjs/tests/emberjs/public/crossdomain.xml
diff --git a/buildpacks/buildpack-emberjs/tests/emberjs/public/robots.txt b/buildpacks/buildpack-emberjs/tests/emberjs/public/robots.txt
diff --git a/buildpacks/buildpack-emberjs/tests/emberjs/test.sh b/buildpacks/buildpack-emberjs/tests/emberjs/test.sh
diff --git a/buildpacks/buildpack-emberjs/tests/emberjs/testem.js b/buildpacks/buildpack-emberjs/tests/emberjs/testem.js