From db421c97dc791368a58849f5bb84a75b4eaec808 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 9 Jul 2021 22:08:21 -0400 Subject: [PATCH 1/3] docs: cleanup deployment-tasks.md and plugins.md --- docs/advanced-usage/deployment-tasks.md | 54 ++++---- docs/community/plugins.md | 172 ++++++++++++------------ 2 files changed, 113 insertions(+), 113 deletions(-) diff --git a/docs/advanced-usage/deployment-tasks.md b/docs/advanced-usage/deployment-tasks.md index bce01efab..fd071028d 100644 --- a/docs/advanced-usage/deployment-tasks.md +++ b/docs/advanced-usage/deployment-tasks.md @@ -4,39 +4,39 @@ Sometimes you need to run a command on deployment time, but before an app is completely deployed. Common use cases include: -* Checking a database is initialized -* Running database migrations -* Any commands required to set up the server (e.g. something like a Django `collectstatic`) +- Checking a database is initialized +- Running database migrations +- Any commands required to set up the server (e.g. something like a Django `collectstatic`) To support this, Dokku provides support for a special `release` command within your app's `Procfile`, as well as a special `scripts.dokku` key inside of your app's `app.json` file. Be aware that all commands are run within the context of the built docker image - no commands affect the host unless there are volume mounts attached to your app. Each "phase" has different expectations and limitations: - `app.json`: `scripts.dokku.predeploy` - - When to use: This should be used if your app does not support arbitrary build commands and you need to make changes to the built image. - - Are changes committed to the image at this phase: Yes - - Example use-cases - - Bundling assets in a slightly different way - - Installing a custom package from source or copying a binary into place + - When to use: This should be used if your app does not support arbitrary build commands and you need to make changes to the built image. + - Are changes committed to the image at this phase: Yes + - Example use-cases + - Bundling assets in a slightly different way + - Installing a custom package from source or copying a binary into place - `app.json`: `scripts.dokku.postdeploy` - - When to use: This should be used in conjunction with external systems to signal the completion of your deploy. - - Are changes committed to the image at this phase: No - - Example use-cases - - Notifying slack that your app is deployed - - Coordinating traffic routing with a central load balancer + - When to use: This should be used in conjunction with external systems to signal the completion of your deploy. + - Are changes committed to the image at this phase: No + - Example use-cases + - Notifying slack that your app is deployed + - Coordinating traffic routing with a central load balancer - `app.json`: `scripts.postdeploy` - - When to use: This should be used when you wish to run a command _once_, after the app is created and not on subsequent deploys to the app. - - Are changes committed to the image at this phase: No - - Example use-cases - - Setting up OAuth clients and DNS - - Loading seed/test data into the app’s test database + - When to use: This should be used when you wish to run a command _once_, after the app is created and not on subsequent deploys to the app. + - Are changes committed to the image at this phase: No + - Example use-cases + - Setting up OAuth clients and DNS + - Loading seed/test data into the app’s test database - `Procfile`: `release` - - When to use: This should be used in conjunction with external systems to signal the completion of your app image build. - - Are changes committed to the image at this phase: No - - Example use-cases - - Sending CSS, JS, and other assets from your app’s slug to a CDN or S3 bucket - - Priming or invalidating cache stores - - Running database migrations + - When to use: This should be used in conjunction with external systems to signal the completion of your app image build. + - Are changes committed to the image at this phase: No + - Example use-cases + - Sending CSS, JS, and other assets from your app’s slug to a CDN or S3 bucket + - Priming or invalidating cache stores + - Running database migrations Additionally, if using a Dockerfile with an `ENTRYPOINT`, the deployment task is passed to that entrypoint as is. The exceptions are if the entrypoint is one of the following: @@ -54,8 +54,8 @@ Please keep the above in mind when utilizing deployment tasks. Dokku provides limited support for the `app.json` manifest from Heroku (documentation available [here](https://devcenter.heroku.com/articles/app-json-schema)). The keys available for use with Deployment Tasks are: - `scripts.dokku.predeploy`: This is run _after_ an app's docker image is built, but _before_ any containers are scheduled. Changes made to your image are committed at this phase. -- `scripts.dokku.postdeploy`: This is run _after_ an app's containers are scheduled. Changes made to your image are *not* committed at this phase. -- `scripts.postdeploy`: This is run _after_ an app's containers are scheduled. Changes made to your image are *not* committed at this phase. +- `scripts.dokku.postdeploy`: This is run _after_ an app's containers are scheduled. Changes made to your image are _not_ committed at this phase. +- `scripts.postdeploy`: This is run _after_ an app's containers are scheduled. Changes made to your image are _not_ committed at this phase. For buildpack-based deployments, the location of the `app.json` file should be at the root of your repository. Dockerfile-based app deploys should have the `app.json` in the configured `WORKDIR` directory; otherwise Dokku defaults to the buildpack app behavior of looking in `/app`. @@ -87,6 +87,6 @@ To use the `release` command, simply add a `release` stanza to your Procfile. release: curl https://some.external.api.service.com/deployment?state=built ``` -Unlike the `scripts.dokku.predeploy` command, changes made during by the `release` command are *not* persisted to disk. +Unlike the `scripts.dokku.predeploy` command, changes made during by the `release` command are _not_ persisted to disk. > Warning: scaling the release command up will likely result in unspecified issues within your deployment, and is highly discouraged. diff --git a/docs/community/plugins.md b/docs/community/plugins.md index 9d8730959..7dfa7ed21 100644 --- a/docs/community/plugins.md +++ b/docs/community/plugins.md @@ -47,92 +47,6 @@ The following plugins are available and provided by Dokku maintainers. Please f > Warning: The following plugins have been supplied by our community and may not have been tested by Dokku maintainers. -[256dpi]: https://github.com/256dpi -[abossard]: https://github.com/dudagroup -[ademuk]: https://github.com/ademuk -[agco-adm]: https://github.com/agco-adm -[alessio]: https://github.com/alessio -[alex-sherwin]: https://github.com/alex-sherwin -[alexanderbeletsky]: https://github.com/alexanderbeletsky -[alexkruegger]: https://github.com/alexkruegger -[Aluxian]: https://github.com/Aluxian -[Aomitayo]: https://github.com/Aomitayo -[apmorton]: https://github.com/apmorton -[artofrawr]: https://github.com/artofrawr -[badsyntax]: https://github.com/badsyntax -[basgys]: https://github.com/basgys -[Benjamin-Dobell]: https://github.com/Benjamin-Dobell -[blag]: https://github.com/blag -[cameron-martin]: https://github.com/cameron-martin -[candlewaster]: https://notabug.org/candlewaster -[cedricziel]: https://github.com/cedricziel -[cef]: https://github.com/cef -[cjblomqvist]: https://github.com/cjblomqvist -[crisward]: https://github.com/crisward -[cu12]: https://github.com/cu12 -[darkpixel]: https://github.com/darkpixel -[dokku]: https://github.com/dokku -[dokku-community]: https://github.com/dokku-community -[dyson]: https://github.com/dyson -[fermuch]: https://github.com/fermuch -[fgrehm]: https://github.com/fgrehm -[Flink]: https://github.com/Flink -[fomojola]: https://github.com/fomojola -[gdi2290]: https://github.com/gdi2290 -[hughfletcher]: https://github.com/hughfletcher -[iamale]: https://github.com/iamale -[ignlg]: https://github.com/ignlg -[iloveitaly]: https://github.com/iloveitaly -[investtools]: https://github.com/investtools -[iskandar]: https://github.com/iskandar -[jagandecapri]: https://github.com/jagandecapri -[jeffutter]: https://github.com/jeffutter -[jlachowski]: https://github.com/jlachowski -[josegonzalez]: https://github.com/josegonzalez -[Kloadut]: https://github.com/Kloadut -[krisrang]: https://github.com/krisrang -[luxifer]: https://github.com/luxifer -[m0rth1um]: https://github.com/m0rth1um -[Maciej Łebkowski]: https://github.com/mlebkowski -[matto1990]: https://github.com/matto1990 -[mbreit]: https://github.com/mbreit -[mbriskar]: https://github.com/mbriskar -[michaelshobbs]: https://github.com/michaelshobbs -[mikecsh]: https://github.com/mikecsh -[mikexstudios]: https://github.com/mikexstudios -[mimischi]: https://github.com/mimischi -[mixxorz]: https://github.com/mixxorz -[mlebkowski]: https://github.com/mlebkowski -[motin]: https://github.com/motin -[mrname]: https://github.com/mrname -[musicglue]: https://github.com/musicglue -[neam]: https://github.com/neam -[nickcharlton]: https://github.com/nickcharlton -[nickstenning]: https://github.com/nickstenning -[nornagon]: https://github.com/nornagon -[ohardy]: https://github.com/ohardy -[pauldub]: https://github.com/pauldub -[pnegahdar]: https://github.com/pnegahdar -[RaceHub]: https://github.com/racehub -[ribot]: https://github.com/ribot -[rlaneve]: https://github.com/rlaneve -[robv]: https://github.com/robv -[scottatron]: https://github.com/scottatron -[sehrope]: https://github.com/sehrope -[sekjun9878]: https://github.com/sekjun9878 -[sgulseth]: https://github.com/sgulseth -[sseemayer]: https://github.com/sseemayer -[statianzo]: https://github.com/statianzo -[stuartpb]: https://github.com/stuartpb -[thrashr888]: https://github.com/thrashr888 -[wmluke]: https://github.com/wmluke -[Zenedith]: https://github.com/Zenedith -[fteychene]: https://github.com/fteychene -[sarendsen]: https://github.com/sarendsen -[baikunz]: https://github.com/baikunz -[lazyatom]: https://github.com/lazyatom -[ollej]: https://github.com/ollej - ### Datastores #### Relational @@ -323,3 +237,89 @@ The following plugins are no longer maintained by their developers. | [Redis](https://github.com/sekjun9878/dokku-redis-plugin) | [sekjun9878][] | 0.3.26+ | 1 Forked from [jezdez/dokku-elasticsearch-plugin](https://github.com/jezdez/dokku-elasticsearch-plugin): uses Elasticsearch 1.2 (instead of 0.90), doesn't depend on dokku-link, runs as elasticsearch user instead of root, and turns off multicast autodiscovery for use in a VPS environment. + +[256dpi]: https://github.com/256dpi +[abossard]: https://github.com/dudagroup +[ademuk]: https://github.com/ademuk +[agco-adm]: https://github.com/agco-adm +[alessio]: https://github.com/alessio +[alex-sherwin]: https://github.com/alex-sherwin +[alexanderbeletsky]: https://github.com/alexanderbeletsky +[alexkruegger]: https://github.com/alexkruegger +[Aluxian]: https://github.com/Aluxian +[Aomitayo]: https://github.com/Aomitayo +[apmorton]: https://github.com/apmorton +[artofrawr]: https://github.com/artofrawr +[badsyntax]: https://github.com/badsyntax +[basgys]: https://github.com/basgys +[Benjamin-Dobell]: https://github.com/Benjamin-Dobell +[blag]: https://github.com/blag +[cameron-martin]: https://github.com/cameron-martin +[candlewaster]: https://notabug.org/candlewaster +[cedricziel]: https://github.com/cedricziel +[cef]: https://github.com/cef +[cjblomqvist]: https://github.com/cjblomqvist +[crisward]: https://github.com/crisward +[cu12]: https://github.com/cu12 +[darkpixel]: https://github.com/darkpixel +[dokku]: https://github.com/dokku +[dokku-community]: https://github.com/dokku-community +[dyson]: https://github.com/dyson +[fermuch]: https://github.com/fermuch +[fgrehm]: https://github.com/fgrehm +[Flink]: https://github.com/Flink +[fomojola]: https://github.com/fomojola +[gdi2290]: https://github.com/gdi2290 +[hughfletcher]: https://github.com/hughfletcher +[iamale]: https://github.com/iamale +[ignlg]: https://github.com/ignlg +[iloveitaly]: https://github.com/iloveitaly +[investtools]: https://github.com/investtools +[iskandar]: https://github.com/iskandar +[jagandecapri]: https://github.com/jagandecapri +[jeffutter]: https://github.com/jeffutter +[jlachowski]: https://github.com/jlachowski +[josegonzalez]: https://github.com/josegonzalez +[Kloadut]: https://github.com/Kloadut +[krisrang]: https://github.com/krisrang +[luxifer]: https://github.com/luxifer +[m0rth1um]: https://github.com/m0rth1um +[Maciej Łebkowski]: https://github.com/mlebkowski +[matto1990]: https://github.com/matto1990 +[mbreit]: https://github.com/mbreit +[mbriskar]: https://github.com/mbriskar +[michaelshobbs]: https://github.com/michaelshobbs +[mikecsh]: https://github.com/mikecsh +[mikexstudios]: https://github.com/mikexstudios +[mimischi]: https://github.com/mimischi +[mixxorz]: https://github.com/mixxorz +[mlebkowski]: https://github.com/mlebkowski +[motin]: https://github.com/motin +[mrname]: https://github.com/mrname +[musicglue]: https://github.com/musicglue +[neam]: https://github.com/neam +[nickcharlton]: https://github.com/nickcharlton +[nickstenning]: https://github.com/nickstenning +[nornagon]: https://github.com/nornagon +[ohardy]: https://github.com/ohardy +[pauldub]: https://github.com/pauldub +[pnegahdar]: https://github.com/pnegahdar +[RaceHub]: https://github.com/racehub +[ribot]: https://github.com/ribot +[rlaneve]: https://github.com/rlaneve +[robv]: https://github.com/robv +[scottatron]: https://github.com/scottatron +[sehrope]: https://github.com/sehrope +[sekjun9878]: https://github.com/sekjun9878 +[sgulseth]: https://github.com/sgulseth +[sseemayer]: https://github.com/sseemayer +[statianzo]: https://github.com/statianzo +[stuartpb]: https://github.com/stuartpb +[thrashr888]: https://github.com/thrashr888 +[wmluke]: https://github.com/wmluke +[Zenedith]: https://github.com/Zenedith +[fteychene]: https://github.com/fteychene +[sarendsen]: https://github.com/sarendsen +[baikunz]: https://github.com/baikunz +[lazyatom]: https://github.com/lazyatom +[ollej]: https://github.com/ollej From 1b216841a890d2e1dc39978dc95fb1f3046f9d8a Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 9 Jul 2021 22:16:36 -0400 Subject: [PATCH 2/3] docs: more cleanup --- CONTRIBUTING.md | 87 +++++++++++++------------- docs/processes/scheduled-cron-tasks.md | 8 +-- 2 files changed, 46 insertions(+), 49 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f0c14c7df..c3cab1904 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -3,30 +3,28 @@ The Dokku project would love to welcome your contributions. There are several ways to help out: -* Create an [issue](https://github.com/dokku/dokku/issues) on GitHub, if you - have found a bug -* Write [test cases](https://dokku.com/docs/development/testing/) for open bug issues -* Write patches for open bug/feature issues, preferably with test cases - included -* Contribute to the [documentation](https://dokku.com/docs/) -* Come up with new ways, non-commercial to show off our [lovely logo](https://avatars1.githubusercontent.com/u/13455795) -* Blog about different ways you are using dokku -* Sponsor the Dokku project financially on [OpenCollective](https://opencollective.com/dokku#support) or [Patreon](https://www.patreon.com/dokku) +- Create an [issue](https://github.com/dokku/dokku/issues) on GitHub, if you have found a bug +- Write [test cases](https://dokku.com/docs/development/testing/) for open bug issues +- Write patches for open bug/feature issues, preferably with test cases included +- Contribute to the [documentation](https://dokku.com/docs/) +- Come up with new ways, non-commercial to show off our [lovely logo](https://avatars1.githubusercontent.com/u/13455795) +- Blog about different ways you are using dokku +- Sponsor the Dokku project financially on [OpenCollective](https://opencollective.com/dokku#support) or [Patreon](https://www.patreon.com/dokku) There are a few guidelines that we need contributors to follow so that we have a chance of keeping on top of things. ## Topics -* [Reporting Security Issues](#reporting-security-issues) -* [Reporting Issues](#reporting-other-issues) -* [Contributing](#contributing) - * [Making Changes](#making-changes) - * [Which branch to base the work](#which-branch-to-base-the-work) - * [Submitting Changes](#submitting-changes) - * [When will my change be merged?](#when-will-my-change-be-merged) - * [Running tests locally](#running-tests-locally) -* [Additional Resources](#additional-resources) +- [Reporting Security Issues](#reporting-security-issues) +- [Reporting Issues](#reporting-other-issues) +- [Contributing](#contributing) + - [Making Changes](#making-changes) + - [Which branch to base the work](#which-branch-to-base-the-work) + - [Submitting Changes](#submitting-changes) + - [When will my change be merged?](#when-will-my-change-be-merged) + - [Running tests locally](#running-tests-locally) +- [Additional Resources](#additional-resources) ## Reporting security issues @@ -65,37 +63,36 @@ you. Before you contribute to the Dokku project, there are a few things that you'll need to do -* Make sure you have a [GitHub account](https://github.com/signup/free). -* Submit an [issue](https://github.com/dokku/dokku/issues), assuming one - does not already exist. - * Clearly describe the issue including steps to reproduce when it is a bug. - * Make sure you fill in the earliest version that you know has the issue. -* Fork the repository on GitHub. +- Make sure you have a [GitHub account](https://github.com/signup/free). +- Submit an [issue](https://github.com/dokku/dokku/issues), assuming one does not already exist. + - Clearly describe the issue including steps to reproduce when it is a bug. + - Make sure you fill in the earliest version that you know has the issue. +- Fork the repository on GitHub. ### Making Changes -* Create a topic branch from where you want to base your work. - * This is usually the master branch. - * Only target an existing branch if you are certain your fix must be on that +- Create a topic branch from where you want to base your work. + - This is usually the master branch. + - Only target an existing branch if you are certain your fix must be on that branch. - * To quickly create a topic branch based on master; `git checkout -b my_contribution origin/master`. + - To quickly create a topic branch based on master; `git checkout -b my_contribution origin/master`. It is best to avoid working directly on the `master` branch. Doing so will help avoid conflicts if you pull in updates from origin. -* Make commits of logical units. Implementing a new function and calling it in +- Make commits of logical units. Implementing a new function and calling it in another file constitute a single logical unit of work. - * Before you make a pull request, squash your commits into logical units of work + - Before you make a pull request, squash your commits into logical units of work using `git rebase -i` and `git push -f`. - * A majority of submissions should have a single commit, so if in doubt, + - A majority of submissions should have a single commit, so if in doubt, squash your commits down to one commit. -* Check for unnecessary whitespace with `git diff --check` before committing. -* Use descriptive commit messages and reference the #issue number. -* Core test cases should continue to pass. You can run tests locally or enable +- Check for unnecessary whitespace with `git diff --check` before committing. +- Use descriptive commit messages and reference the #issue number. +- Core test cases should continue to pass. You can run tests locally or enable [circle-ci](https://circleci.com/gh/dokku/dokku) for your fork, so all tests and codesniffs will be executed. -* Your work should apply the [Dokku coding standards](https://github.com/progrium/bashstyle) -* Pull requests must be cleanly rebased on top of master without multiple branches +- Your work should apply the [Dokku coding standards](https://github.com/progrium/bashstyle) +- Pull requests must be cleanly rebased on top of master without multiple branches mixed into the PR. - * **Git tip**: If your PR no longer merges cleanly, use `rebase master` in your + - **Git tip**: If your PR no longer merges cleanly, use `rebase master` in your feature branch to update your pull request rather than `merge master`. ### Which branch to base the work @@ -104,8 +101,8 @@ All changes should be be based on the latest master commit. ### Submitting Changes -* Push your changes to a topic branch in your fork of the repository. -* Submit a pull request to the repository on github, with the correct target +- Push your changes to a topic branch in your fork of the repository. +- Submit a pull request to the repository on github, with the correct target branch. ### When will my change be merged? @@ -132,10 +129,10 @@ requests: Please read the [testing docs](https://dokku.com/docs/development/testing/), which contains test setup information as well as tips for running tests. -# Additional Resources +## Additional Resources -* [Dokku coding standards](https://github.com/progrium/bashstyle) -* [Existing issues](https://github.com/dokku/dokku/issues) -* [General GitHub documentation](https://help.github.com/) -* [GitHub pull request documentation](https://help.github.com/send-pull-requests/) -* [#dokku IRC channel on freenode.org](https://webchat.freenode.net/?channels=dokku) +- [Dokku coding standards](https://github.com/progrium/bashstyle) +- [Existing issues](https://github.com/dokku/dokku/issues) +- [General GitHub documentation](https://help.github.com/) +- [GitHub pull request documentation](https://help.github.com/send-pull-requests/) +- [#dokku IRC channel on freenode.org](https://webchat.freenode.net/?channels=dokku) diff --git a/docs/processes/scheduled-cron-tasks.md b/docs/processes/scheduled-cron-tasks.md index 6e0118cb1..f0466f9d7 100644 --- a/docs/processes/scheduled-cron-tasks.md +++ b/docs/processes/scheduled-cron-tasks.md @@ -110,8 +110,7 @@ dokku --rm run node-js-app some-command dokku --rm-container run node-js-app some-command ``` -For tasks that should not be interrupted, run is the *preferred* method of handling cron tasks, as the container will continue running even during a deploy or scaling event. The trade-off is that there will be an increase in memory usage if there are multiple concurrent tasks running. - +For tasks that should not be interrupted, run is the _preferred_ method of handling cron tasks, as the container will continue running even during a deploy or scaling event. The trade-off is that there will be an increase in memory usage if there are multiple concurrent tasks running. #### Using `enter` for cron tasks @@ -135,7 +134,7 @@ dokku enter node-js-app cron some-command Note that you can also run multiple commands at the same time to reduce memory usage, though that may result in polluting the container environment. -For tasks that will properly resume, you *should* use the above method, as running tasks will be interrupted during deploys and scaling events, and subsequent commands will always run with the latest container. Note that if you scale the cron container down, this may interrupt proper running of the task. +For tasks that will properly resume, you _should_ use the above method, as running tasks will be interrupted during deploys and scaling events, and subsequent commands will always run with the latest container. Note that if you scale the cron container down, this may interrupt proper running of the task. #### General cron recommendations @@ -143,13 +142,14 @@ Regularly scheduled tasks can be a bit of a pain with Dokku. The following are g - Use the `dokku` user in your cron entry. - If you do not, the `dokku` binary will attempt to execute with `sudo`, and your cron run with fail with `sudo: no tty present and no askpass program specified`. + - Add a `MAILTO` environment variable to ship cron emails to yourself. - Add a `PATH` environment variable or specify the full path to binaries on the host. - Add a `SHELL` environment variable to specify Bash when running commands. - Keep your cron tasks in time-sorted order. - Keep your server time in UTC so you don't need to translate daylight savings time when reading the cronfile. - Run tasks at the lowest traffic times if possible. -- Use cron to *trigger* jobs, not run them. Use a real queuing system such as rabbitmq to actually process jobs. +- Use cron to _trigger_ jobs, not run them. Use a real queuing system such as rabbitmq to actually process jobs. - Try to keep tasks quiet so that mails only send on errors. - Do not silence standard error or standard out. If you silence the former, you will miss failures. Silencing the latter means you should actually make app changes to handle log levels. - Use a service such as [Dead Man's Snitch](https://deadmanssnitch.com) to verify that cron tasks completed successfully. From a108856a98208dabcbf66dd121c20bd0c67f5674 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 9 Jul 2021 22:22:51 -0400 Subject: [PATCH 3/3] docs: more cleanup --- ISSUE_TEMPLATE.md | 2 +- PULL_REQUEST_TEMPLATE.md | 2 +- docs/appendices/0.6.0-migration-guide.md | 14 +++++++------- docs/getting-started/install/digitalocean.md | 4 ++-- docs/networking/dns.md | 10 +++------- 5 files changed, 14 insertions(+), 18 deletions(-) diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md index 704efdf19..a2799d88f 100644 --- a/ISSUE_TEMPLATE.md +++ b/ISSUE_TEMPLATE.md @@ -31,7 +31,7 @@ > For problems affecting all applications, the report output for a broken application is useful for our debugging. > In these cases, you may run `dokku report` without any arguments to display the top-level reporting information. -### How (deb/make/rpm) and where (AWS, VirtualBox, physical, etc.) was Dokku installed?: +### How (deb/make/rpm) and where (AWS, VirtualBox, physical, etc.) was Dokku installed? ### Additional information diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md index bcd025c41..15a72b1d2 100644 --- a/PULL_REQUEST_TEMPLATE.md +++ b/PULL_REQUEST_TEMPLATE.md @@ -1 +1 @@ -**Note:** If this PR is just doc changes, please put [ci skip] in the body that way tests do not run. +**Note:** If this PR is just doc changes, please put `[ci skip]` in the body that way tests do not run. diff --git a/docs/appendices/0.6.0-migration-guide.md b/docs/appendices/0.6.0-migration-guide.md index 96ce45136..23fd4e767 100644 --- a/docs/appendices/0.6.0-migration-guide.md +++ b/docs/appendices/0.6.0-migration-guide.md @@ -23,10 +23,10 @@ ## Calling the `dokku` binary - Plugins should *not* call the `dokku` binary directly. Clients using the `--app` argument are potentially broken, amongst others, when doing so. Instead, please source the `functions` file for a given plugin when attempting to call Dokku internal functions. As a result, the following Dokku commands are no longer publicly exposed: - - `dokku build` - - `dokku receive` - - `dokku release` - - `dokku tar:build` - - `dokku tar:build-locked` - - `dokku git:build` - - `dokku git:build-locked` + - `dokku build` + - `dokku receive` + - `dokku release` + - `dokku tar:build` + - `dokku tar:build-locked` + - `dokku git:build` + - `dokku git:build-locked` diff --git a/docs/getting-started/install/digitalocean.md b/docs/getting-started/install/digitalocean.md index f55f22cb6..e850c4b63 100644 --- a/docs/getting-started/install/digitalocean.md +++ b/docs/getting-started/install/digitalocean.md @@ -10,11 +10,11 @@ 4. Under **Choose a size**, select your machine spec. 5. Under **Choose a datacenter region**, select your region. 6. Add an SSH Key. - * New Keys + - New Keys 1. Under **Add your SSH keys** click **New SSH Key** _(this opens a dialog)_. 2. From your terminal, execute `cat $HOME/.ssh/id_rsa.pub`. 3. Copy the output and paste it into the **New SSH Key** dialog, provide a name and click **Add SSH Key**. - * Existing Keys + - Existing Keys 1. Simply add a checkmark next to the existing keys you'd like to add. 7. Under **Finalize and create**, give your Droplet a hostname _(not required)_ and click **Create**. 8. Once created, copy the IP address to your clipboard. diff --git a/docs/networking/dns.md b/docs/networking/dns.md index 4f9ee666e..78e82ac3f 100644 --- a/docs/networking/dns.md +++ b/docs/networking/dns.md @@ -18,11 +18,7 @@ Because there are so many different DNS server packages out there as well as a t ## Caching -Please remember that DNS relies heavily on _caching_. Changes you make to DNS could take anywhere from a few seconds to a few *days* to propagate. If you tried surfing to example.tld, then changed the IP address in DNS, it could be a while before your computer picks up on the changes. - -## HELP! - -Don't be afraid to ask if you need help. Create a [new issue](https://github.com/dokku/dokku/issues) and someone will be glad to assist you. +Please remember that DNS relies heavily on _caching_. Changes you make to DNS could take anywhere from a few seconds to a few _days_ to propagate. If you tried surfing to example.tld, then changed the IP address in DNS, it could be a while before your computer picks up on the changes. ## Getting started @@ -36,7 +32,7 @@ Now you have to make a decision about your domain. Do you want everything and a In other words, do you want your applications on your Dokku server accessible via `node-js-app.example.tld` or via `node-js-app.myserver.example.tld`? -#### Using a sub-domain (node-js-app.myserver.example.tld) +### Using a sub-domain (node-js-app.myserver.example.tld) Using a sub-domain is easy. When you set up your server, you probably gave it a name like `myserver.example.tld`. @@ -71,7 +67,7 @@ If they all return your IP address, you have set DNS up properly for dokku. You Proceed with the setup instructions in the [installation documentation](/docs/getting-started/installation.md) -#### Using the root of your domain (node-js-app.example.tld) +### Using the root of your domain (node-js-app.example.tld) This section is a work in progress. It is incomplete.