Skip to content

Commit

Permalink
resolve merge confl readme
Browse files Browse the repository at this point in the history
  • Loading branch information
chrisjsimpson committed Sep 13, 2023
1 parent c28deef commit f6cd23c
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,9 @@ If you are running dokku on a remote server remember to put your public key into

Read https://dokku.com/docs/deployment/user-management/#:~:text=format%20json%20admin-,Adding%20SSH%20keys,-You%20can%20add

## Additional Information
## Notes

Dokku provides an integration with Caddy proxy which is installed if docker-compose-plugin is installed.
- virtualhost routing is required (eg. my-app => my-app.dokku.me), set a global domain for your server: `dokku domains:set-global dokku.me`
- Dokku provides an integration with Caddy proxy which is installed if docker-compose-plugin is installed.
For this case, we will need to remove Caddy proxy since it uses port 80 and cause port conflicts with nginx
To remove Caddy simple run ```dokku caddy:stop```

0 comments on commit f6cd23c

Please sign in to comment.