From cda2e3d048688d844ed577c1cddbf2932461a309 Mon Sep 17 00:00:00 2001 From: Slava Vishnyakov Date: Thu, 15 Dec 2016 14:19:41 +0300 Subject: [PATCH 1/8] Re-deploying/restarting --- docs/deployment/application-deployment.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/deployment/application-deployment.md b/docs/deployment/application-deployment.md index e96df35ba..1ea084291 100644 --- a/docs/deployment/application-deployment.md +++ b/docs/deployment/application-deployment.md @@ -101,6 +101,15 @@ If you only want to rebuild and tag a container, you can skip the deployment pha dokku config:set ruby-rails-sample DOKKU_SKIP_DEPLOY=true ``` +### Re-Deploying / restarting + +If you need to re-deploy (or restart) your app: + +```shell +# on your Dokku host +dokku deploy ruby-rails-sample +``` + ### Deploying with private git submodules Dokku uses git locally (i.e. not a docker image) to build its own copy of your app repo, including submodules. This is done as the `dokku` user. Therefore, in order to deploy private git submodules, you'll need to drop your deploy key in `/home/dokku/.ssh/` and potentially add github.com (or your VCS host key) into `/home/dokku/.ssh/known_hosts`. The following test should help confirm you've done it correctly. From de9f495e2cf0f5e88e56c3e97acb12580602811b Mon Sep 17 00:00:00 2001 From: Slava Vishnyakov Date: Thu, 15 Dec 2016 14:22:52 +0300 Subject: [PATCH 2/8] storage needs deploy too --- docs/advanced-usage/persistent-storage.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/advanced-usage/persistent-storage.md b/docs/advanced-usage/persistent-storage.md index 88348290f..719db87a1 100644 --- a/docs/advanced-usage/persistent-storage.md +++ b/docs/advanced-usage/persistent-storage.md @@ -25,6 +25,12 @@ dokku storage:mount app-name /var/lib/dokku/data/storage:/storage Dokku will then mount the shared contents of `/var/lib/dokku/data/storage` to `/storage` inside the container. +You will also need to restart the deployment, to activate storage: + +```shell +dokku deploy app-name +``` + A more complete workflow may require making a custom directory for your application and mounting it within your `/app/storage` directory instead. The mount point is *not* relative to your application's working directory, and is instead relative to the root of the container. ```shell From 42b1666fbe7bc47686db764be62012c3ee3f9a92 Mon Sep 17 00:00:00 2001 From: Slava Vishnyakov Date: Thu, 15 Dec 2016 17:15:00 +0300 Subject: [PATCH 3/8] Update persistent-storage.md --- docs/advanced-usage/persistent-storage.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/advanced-usage/persistent-storage.md b/docs/advanced-usage/persistent-storage.md index 719db87a1..b9d9fd0b2 100644 --- a/docs/advanced-usage/persistent-storage.md +++ b/docs/advanced-usage/persistent-storage.md @@ -25,10 +25,10 @@ dokku storage:mount app-name /var/lib/dokku/data/storage:/storage Dokku will then mount the shared contents of `/var/lib/dokku/data/storage` to `/storage` inside the container. -You will also need to restart the deployment, to activate storage: +You will also need to restart the deployment, to activate storage (see [ps](http://dokku.viewdocs.io/dokku/deployment/process-management/)): ```shell -dokku deploy app-name +dokku ps:rebuild app-name ``` A more complete workflow may require making a custom directory for your application and mounting it within your `/app/storage` directory instead. The mount point is *not* relative to your application's working directory, and is instead relative to the root of the container. From 88f37028a2686ef2a24ef81fa44bfa2a00ce7c57 Mon Sep 17 00:00:00 2001 From: Slava Vishnyakov Date: Thu, 15 Dec 2016 17:15:38 +0300 Subject: [PATCH 4/8] Update application-deployment.md --- docs/deployment/application-deployment.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/deployment/application-deployment.md b/docs/deployment/application-deployment.md index 1ea084291..89ef0d22b 100644 --- a/docs/deployment/application-deployment.md +++ b/docs/deployment/application-deployment.md @@ -103,11 +103,11 @@ dokku config:set ruby-rails-sample DOKKU_SKIP_DEPLOY=true ### Re-Deploying / restarting -If you need to re-deploy (or restart) your app: +If you need to re-deploy (or restart) your app (see [ps](http://dokku.viewdocs.io/dokku/deployment/process-management/)): ```shell # on your Dokku host -dokku deploy ruby-rails-sample +dokku ps:rebuild ruby-rails-sample ``` ### Deploying with private git submodules From a53c61b4d892d27ba0b44fa4612f85a20b06e4f4 Mon Sep 17 00:00:00 2001 From: Slava Vishnyakov Date: Thu, 15 Dec 2016 18:46:16 +0300 Subject: [PATCH 5/8] Update persistent-storage.md --- docs/advanced-usage/persistent-storage.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/advanced-usage/persistent-storage.md b/docs/advanced-usage/persistent-storage.md index b9d9fd0b2..a34f7bd2a 100644 --- a/docs/advanced-usage/persistent-storage.md +++ b/docs/advanced-usage/persistent-storage.md @@ -25,7 +25,8 @@ dokku storage:mount app-name /var/lib/dokku/data/storage:/storage Dokku will then mount the shared contents of `/var/lib/dokku/data/storage` to `/storage` inside the container. -You will also need to restart the deployment, to activate storage (see [ps](http://dokku.viewdocs.io/dokku/deployment/process-management/)): +Once you have mounted persistent storage, you will also need to restart the application. See the +[process scaling documentation](/dokku/deployment/process-management) for more information. ```shell dokku ps:rebuild app-name From f100a3ee4c857334201a1fcd95d972b3c24b54f4 Mon Sep 17 00:00:00 2001 From: Slava Vishnyakov Date: Thu, 15 Dec 2016 18:46:52 +0300 Subject: [PATCH 6/8] Update application-deployment.md --- docs/deployment/application-deployment.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/deployment/application-deployment.md b/docs/deployment/application-deployment.md index 89ef0d22b..138d4f4d0 100644 --- a/docs/deployment/application-deployment.md +++ b/docs/deployment/application-deployment.md @@ -103,7 +103,8 @@ dokku config:set ruby-rails-sample DOKKU_SKIP_DEPLOY=true ### Re-Deploying / restarting -If you need to re-deploy (or restart) your app (see [ps](http://dokku.viewdocs.io/dokku/deployment/process-management/)): +If you need to re-deploy (or restart) your app. See the +[process scaling documentation](/dokku/deployment/process-management) for more information. ```shell # on your Dokku host From 4c86f888161313b13be6f361488089bdf56622f7 Mon Sep 17 00:00:00 2001 From: Slava Vishnyakov Date: Thu, 15 Dec 2016 18:47:58 +0300 Subject: [PATCH 7/8] Update application-deployment.md --- docs/deployment/application-deployment.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/deployment/application-deployment.md b/docs/deployment/application-deployment.md index 138d4f4d0..e9ec691d2 100644 --- a/docs/deployment/application-deployment.md +++ b/docs/deployment/application-deployment.md @@ -103,14 +103,15 @@ dokku config:set ruby-rails-sample DOKKU_SKIP_DEPLOY=true ### Re-Deploying / restarting -If you need to re-deploy (or restart) your app. See the -[process scaling documentation](/dokku/deployment/process-management) for more information. +If you need to re-deploy (or restart) your app: ```shell # on your Dokku host dokku ps:rebuild ruby-rails-sample ``` +(See the [process scaling documentation](/dokku/deployment/process-management) for more information. + ### Deploying with private git submodules Dokku uses git locally (i.e. not a docker image) to build its own copy of your app repo, including submodules. This is done as the `dokku` user. Therefore, in order to deploy private git submodules, you'll need to drop your deploy key in `/home/dokku/.ssh/` and potentially add github.com (or your VCS host key) into `/home/dokku/.ssh/known_hosts`. The following test should help confirm you've done it correctly. From c5117cb42f566968fa323aa62e8e17913e0efe0d Mon Sep 17 00:00:00 2001 From: Slava Vishnyakov Date: Thu, 15 Dec 2016 18:48:22 +0300 Subject: [PATCH 8/8] Update application-deployment.md --- docs/deployment/application-deployment.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/deployment/application-deployment.md b/docs/deployment/application-deployment.md index e9ec691d2..903add341 100644 --- a/docs/deployment/application-deployment.md +++ b/docs/deployment/application-deployment.md @@ -110,7 +110,7 @@ If you need to re-deploy (or restart) your app: dokku ps:rebuild ruby-rails-sample ``` -(See the [process scaling documentation](/dokku/deployment/process-management) for more information. +See the [process scaling documentation](/dokku/deployment/process-management) for more information. ### Deploying with private git submodules