From a801592b56aec9e2f031155ab1a8567750420f4d Mon Sep 17 00:00:00 2001 From: Michael Hobbs Date: Mon, 20 Apr 2015 16:41:23 -0700 Subject: [PATCH] [ci skip] update missed doc refs to buildstep --- docs/application-deployment.md | 4 ++-- docs/troubleshooting.md | 20 -------------------- tests/apps/multi/README.md | 2 +- 3 files changed, 3 insertions(+), 23 deletions(-) diff --git a/docs/application-deployment.md b/docs/application-deployment.md index 9ca0663ab..c463cb98a 100644 --- a/docs/application-deployment.md +++ b/docs/application-deployment.md @@ -25,7 +25,7 @@ You're done! Dokku only supports deploying from its master branch, so if you'd like to deploy a different local branch use: ```git push dokku :master``` -Right now Herokuish supports buildpacks for Node.js, Ruby, Python, [and more](https://github.com/gliderlabs/herokuish#buildpacks). It's not hard to add more, [go add more](https://github.com/progrium/buildstep#adding-buildpacks)! +Right now Herokuish supports buildpacks for Node.js, Ruby, Python, [and more](https://github.com/gliderlabs/herokuish#buildpacks). Please check the documentation for your particular build pack as you may need to include configuration files (such as a Procfile) in your project root. ## Deploying to server over SSH @@ -48,7 +48,7 @@ ssh -T git@github.com ## Specifying a custom buildpack -If buildpack detection isn't working well for you or you want to specify a custom buildpack for one repository you can create & commit a file in the root of your git repository named `.env` containing `export BUILDPACK_URL=` before pushing. This will tell buildstep to fetch the specified buildpack and use it instead of relying on the built-in buildpacks & their detection methods. +If buildpack detection isn't working well for you or you want to specify a custom buildpack for one repository you can create & commit a file in the root of your git repository named `.env` containing `export BUILDPACK_URL=` before pushing. This will tell herokuish to fetch the specified buildpack and use it instead of relying on the built-in buildpacks & their detection methods. ## Dockerfile deployment diff --git a/docs/troubleshooting.md b/docs/troubleshooting.md index 5b31486d5..80e05ff22 100644 --- a/docs/troubleshooting.md +++ b/docs/troubleshooting.md @@ -109,26 +109,6 @@ Also see [issue #116](https://github.com/progrium/dokku/issues/116) *** -__Symptom:__ I want to deploy my nodejs app on dokku and use a postinstall script within the package.json but I keep getting this error: - - npm WARN cannot run in wd app@1.0.0 echo blah (wd=/build/app) - -__Solution:__ - -This is a permissions problem as dokku (buildstep) uses a root account for running the application. (This may change please see this thread: https://github.com/progrium/buildstep/pull/42). - -To allow npm to work as root account one must set the configuration option of ```unsafe-perm``` to true. There are many ways to set this configuration option but the one I've found works most consistently with the heroku-nodejs-buildpack is as a .npmrc file. The file should contain - -``` -unsafe-perm = true -``` - -Note that this is NOT required on heroku as heroku does not use a root account for running the application. - -Please see https://github.com/progrium/dokku/issues/420 and https://github.com/heroku/heroku-buildpack-nodejs/issues/92. - -*** - __Symptom:__ I successfully deployed my application with no deployment errors and receiving Bad Gateway when attempting to access the application __Solution:__ diff --git a/tests/apps/multi/README.md b/tests/apps/multi/README.md index dfe69e6e0..cba503104 100644 --- a/tests/apps/multi/README.md +++ b/tests/apps/multi/README.md @@ -1,3 +1,3 @@ -This is a sample application to test heroku buildpack multi for integrating with buildstep: https://github.com/progrium/buildstep/pull/75 +This is a sample application to test heroku buildpack multi for integrating with herokuish: https://github.com/gliderlabs/herokuish I am choosing to use the python, nodejs, and ruby buildpacks to create a very simple flask app that performs a bower install and a simple grunt task using compass.