Merge remote-tracking branch 'support-heroku-16-stack-image'

AVDiv · Oct 24, 2017 · bfd1f65 · bfd1f65
2 parents f154cc0 + f580fa5
commit bfd1f65
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -1,11 +1,13 @@
-build: build-cedar-14
+build: build-cedar-14 build-heroku-16
 
 build-cedar-14:
 	@echo "Building Nginx in docker for cedar-14..."
-	@docker run -v $(shell pwd):/buildpack --rm -it -e "STACK=cedar-14" heroku/cedar:14 bash -c 'cd /buildpack; scripts/build_nginx /buildpack/bin/nginx-cedar-14'
-	@echo ""
+	@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
+
+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
 
 shell:
-	@echo "Opening cedar-14 shell..."
-	@docker run -v $(shell pwd):/buildpack --rm -it -e "STACK=cedar-14" -e "PORT=5000" heroku/cedar:14 bash -c 'cd /buildpack; bash'
-	@echo ""
+	@echo "Opening heroku-16 shell..."
+	@docker run -v $(shell pwd):/buildpack --rm -it -e "STACK=heroku-16" -e "PORT=5000" -w /buildpack heroku/heroku:16 bash
diff --git a/bin/nginx-heroku-16 b/bin/nginx-heroku-16