Merge pull request #86 from gliderlabs/master

release 0.3.5

Author: michaelshobbs

CHANGELOG.md

@@ -10,6 +10,18 @@ All notable changes to this project will be documented in this file.
 
 ### Changed
 
+
+## [0.3.5] - 2015-11-25
+### Added
+- Add static buildpack and test
+
+### Changed
+ - Increased CURL_TIMEOUT env var in buildpacks from the default 30 to 180
+ - Update python buildpack to v70
+ - Update static buildpack to v5
+ - Update local build env to docker 1.9.1
+
+
 ## [0.3.4] - 2015-10-23
 ### Changed
 - Upgrade clojure buildpack to version 70
@@ -21,6 +33,7 @@ All notable changes to this project will be documented in this file.
 - Update ruby buildpack to version 140
 - Update scala buildpack to version 63
 
+
 ## [0.3.3] - 2015-09-10
 ### Added
 - Use exec to run procfile entries
@@ -104,7 +117,9 @@ 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.3...HEAD
+[unreleased]: https://github.com/gliderlabs/herokuish/compare/v0.3.5...HEAD
+[0.3.5]: https://github.com/gliderlabs/herokuish/compare/v0.3.4...v0.3.5
+[0.3.4]: https://github.com/gliderlabs/herokuish/compare/v0.3.3...v0.3.4
 [0.3.3]: https://github.com/gliderlabs/herokuish/compare/v0.3.2...v0.3.3
 [0.3.2]: https://github.com/gliderlabs/herokuish/compare/v0.3.1...v0.3.2
 [0.3.1]: https://github.com/gliderlabs/herokuish/compare/v0.3.0...v0.3.1

Dockerfile

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

Dockerfile.build

@@ -1,2 +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
+RUN curl -s -o - https://get.docker.com/builds/Linux/x86_64/docker-1.9.1 > /usr/local/bin/docker && chmod +x /usr/local/bin/docker

Makefile

@@ -1,6 +1,6 @@
 NAME = herokuish
 HARDWARE = $(shell uname -m)
-VERSION ?= 0.3.4
+VERSION ?= 0.3.5
 IMAGE_NAME ?= $(NAME)
 BUILD_TAG ?= dev
 
@@ -16,8 +16,9 @@ else
 endif
 
 build-in-docker:
-	docker build -f Dockerfile.build -t $(NAME)-build .
-	docker run --rm -v /var/run/docker.sock:/var/run/docker.sock \
+	docker build --rm -f Dockerfile.build -t $(NAME)-build .
+	docker run --rm -v /var/run/docker.sock:/var/run/docker.sock:ro \
+		-v /var/lib/docker:/var/lib/docker \
 		-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

buildpacks/buildpack-python/buildpack-version

@@ -1 +1 @@
-v68
+v70

buildpacks/buildpack-static/buildpack-url

@@ -0,0 +1 @@
+https://github.com/dokku/buildpack-nginx

buildpacks/buildpack-static/buildpack-version

@@ -0,0 +1 @@
+v5

buildpacks/buildpack-static/tests/static/.static

@@ -0,0 +1 @@
+static

buildpacks/buildpack-static/tests/static/index.html

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

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

@@ -60,6 +60,8 @@ buildpack-setup() {
 
 	# Useful settings / features
 	export CURL_CONNECT_TIMEOUT="30"
+	export CURL_TIMEOUT="180"
+
 
 	# Buildstep backwards compatibility
 	if [[ -f "$app_path/.env" ]]; then