Merge pull request heroku#8 from heroku/tt/support-heroku-18-stack-image

Support Heroku-18 stack image
AVDiv · Sep 12, 2018 · d9da075 · d9da075
2 parents bfd1f65 + 628aba7
commit d9da075
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -1,12 +1,16 @@
-build: build-cedar-14 build-heroku-16
+build: build-cedar-14 build-heroku-16 build-heroku-18
 
 build-cedar-14:
-	@echo "Building Nginx in docker for cedar-14..."
-	@docker run -v $(shell pwd):/buildpack --rm -it -e "STACK=cedar-14" -w /buildpack heroku/cedar:14 scripts/build_nginx /buildpack/bin/nginx-cedar-14
+	@echo "Building nginx in Docker for cedar-14..."
+	@docker run -v $(shell pwd):/buildpack --rm -it -e "STACK=cedar-14" -e "NGINX_VERSION=1.9.5" -w /buildpack heroku/cedar:14 scripts/build_nginx /buildpack/bin/nginx-cedar-14
 
 build-heroku-16:
-	@echo "Building Nginx in docker for heroku-16..."
-	@docker run -v $(shell pwd):/buildpack --rm -it -e "STACK=heroku-16" -w /buildpack heroku/heroku:16-build scripts/build_nginx /buildpack/bin/nginx-heroku-16
+	@echo "Building nginx in Docker for heroku-16..."
+	@docker run -v $(shell pwd):/buildpack --rm -it -e "STACK=heroku-16" -e "NGINX_VERSION=1.9.5" -w /buildpack heroku/heroku:16-build scripts/build_nginx /buildpack/bin/nginx-heroku-16
+
+build-heroku-18:
+	@echo "Building nginx in Docker for heroku-18..."
+	@docker run -v $(shell pwd):/buildpack --rm -it -e "STACK=heroku-18" -e "NGINX_VERSION=1.14.0" -e "PCRE_VERSION=8.42" -w /buildpack heroku/heroku:18-build scripts/build_nginx /buildpack/bin/nginx-heroku-18
 
 shell:
 	@echo "Opening heroku-16 shell..."

diff --git a/bin/nginx-heroku-18 b/bin/nginx-heroku-18