Merge pull request #24 from kingdonb/fix-build-detection-2

fix(slugbuilder): really fix buildpack detection
teamhephy · Dec 30, 2020 · 3187fa8 · 3187fa8
2 parents a01e637 + b4c53b6
commit 3187fa8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/rootfs/builder/build.sh b/rootfs/builder/build.sh
@@ -123,7 +123,7 @@ fi
 ## Buildpack detection
 
 # shellcheck disable=SC2206
-buildpacks=(${buildpack_root/*})
+buildpacks=(${buildpack_root}/*)
 selected_buildpack=
 
 if [[ -n "$BUILDPACK_URL" ]]; then

diff --git a/rootfs/builder/install-buildpacks b/rootfs/builder/install-buildpacks
@@ -29,14 +29,14 @@ download_buildpack() {
 mkdir -p $BUILDPACK_INSTALL_PATH
 
 download_buildpack https://github.com/heroku/heroku-buildpack-multi.git          v1.0.0   01-multi
-download_buildpack https://github.com/heroku/heroku-buildpack-clojure.git        v85      02-clojure
-download_buildpack https://github.com/heroku/heroku-buildpack-go.git             v140     03-go
-download_buildpack https://github.com/heroku/heroku-buildpack-gradle.git         v31      04-gradle
+download_buildpack https://github.com/heroku/heroku-buildpack-clojure.git        v86      02-clojure
+download_buildpack https://github.com/heroku/heroku-buildpack-go.git             v149     03-go
+download_buildpack https://github.com/heroku/heroku-buildpack-gradle.git         v33      04-gradle
 download_buildpack https://github.com/heroku/heroku-buildpack-grails.git         v21      05-grails
-download_buildpack https://github.com/heroku/heroku-buildpack-java.git           v66      06-java
-download_buildpack https://github.com/heroku/heroku-buildpack-nodejs.git         v176     07-nodejs
-download_buildpack https://github.com/heroku/heroku-buildpack-php.git            v181     08-php
+download_buildpack https://github.com/heroku/heroku-buildpack-java.git           v68      06-java
+download_buildpack https://github.com/heroku/heroku-buildpack-nodejs.git         v181     07-nodejs
+download_buildpack https://github.com/heroku/heroku-buildpack-php.git            v187     08-php
 download_buildpack https://github.com/heroku/heroku-buildpack-play.git           v26      09-play
-download_buildpack https://github.com/heroku/heroku-buildpack-python.git         v181     10-python
-download_buildpack https://github.com/heroku/heroku-buildpack-ruby.git           v218     11-ruby
-download_buildpack https://github.com/heroku/heroku-buildpack-scala.git          v87      12-scala
+download_buildpack https://github.com/heroku/heroku-buildpack-python.git         v187     10-python
+download_buildpack https://github.com/heroku/heroku-buildpack-ruby.git           v222     11-ruby
+download_buildpack https://github.com/heroku/heroku-buildpack-scala.git          v88      12-scala