Merge pull request #345 from gliderlabs/master

release v0.4.0

Author: michaelshobbs

CHANGELOG.md

@@ -10,6 +10,18 @@ All notable changes to this project will be documented in this file.
 
 ### Changed
 
+## [0.4.0] - 2018-03-10
+### Changed
+- @michaelshobbs pin docker version for local build target
+- @iSDP move base image to heroku16
+- @miyucy Respect STACK envvar
+- @michaelshobbs use newer version of ruby compatible with heroku-16 in test apps
+
+### Removed
+- @michaelshobbs remove erlang from buildpack bundle
+
+**NOTE: v0.4.0 is now based on heroku-16**
+
 ## [0.3.36] - 2018-03-10
 ### Changed
 - @josegonzalez fix: retrieve only valid process types
@@ -451,7 +463,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.36...HEAD
+[unreleased]: https://github.com/gliderlabs/herokuish/compare/v0.4.0...HEAD
+[0.4.0]: https://github.com/gliderlabs/herokuish/compare/v0.3.36...v0.4.0
 [0.3.36]: https://github.com/gliderlabs/herokuish/compare/v0.3.35...v0.3.36
 [0.3.35]: https://github.com/gliderlabs/herokuish/compare/v0.3.34...v0.3.35
 [0.3.34]: https://github.com/gliderlabs/herokuish/compare/v0.3.33...v0.3.34

Dockerfile

@@ -1,10 +1,21 @@
-FROM heroku/cedar:14
-RUN curl "https://github.com/gliderlabs/herokuish/releases/download/v0.3.36/herokuish_0.3.36_linux_x86_64.tgz" \
-		--silent -L | tar -xzC /bin
-RUN apt-get update && apt-get -qq -y --force-yes dist-upgrade && apt-get clean && rm -rf /var/cache/apt/archives/*
+FROM heroku/heroku:16-build
+
+ENV DEBIAN_FRONTEND noninteractive
+
+RUN apt-get update -qq \
+ && apt-get install -qq -y daemontools \
+ && apt-get -qq -y \
+    --allow-downgrades \
+    --allow-remove-essential \
+    --allow-change-held-packages \
+    dist-upgrade \
+ && apt-get clean \
+ && rm -rf /var/cache/apt/archives/* /var/lib/apt/lists/* /var/tmp/*
+RUN curl "https://github.com/gliderlabs/herokuish/releases/download/v0.4.0/herokuish_0.4.0_linux_x86_64.tgz" \
+    --silent -L | tar -xzC /bin
 RUN /bin/herokuish buildpack install \
-	&& ln -s /bin/herokuish /build \
-	&& ln -s /bin/herokuish /start \
-	&& ln -s /bin/herokuish /exec
+  && ln -s /bin/herokuish /build \
+  && ln -s /bin/herokuish /start \
+  && ln -s /bin/herokuish /exec
 COPY include/default_user.bash /tmp/default_user.bash
 RUN bash /tmp/default_user.bash && rm -f /tmp/default_user.bash

Dockerfile.build

@@ -1,2 +1,17 @@
 FROM golang:1.8.3
-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
+
+ENV DEBIAN_FRONTEND noninteractive
+
+RUN apt-get update -qq \
+ && apt-get install -qq -y --force-yes \
+     apt-transport-https \
+     apt-utils \
+     ca-certificates \
+     curl \
+     gnupg2 \
+     software-properties-common \
+ && curl -fsSL https://download.docker.com/linux/$(. /etc/os-release; echo "$ID")/gpg | apt-key add - \
+ && add-apt-repository \
+   "deb [arch=amd64] https://download.docker.com/linux/$(. /etc/os-release; echo "$ID") $(lsb_release -cs) stable"
+RUN apt-get update -qq \
+ && apt-get install -qq -y --force-yes docker-ce=17.12.0~ce-0~debian

Dockerfile.dev

@@ -1,4 +1,11 @@
-FROM heroku/cedar:14
+FROM heroku/heroku:16-build
+
+ENV DEBIAN_FRONTEND noninteractive
+
+RUN apt-get update -qq \
+ && apt-get install -qq -y daemontools \
+ && apt-get clean \
+ && rm -rf /var/cache/apt/archives/* /var/lib/apt/lists/* /var/tmp/*
 COPY ./build/linux/herokuish /bin/herokuish
 RUN /bin/herokuish buildpack install \
 	&& ln -s /bin/herokuish /build \

Makefile

@@ -1,10 +1,10 @@
 NAME = herokuish
 HARDWARE = $(shell uname -m)
-VERSION ?= 0.3.36
+VERSION ?= 0.4.0
 IMAGE_NAME ?= $(NAME)
 BUILD_TAG ?= dev
 
-BUILDPACK_ORDER := multi ruby nodejs clojure python java gradle scala play php go erlang static
+BUILDPACK_ORDER := multi ruby nodejs clojure python java gradle scala play php go static
 SHELL := /bin/bash
 
 shellcheck:
@@ -49,7 +49,7 @@ clean:
 	docker rmi herokuish:dev || true
 
 deps:
-	docker pull heroku/cedar:14
+	docker pull heroku/heroku:16-build
 	go get -u github.com/jteeuwen/go-bindata/...
 	go get -u github.com/progrium/gh-release/...
 	go get -u github.com/progrium/basht/...

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.36/herokuish_0.3.36_linux_x86_64.tgz \
+RUN curl --location --silent https://github.com/gliderlabs/herokuish/releases/download/v0.4.0/herokuish_0.4.0_linux_x86_64.tgz \
 		  | tar -xzC /bin
 ```
 

buildpacks/buildpack-erlang/buildpack-url

@@ -1,4 +1,4 @@
 source 'http://rubygems.org'
-ruby '1.9.3'
+ruby '2.2.4'
 gem 'sinatra'
 gem 'rack'

buildpacks/buildpack-erlang/buildpack-version

@@ -0,0 +1,10 @@
+# This file is a "template" of which env vars need to be defined for your application
+# Copy this file to .env file for development, create environment variables when deploying to production
+# https://symfony.com/doc/current/best_practices/configuration.html#infrastructure-related-configuration
+
+###> symfony/framework-bundle ###
+APP_ENV=prod
+APP_SECRET=de0037b670fbb54d927eeba1182df23f
+#TRUSTED_PROXIES=127.0.0.1,127.0.0.2
+#TRUSTED_HOSTS=localhost,example.com
+###< symfony/framework-bundle ###

buildpacks/buildpack-erlang/tests/erlang/Procfile

@@ -0,0 +1 @@
+web: $(composer config bin-dir)/heroku-php-nginx -C nginx.conf public/