From 52f1f2495c1ecbf8ea93a5ee70d90bd13e401cb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20G=C3=BCttler?= Date: Thu, 17 Dec 2020 21:44:10 +0100 Subject: [PATCH 1/2] If unsure use "Heroku buildpacks via Herokuish". I guess this is the current sane default. Correct me, if I am wrong. --- docs/deployment/application-deployment.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/deployment/application-deployment.md b/docs/deployment/application-deployment.md index c7f5aa263..4c9e8897e 100644 --- a/docs/deployment/application-deployment.md +++ b/docs/deployment/application-deployment.md @@ -106,6 +106,8 @@ Dokku supports deploying applications in a few ways: - [Dockerfile](https://docs.docker.com/reference/builder/): See the [dockerfile documentation](/docs/deployment/methods/dockerfiles.md) to learn about the different ways to configure Dockerfile-based deploys. - [Docker Image](https://docs.docker.com/get-started/overview/#docker-objects): See the [docker image documentation](/docs/deployment/methods/images.md) to learn about how to deploy a Docker Image. +If unsure use "Heroku buildpacks via Herokuish". + ### Skipping deployment If you only want to rebuild and tag a container, you can skip the deployment phase by setting `$DOKKU_SKIP_DEPLOY` to `true` by running: From a1e7b99b260374d1be52d135a40f4849061e9a07 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 18 Dec 2020 12:12:59 -0500 Subject: [PATCH 2/2] docs: merge note into list Makes it a little cleaner (though not by much). [ci skip] --- docs/deployment/application-deployment.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/deployment/application-deployment.md b/docs/deployment/application-deployment.md index 4c9e8897e..bea204872 100644 --- a/docs/deployment/application-deployment.md +++ b/docs/deployment/application-deployment.md @@ -103,11 +103,10 @@ Once the deploy is complete, the application's web URL will be generated as abov Dokku supports deploying applications in a few ways: - [Heroku buildpacks](https://devcenter.heroku.com/articles/buildpacks) via [Herokuish](https://github.com/gliderlabs/herokuish#buildpacks): See the [herokuish buildpacks documentation](/docs/deployment/methods/herokuish-buildpacks.md) to learn about the different ways to specify a buildpack. + - This is the default method used by Dokku. - [Dockerfile](https://docs.docker.com/reference/builder/): See the [dockerfile documentation](/docs/deployment/methods/dockerfiles.md) to learn about the different ways to configure Dockerfile-based deploys. - [Docker Image](https://docs.docker.com/get-started/overview/#docker-objects): See the [docker image documentation](/docs/deployment/methods/images.md) to learn about how to deploy a Docker Image. -If unsure use "Heroku buildpacks via Herokuish". - ### Skipping deployment If you only want to rebuild and tag a container, you can skip the deployment phase by setting `$DOKKU_SKIP_DEPLOY` to `true` by running: