Merge pull request #130 from gliderlabs/master

release 0.3.9

CHANGELOG.md

@@ -10,12 +10,36 @@ All notable changes to this project will be documented in this file.
 
 ### Changed
 
+
+## [0.3.9] - 2016-03-08
+### Fixed
+- @graphaelli clean up link warning
+
+### Added
+- @michaelshobbs extract config_vars from .release
+
+### Changed
+- @singlow singlow use find to identify only files not already owned by user
+- @michaelshobbs Update clojure to version v75
+- @michaelshobbs Update grails to version v20
+- @michaelshobbs Update java to version v44
+- @michaelshobbs Update nodejs to version v88
+- @michaelshobbs Update play to version v26
+- @michaelshobbs Update python to version v77
+- @michaelshobbs Update ruby to version v145
+- @michaelshobbs Update scala to version v66
+- @michaelshobbs Update php to version v95
+- @michaelshobbs Update go to version v31
+- @michaelshobbs upgrade to go1.6
+
+
 ## [0.3.8] - 2016-01-06
 ### Changed
 - @josegonzalez Upgrade gradle buildpack version to 17
 - @josegonzalez Update java buildpack version to 42
 - @josegonzalez Update scala buildpack version to 64
 
+
 ## [0.3.7] - 2015-12-31
 ### Fixed
 - @michaelshobbs force rebuild of packages that are already up to date
@@ -29,6 +53,7 @@ All notable changes to this project will be documented in this file.
 - @CEikermann Updated buildpack-php to v90
 - @josegonzalez Upgrade python buildpack to v74
 
+
 ## [0.3.6] - 2015-12-14
 ### Changed
 - Update php buildpack to version 87
@@ -148,7 +173,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.8...HEAD
+[unreleased]: https://github.com/gliderlabs/herokuish/compare/v0.3.9...HEAD
+[0.3.9]: https://github.com/gliderlabs/herokuish/compare/v0.3.8...v0.3.9
 [0.3.8]: https://github.com/gliderlabs/herokuish/compare/v0.3.7...v0.3.8
 [0.3.7]: https://github.com/gliderlabs/herokuish/compare/v0.3.6...v0.3.7
 [0.3.6]: https://github.com/gliderlabs/herokuish/compare/v0.3.5...v0.3.6

Dockerfile

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

Makefile

@@ -1,14 +1,14 @@
 NAME = herokuish
 HARDWARE = $(shell uname -m)
-VERSION ?= 0.3.8
+VERSION ?= 0.3.9
 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 -a -ldflags "-X main.Version $(VERSION)" -o build/linux/$(NAME)
-	mkdir -p build/darwin && GOOS=darwin go build -a -ldflags "-X main.Version $(VERSION)" -o build/darwin/$(NAME)
+	mkdir -p build/linux  && GOOS=linux  go build -a -ldflags "-X main.Version=$(VERSION)" -o build/linux/$(NAME)
+	mkdir -p build/darwin && GOOS=darwin go build -a -ldflags "-X main.Version=$(VERSION)" -o build/darwin/$(NAME)
 ifeq ($(CIRCLECI),true)
 	docker build -t $(IMAGE_NAME):$(BUILD_TAG) .
 else

buildpacks/buildpack-clojure/buildpack-version

@@ -1 +1 @@
-v73
+v75

buildpacks/buildpack-erlang/buildpack-url

@@ -0,0 +1 @@
+https://github.com/heroku/heroku-buildpack-erlang

buildpacks/buildpack-erlang/buildpack-version

@@ -0,0 +1 @@
+fa17af9

buildpacks/buildpack-erlang/tests/erlang/Procfile

@@ -0,0 +1 @@
+web: erl -pa ebin deps/*/ebin -noshell -boot start_sasl -s reloader -s erlang_test

buildpacks/buildpack-erlang/tests/erlang/priv/dispatch.conf

@@ -0,0 +1,2 @@
+%%-*- mode: erlang -*-
+{[], erlang_test_resource, []}.

buildpacks/buildpack-erlang/tests/erlang/rebar.config

@@ -0,0 +1,3 @@
+%%-*- mode: erlang -*-
+
+{deps, [{webmachine, "1.10.*", {git, "git://github.com/basho/webmachine", "HEAD"}}]}.

buildpacks/buildpack-erlang/tests/erlang/src/erlang_test.app.src

@@ -0,0 +1,18 @@
+%%-*- mode: erlang -*-
+{application, erlang_test,
+ [
+  {description, "erlang_test"},
+  {vsn, "1"},
+  {modules, []},
+  {registered, []},
+  {applications, [
+                  kernel,
+                  stdlib,
+                  inets,
+                  crypto,
+                  mochiweb,
+                  webmachine
+                 ]},
+  {mod, { erlang_test_app, []}},
+  {env, []}
+ ]}.

buildpacks/buildpack-erlang/tests/erlang/src/erlang_test.erl

@@ -0,0 +1,29 @@
+%% @author author <[email protected]>
+%% @copyright YYYY author.
+
+%% @doc erlang_test startup code
+
+-module(erlang_test).
+-author('author <[email protected]>').
+-export([start/0, start_link/0, stop/0]).
+
+%% @spec start_link() -> {ok,Pid::pid()}
+%% @doc Starts the app for inclusion in a supervisor tree
+start_link() ->
+    application:set_env(webmachine, webmachine_logger_module,
+                        webmachine_logger),
+    application:ensure_all_started(webmachine),
+    erlang_test_sup:start_link().
+
+%% @spec start() -> ok
+%% @doc Start the erlang_test server.
+start() ->
+    application:set_env(webmachine, webmachine_logger_module,
+                        webmachine_logger),
+    application:ensure_all_started(webmachine),
+    application:start(erlang_test).
+
+%% @spec stop() -> ok
+%% @doc Stop the erlang_test server.
+stop() ->
+    application:stop(erlang_test).

buildpacks/buildpack-erlang/tests/erlang/src/erlang_test_app.erl

@@ -0,0 +1,21 @@
+%% @author author <[email protected]>
+%% @copyright YYYY author.
+
+%% @doc Callbacks for the erlang_test application.
+
+-module(erlang_test_app).
+-author('author <[email protected]>').
+
+-behaviour(application).
+-export([start/2,stop/1]).
+
+
+%% @spec start(_Type, _StartArgs) -> ServerRet
+%% @doc application start callback for erlang_test.
+start(_Type, _StartArgs) ->
+    erlang_test_sup:start_link().
+
+%% @spec stop(_State) -> ServerRet
+%% @doc application stop callback for erlang_test.
+stop(_State) ->
+    ok.

buildpacks/buildpack-erlang/tests/erlang/src/erlang_test_resource.erl

@@ -0,0 +1,13 @@
+%% @author author <[email protected]>
+%% @copyright YYYY author.
+%% @doc Example webmachine_resource.
+
+-module(erlang_test_resource).
+-export([init/1, to_html/2]).
+
+-include_lib("webmachine/include/webmachine.hrl").
+
+init([]) -> {ok, undefined}.
+
+to_html(ReqData, State) ->
+    {"erlang", ReqData, State}.

buildpacks/buildpack-erlang/tests/erlang/src/erlang_test_sup.erl

@@ -0,0 +1,57 @@
+%% @author author <[email protected]>
+%% @copyright YYYY author.
+
+%% @doc Supervisor for the erlang_test application.
+
+-module(erlang_test_sup).
+-author('author <[email protected]>').
+
+-behaviour(supervisor).
+
+%% External exports
+-export([start_link/0, upgrade/0]).
+
+%% supervisor callbacks
+-export([init/1]).
+
+%% @spec start_link() -> ServerRet
+%% @doc API for starting the supervisor.
+start_link() ->
+    supervisor:start_link({local, ?MODULE}, ?MODULE, []).
+
+%% @spec upgrade() -> ok
+%% @doc Add processes if necessary.
+upgrade() ->
+    {ok, {_, Specs}} = init([]),
+
+    Old = sets:from_list(
+            [Name || {Name, _, _, _} <- supervisor:which_children(?MODULE)]),
+    New = sets:from_list([Name || {Name, _, _, _, _, _} <- Specs]),
+    Kill = sets:subtract(Old, New),
+
+    sets:fold(fun (Id, ok) ->
+                      supervisor:terminate_child(?MODULE, Id),
+                      supervisor:delete_child(?MODULE, Id),
+                      ok
+              end, ok, Kill),
+
+    [supervisor:start_child(?MODULE, Spec) || Spec <- Specs],
+    ok.
+
+%% @spec init([]) -> SupervisorTree
+%% @doc supervisor callback.
+init([]) ->
+    Ip = case os:getenv("WEBMACHINE_IP") of false -> "0.0.0.0"; Any -> Any end,
+    {ok, Dispatch} = file:consult(filename:join(
+                         [filename:dirname(code:which(?MODULE)),
+                          "..", "priv", "dispatch.conf"])),
+    Port = list_to_integer(os:getenv("PORT")),
+    WebConfig = [
+                 {ip, Ip},
+                 {port, Port},
+                 {dispatch, Dispatch}],
+    Web = {webmachine_mochiweb,
+           {webmachine_mochiweb, start, [WebConfig]},
+           permanent, 5000, worker, [mochiweb_socket_server]},
+    Processes = [Web],
+    {ok, { {one_for_one, 10, 10}, Processes} }.

buildpacks/buildpack-erlang/tests/erlang/test.sh

@@ -0,0 +1,2 @@
+source "$(dirname $BASH_SOURCE)/../../../test"
+app-test "$(basename $(dirname $BASH_SOURCE))"

buildpacks/buildpack-go/buildpack-version

@@ -1 +1 @@
-v22
+v31

buildpacks/buildpack-grails/buildpack-version

@@ -1 +1 @@
-v19
+v20

buildpacks/buildpack-java/buildpack-version

@@ -1 +1 @@
-v42
+v44

buildpacks/buildpack-nodejs/buildpack-version

@@ -1 +1 @@
-v87
+v88

buildpacks/buildpack-php/buildpack-version

@@ -1 +1 @@
-v90
+v95

buildpacks/buildpack-play/buildpack-version

@@ -1 +1 @@
-v24
+v26

buildpacks/buildpack-python/buildpack-version

@@ -1 +1 @@
-v74
+v77

buildpacks/buildpack-ruby/buildpack-version

@@ -1 +1 @@
-v141
+v145

buildpacks/buildpack-scala/buildpack-version

@@ -1 +1 @@
-v64
+v66

include/buildpack.bash

@@ -109,6 +109,19 @@ buildpack-execute() {
 	if [[ -f "$selected_path/bin/release" ]]; then
 		unprivileged "$selected_path/bin/release" "$build_path" "$cache_path" > "$build_path/.release"
 	fi
+	if [[ -f "$build_path/.release" ]]; then
+		cat "$build_path/.release"
+		config_vars="$(cat $build_path/.release | yaml-get config_vars)"
+		if [[ "$config_vars" ]]; then
+			mkdir -p $build_path/.profile.d
+			OIFS=$IFS
+			IFS=$'\n'
+			for var in $config_vars; do
+				echo "export $(echo $var | sed -e 's/=/="/' -e 's/$/"/')" >> "$build_path/.profile.d/00_config_vars.sh"
+			done
+			IFS=$OIFS
+		fi
+	fi
 	cd - > /dev/null
 
 	shopt -s dotglob nullglob

include/procfile.bash

@@ -88,5 +88,5 @@ procfile-load-profile() {
 procfile-setup-home() {
 	export HOME="$app_path"
 	usermod --home "$app_path" "$unprivileged_user" > /dev/null 2>&1
-	chown -R "$unprivileged_user:$unprivileged_group" "$app_path"
+	find $app_path \( \! -user $unprivileged_user -o \! -group $unprivileged_group \) -print0 | xargs -0 -r chown "$unprivileged_user:$unprivileged_group"
 }