github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #4136 from hugopeixoto/docs/ruby-getting-started-uses-main-instead-of-master

Browse Source 
Use git push main:master in docs
This commit is contained in:
Jose Diaz-Gonzalez
2020-09-14 16:23:00 -04:00
committed by GitHub
parent 196b5d08eb 71876756a4
commit 30d8ebffb9
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
docs/deployment/application-deployment.md
View File

@@ -62,7 +62,7 @@ Now you can deploy the `ruby-getting-started` app to your Dokku server. All you
# the remote username *must* be dokku or pushes will fail # the remote username *must* be dokku or pushes will fail
cd ruby-getting-started cd ruby-getting-started
git remote add dokku dokku@dokku.me:ruby-getting-started git remote add dokku dokku@dokku.me:ruby-getting-started
git push dokku master git push dokku main:master
``` ```
> Note: Some tools may not support the short-upstream syntax referenced above, and you may need to prefix > Note: Some tools may not support the short-upstream syntax referenced above, and you may need to prefix
@@ -71,7 +71,7 @@ git push dokku master
> Note: Your private key should be registered with `ssh-agent` in your local development environment. If you get a `permission denied` error when pushing, you can register your private key as follows: `ssh-add -k ~/<your private key>`. > Note: Your private key should be registered with `ssh-agent` in your local development environment. If you get a `permission denied` error when pushing, you can register your private key as follows: `ssh-add -k ~/<your private key>`.
After running `git push dokku master`, you should have output similar to this in your terminal: After running `git push dokku main:master`, you should have output similar to this in your terminal:
``` ```
Counting objects: 231, done. Counting objects: 231, done.
@@ -147,7 +147,7 @@ If you do not enter a fully qualified domain name when pushing your app, Dokku d
# from your local machine # from your local machine
# the remote username *must* be dokku or pushes will fail # the remote username *must* be dokku or pushes will fail
git remote add dokku dokku@dokku.me:ruby-getting-started git remote add dokku dokku@dokku.me:ruby-getting-started
git push dokku master git push dokku main:master
``` ```
``` ```
@@ -161,7 +161,7 @@ You can also specify the fully qualified name as follows:
# from your local machine # from your local machine
# the remote username *must* be dokku or pushes will fail # the remote username *must* be dokku or pushes will fail
git remote add dokku dokku@dokku.me:app.dokku.me git remote add dokku dokku@dokku.me:app.dokku.me
git push dokku master git push dokku main:master
``` ```
``` ```
@@ -175,7 +175,7 @@ This is useful when you want to deploy to the root domain:
# from your local machine # from your local machine
# the remote username *must* be dokku or pushes will fail # the remote username *must* be dokku or pushes will fail
git remote add dokku dokku@dokku.me:dokku.me git remote add dokku dokku@dokku.me:dokku.me
git push dokku master git push dokku main:master
``` ```
... deployment ... ... deployment ...