Skip to content

Commit c111649

Browse files
michaelshobbsmichaelshobbs
committed
Merge pull request #130 from gliderlabs/master
release 0.3.9
2 parents 6a3ed3e + e316d6a commit c111649

30 files changed

+216
-16
lines changed

‎CHANGELOG.md

+27-1
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,36 @@ All notable changes to this project will be documented in this file.
1010

1111
### Changed
1212

13+
14+
## [0.3.9] - 2016-03-08
15+
### Fixed
16+
- @graphaelli clean up link warning
17+
18+
### Added
19+
- @michaelshobbs extract config_vars from .release
20+
21+
### Changed
22+
- @singlow singlow use find to identify only files not already owned by user
23+
- @michaelshobbs Update clojure to version v75
24+
- @michaelshobbs Update grails to version v20
25+
- @michaelshobbs Update java to version v44
26+
- @michaelshobbs Update nodejs to version v88
27+
- @michaelshobbs Update play to version v26
28+
- @michaelshobbs Update python to version v77
29+
- @michaelshobbs Update ruby to version v145
30+
- @michaelshobbs Update scala to version v66
31+
- @michaelshobbs Update php to version v95
32+
- @michaelshobbs Update go to version v31
33+
- @michaelshobbs upgrade to go1.6
34+
35+
1336
## [0.3.8] - 2016-01-06
1437
### Changed
1538
- @josegonzalez Upgrade gradle buildpack version to 17
1639
- @josegonzalez Update java buildpack version to 42
1740
- @josegonzalez Update scala buildpack version to 64
1841

42+
1943
## [0.3.7] - 2015-12-31
2044
### Fixed
2145
- @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.
2953
- @CEikermann Updated buildpack-php to v90
3054
- @josegonzalez Upgrade python buildpack to v74
3155

56+
3257
## [0.3.6] - 2015-12-14
3358
### Changed
3459
- Update php buildpack to version 87
@@ -148,7 +173,8 @@ All notable changes to this project will be documented in this file.
148173
- User for `buildpack-build` is `$USER` or randomized
149174
- User for `procfile-exec` is `$USER` or detected from `/app`
150175

151-
[unreleased]: https://github.com/gliderlabs/herokuish/compare/v0.3.8...HEAD
176+
[unreleased]: https://github.com/gliderlabs/herokuish/compare/v0.3.9...HEAD
177+
[0.3.9]: https://github.com/gliderlabs/herokuish/compare/v0.3.8...v0.3.9
152178
[0.3.8]: https://github.com/gliderlabs/herokuish/compare/v0.3.7...v0.3.8
153179
[0.3.7]: https://github.com/gliderlabs/herokuish/compare/v0.3.6...v0.3.7
154180
[0.3.6]: https://github.com/gliderlabs/herokuish/compare/v0.3.5...v0.3.6

‎Dockerfile

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

‎Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
NAME = herokuish
22
HARDWARE = $(shell uname -m)
3-
VERSION ?= 0.3.8
3+
VERSION ?= 0.3.9
44
IMAGE_NAME ?= $(NAME)
55
BUILD_TAG ?= dev
66

77
build:
88
cat buildpacks/*/buildpack* | sed 'N;s/\n/ /' > include/buildpacks.txt
99
go-bindata include
10-
mkdir -p build/linux && GOOS=linux go build -a -ldflags "-X main.Version $(VERSION)" -o build/linux/$(NAME)
11-
mkdir -p build/darwin && GOOS=darwin go build -a -ldflags "-X main.Version $(VERSION)" -o build/darwin/$(NAME)
10+
mkdir -p build/linux && GOOS=linux go build -a -ldflags "-X main.Version=$(VERSION)" -o build/linux/$(NAME)
11+
mkdir -p build/darwin && GOOS=darwin go build -a -ldflags "-X main.Version=$(VERSION)" -o build/darwin/$(NAME)
1212
ifeq ($(CIRCLECI),true)
1313
docker build -t $(IMAGE_NAME):$(BUILD_TAG) .
1414
else

‎buildpacks/buildpack-clojure/buildpack-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v73
1+
v75

‎buildpacks/buildpack-erlang/buildpack-url

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
https://github.com/heroku/heroku-buildpack-erlang

‎buildpacks/buildpack-erlang/buildpack-version

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
fa17af9

‎buildpacks/buildpack-erlang/tests/erlang/Procfile

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

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

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
%%-*- mode: erlang -*-
2+
{[], erlang_test_resource, []}.

‎buildpacks/buildpack-erlang/tests/erlang/rebar

132 KB
Binary file not shown.

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

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

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

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
%%-*- mode: erlang -*-
2+
{application, erlang_test,
3+
[
4+
{description, "erlang_test"},
5+
{vsn, "1"},
6+
{modules, []},
7+
{registered, []},
8+
{applications, [
9+
kernel,
10+
stdlib,
11+
inets,
12+
crypto,
13+
mochiweb,
14+
webmachine
15+
]},
16+
{mod, { erlang_test_app, []}},
17+
{env, []}
18+
]}.

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

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
%% @author author <[email protected]>
2+
%% @copyright YYYY author.
3+
4+
%% @doc erlang_test startup code
5+
6+
-module(erlang_test).
7+
-author('author <[email protected]>').
8+
-export([start/0, start_link/0, stop/0]).
9+
10+
%% @spec start_link() -> {ok,Pid::pid()}
11+
%% @doc Starts the app for inclusion in a supervisor tree
12+
start_link() ->
13+
application:set_env(webmachine, webmachine_logger_module,
14+
webmachine_logger),
15+
application:ensure_all_started(webmachine),
16+
erlang_test_sup:start_link().
17+
18+
%% @spec start() -> ok
19+
%% @doc Start the erlang_test server.
20+
start() ->
21+
application:set_env(webmachine, webmachine_logger_module,
22+
webmachine_logger),
23+
application:ensure_all_started(webmachine),
24+
application:start(erlang_test).
25+
26+
%% @spec stop() -> ok
27+
%% @doc Stop the erlang_test server.
28+
stop() ->
29+
application:stop(erlang_test).

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

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
%% @author author <[email protected]>
2+
%% @copyright YYYY author.
3+
4+
%% @doc Callbacks for the erlang_test application.
5+
6+
-module(erlang_test_app).
7+
-author('author <[email protected]>').
8+
9+
-behaviour(application).
10+
-export([start/2,stop/1]).
11+
12+
13+
%% @spec start(_Type, _StartArgs) -> ServerRet
14+
%% @doc application start callback for erlang_test.
15+
start(_Type, _StartArgs) ->
16+
erlang_test_sup:start_link().
17+
18+
%% @spec stop(_State) -> ServerRet
19+
%% @doc application stop callback for erlang_test.
20+
stop(_State) ->
21+
ok.

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

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
%% @author author <[email protected]>
2+
%% @copyright YYYY author.
3+
%% @doc Example webmachine_resource.
4+
5+
-module(erlang_test_resource).
6+
-export([init/1, to_html/2]).
7+
8+
-include_lib("webmachine/include/webmachine.hrl").
9+
10+
init([]) -> {ok, undefined}.
11+
12+
to_html(ReqData, State) ->
13+
{"erlang", ReqData, State}.

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

+57
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
%% @author author <[email protected]>
2+
%% @copyright YYYY author.
3+
4+
%% @doc Supervisor for the erlang_test application.
5+
6+
-module(erlang_test_sup).
7+
-author('author <[email protected]>').
8+
9+
-behaviour(supervisor).
10+
11+
%% External exports
12+
-export([start_link/0, upgrade/0]).
13+
14+
%% supervisor callbacks
15+
-export([init/1]).
16+
17+
%% @spec start_link() -> ServerRet
18+
%% @doc API for starting the supervisor.
19+
start_link() ->
20+
supervisor:start_link({local, ?MODULE}, ?MODULE, []).
21+
22+
%% @spec upgrade() -> ok
23+
%% @doc Add processes if necessary.
24+
upgrade() ->
25+
{ok, {_, Specs}} = init([]),
26+
27+
Old = sets:from_list(
28+
[Name || {Name, _, _, _} <- supervisor:which_children(?MODULE)]),
29+
New = sets:from_list([Name || {Name, _, _, _, _, _} <- Specs]),
30+
Kill = sets:subtract(Old, New),
31+
32+
sets:fold(fun (Id, ok) ->
33+
supervisor:terminate_child(?MODULE, Id),
34+
supervisor:delete_child(?MODULE, Id),
35+
ok
36+
end, ok, Kill),
37+
38+
[supervisor:start_child(?MODULE, Spec) || Spec <- Specs],
39+
ok.
40+
41+
%% @spec init([]) -> SupervisorTree
42+
%% @doc supervisor callback.
43+
init([]) ->
44+
Ip = case os:getenv("WEBMACHINE_IP") of false -> "0.0.0.0"; Any -> Any end,
45+
{ok, Dispatch} = file:consult(filename:join(
46+
[filename:dirname(code:which(?MODULE)),
47+
"..", "priv", "dispatch.conf"])),
48+
Port = list_to_integer(os:getenv("PORT")),
49+
WebConfig = [
50+
{ip, Ip},
51+
{port, Port},
52+
{dispatch, Dispatch}],
53+
Web = {webmachine_mochiweb,
54+
{webmachine_mochiweb, start, [WebConfig]},
55+
permanent, 5000, worker, [mochiweb_socket_server]},
56+
Processes = [Web],
57+
{ok, { {one_for_one, 10, 10}, Processes} }.

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

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
source "$(dirname $BASH_SOURCE)/../../../test"
2+
app-test "$(basename $(dirname $BASH_SOURCE))"

‎buildpacks/buildpack-go/buildpack-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v22
1+
v31

‎buildpacks/buildpack-go/tests/go/Godeps/Godeps.json

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎buildpacks/buildpack-go/tests/go/Godeps/Readme

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎buildpacks/buildpack-go/tests/go/web.go ‎buildpacks/buildpack-go/tests/go/cmd/web/main.go

File renamed without changes.

‎buildpacks/buildpack-grails/buildpack-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v19
1+
v20

‎buildpacks/buildpack-java/buildpack-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v42
1+
v44

‎buildpacks/buildpack-nodejs/buildpack-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v87
1+
v88

‎buildpacks/buildpack-php/buildpack-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v90
1+
v95

‎buildpacks/buildpack-play/buildpack-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v24
1+
v26

‎buildpacks/buildpack-python/buildpack-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v74
1+
v77

‎buildpacks/buildpack-ruby/buildpack-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v141
1+
v145

‎buildpacks/buildpack-scala/buildpack-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v64
1+
v66

‎include/buildpack.bash

+13
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,19 @@ buildpack-execute() {
109109
if [[ -f "$selected_path/bin/release" ]]; then
110110
unprivileged "$selected_path/bin/release" "$build_path" "$cache_path" > "$build_path/.release"
111111
fi
112+
if [[ -f "$build_path/.release" ]]; then
113+
cat "$build_path/.release"
114+
config_vars="$(cat $build_path/.release | yaml-get config_vars)"
115+
if [[ "$config_vars" ]]; then
116+
mkdir -p $build_path/.profile.d
117+
OIFS=$IFS
118+
IFS=$'\n'
119+
for var in $config_vars; do
120+
echo "export $(echo $var | sed -e 's/=/="/' -e 's/$/"/')" >> "$build_path/.profile.d/00_config_vars.sh"
121+
done
122+
IFS=$OIFS
123+
fi
124+
fi
112125
cd - > /dev/null
113126

114127
shopt -s dotglob nullglob

‎include/procfile.bash

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

0 commit comments

Comments
 (0)