From 05a0afd87f60907ac5b95a1bb7723531a408d138 Mon Sep 17 00:00:00 2001 From: Magnus Nordlander Date: Wed, 23 Mar 2016 23:57:43 +0100 Subject: [PATCH 1/3] Updated Heroku instructions With the newer versions of the Heroku toolbelt, multiple buildpacks is supported by default. --- cookbook/deployment/heroku.rst | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/cookbook/deployment/heroku.rst b/cookbook/deployment/heroku.rst index 0bb743fada1..5589a60f02e 100644 --- a/cookbook/deployment/heroku.rst +++ b/cookbook/deployment/heroku.rst @@ -305,20 +305,20 @@ This is also very useful to build assets on the production system, e.g. with Ass With the next deploy, Heroku compiles your app using the Node.js buildpack and your npm packages become installed. On the other hand, your ``composer.json`` is - now ignored. To compile your app with both buildpacks, Node.js *and* PHP, you can - use a special `multiple buildpack`_. To override buildpack auto-detection, you + now ignored. To compile your app with both buildpacks, Node.js *and* PHP, you need + use both buildpacks. To override buildpack auto-detection, you need to explicitly set the buildpack URL: .. code-block:: bash - $ heroku buildpacks:set https://github.com/ddollar/heroku-buildpack-multi.git - - Next, add a ``.buildpacks`` file to your project, listing the buildpacks you need: - - .. code-block:: text - - https://github.com/heroku/heroku-buildpack-nodejs.git - https://github.com/heroku/heroku-buildpack-php.git + $ heroku buildpacks:set heroku/nodejs + Buildpack set. Next release on your-application will use heroku/nodejs. + Run git push heroku master to create a new release using this buildpack. + $ heroku buildpacks:set heroku/php --index 2 + Buildpack set. Next release on your-application will use: + 1. heroku/nodejs + 2. heroku/php + Run git push heroku master to create a new release using these buildpacks. With the next deploy, you can benefit from both buildpacks. This setup also enables your Heroku environment to make use of node based automatic build tools like From 44e44f9c1bd25a129de9ceb3e177d45d9be9d5c2 Mon Sep 17 00:00:00 2001 From: Magnus Nordlander Date: Thu, 24 Mar 2016 09:56:20 +0100 Subject: [PATCH 2/3] Comment updates --- cookbook/deployment/heroku.rst | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cookbook/deployment/heroku.rst b/cookbook/deployment/heroku.rst index 5589a60f02e..918edab1888 100644 --- a/cookbook/deployment/heroku.rst +++ b/cookbook/deployment/heroku.rst @@ -307,7 +307,7 @@ This is also very useful to build assets on the production system, e.g. with Ass your npm packages become installed. On the other hand, your ``composer.json`` is now ignored. To compile your app with both buildpacks, Node.js *and* PHP, you need use both buildpacks. To override buildpack auto-detection, you - need to explicitly set the buildpack URL: + need to explicitly set the buildpack: .. code-block:: bash @@ -336,7 +336,6 @@ This is also very useful to build assets on the production system, e.g. with Ass .. _`custom compile steps`: https://devcenter.heroku.com/articles/php-support#custom-compile-step .. _`custom Composer command`: https://getcomposer.org/doc/articles/scripts.md#writing-custom-commands .. _`Heroku buildpacks`: https://devcenter.heroku.com/articles/buildpacks -.. _`multiple buildpack`: https://github.com/ddollar/heroku-buildpack-multi .. _`Grunt`: http://gruntjs.com .. _`gulp`: http://gulpjs.com .. _`Heroku documentation`: https://devcenter.heroku.com/articles/custom-php-settings#nginx From 204425c122da333cc8aa697dbb1faaaf11ca23d4 Mon Sep 17 00:00:00 2001 From: Magnus Nordlander Date: Thu, 31 Mar 2016 00:31:58 +0200 Subject: [PATCH 3/3] Fixed grammatical error --- cookbook/deployment/heroku.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cookbook/deployment/heroku.rst b/cookbook/deployment/heroku.rst index 918edab1888..b07ae033ad7 100644 --- a/cookbook/deployment/heroku.rst +++ b/cookbook/deployment/heroku.rst @@ -305,8 +305,8 @@ This is also very useful to build assets on the production system, e.g. with Ass With the next deploy, Heroku compiles your app using the Node.js buildpack and your npm packages become installed. On the other hand, your ``composer.json`` is - now ignored. To compile your app with both buildpacks, Node.js *and* PHP, you need - use both buildpacks. To override buildpack auto-detection, you + now ignored. To compile your app with both buildpacks, Node.js *and* PHP, you need + to use both buildpacks. To override buildpack auto-detection, you need to explicitly set the buildpack: .. code-block:: bash