Commit Graph
14697 Commits
Author SHA1 Message Date
Michael Hobbs da91841ac6 Merge pull request #1698 from pmvieira/pv/vagrant-with-curl
if the repo we are pushing has a CHECKS file...
2015-11-19 07:43:27 -05:00
pmvieira 1eb1e1cd94 Adding back curl 2015-11-19 08:51:31 +00:00
Jose Diaz-Gonzalez 8bca701bc8 Merge pull request #1703 from progrium/josegonzalez-patch-1
Fix casing on help output
2015-11-19 03:15:02 -05:00
Jose Diaz-Gonzalez 6cd1b768ff Fix casing on help output
[ci skip]
2015-11-19 03:14:48 -05:00
Jose Diaz-Gonzalez e23328b16c Merge pull request #1702 from progrium/josegonzalez-patch-1
Remove extra whitespace in command output
2015-11-19 03:13:32 -05:00
Jose Diaz-Gonzalez 939feb62eb Remove extra whitespace in command output
[ci skip]
2015-11-19 03:13:25 -05:00
Michael Hobbs 3e466917fd Merge pull request #1700 from progrium/1697_mh-copy-nginx-ssl-template-from-container
copy nginx.ssl.template from app container
2015-11-18 19:26:49 -05:00
Jose Diaz-Gonzalez 650dcd2538 Merge pull request #1671 from progrium/user-auth
User Auth plugin trigger
2015-11-18 19:23:47 -05:00
Michael Hobbs 518d7f9e56 make custom template tests actually test 2015-11-18 18:04:50 -05:00
Michael Hobbs d2f288d3a9 Merge pull request #1699 from progrium/1685_mh-print-dokku-scale-location
print where we find DOKKU_SCALE when we find it
2015-11-18 17:45:37 -05:00
Michael Hobbs 09aa97f9e5 copy nginx.ssl.template from app container. fixes #1697 2015-11-18 17:36:02 -05:00
Michael Hobbs e57d9dac3b print where we find DOKKU_SCALE when we find it. closes #1685 2015-11-18 16:10:29 -05:00
Jose Diaz-Gonzalez 5f7543bf46 Merge pull request #1696 from progrium/1554_mh-chown-plugins
chown plugins paths to dokku:dokku
2015-11-16 14:24:54 -05:00
Michael Hobbs 6eee13b67f chown plugins paths to dokku:dokku. closes #1554 2015-11-16 13:32:34 -05:00
Jose Diaz-Gonzalez aae2213168 Merge pull request #1694 from MarcDiethelm/docs-improve-docker-options
Improve docker-options doc
2015-11-16 03:40:42 -05:00
Marc Diethelm daa3b88d91 Add backticks around build, deploy and run 2015-11-15 23:12:42 +01:00
Marc Diethelm 9cfa1b9065 Docs, wording: else --> otherwise 2015-11-15 22:52:34 +01:00
Marc Diethelm 200d1128a1 Update docker-options plugin help for consistency with help docs 2015-11-15 22:50:24 +01:00
Marc Diethelm 06b8d166ca Small improvements to doc 2015-11-15 12:22:40 +01:00
Marc Diethelm 76e9ea6cc3 Improve docker-options.md
- Add note to avoid problems with shared volumes permissions
- Restructure the doc to help comprehension
- Make command examples consistent
- Improve wording in some places
- Advanced usage: remove "avoid if possible". It made little sense.
- docker (project) --> Docker
- dokku (project) --> Dokku
- dokku (command) --> `dokku`
- add `shell` to code blocks
2015-11-15 12:18:35 +01:00
Jose Diaz-Gonzalez 6ff55ff16c Merge pull request #1690 from u2mejc/u2mejc-issue1571
Fix "App tls has not been deployed" error
2015-11-13 21:57:03 -05:00
Justin Clark 59912d43f1 fix Must specify DOMAIN error over ssh 2015-11-13 18:02:07 -08:00
Justin Clark ef7d49bafc Fix App tls has not been deployed error 2015-11-13 16:40:22 -08:00
Jose Diaz-Gonzalez 6af8811912 Merge pull request #1684 from u2mejc/u2mejc-certsremove
Cause certs:remove to return non zero on error
2015-11-12 14:12:18 -05:00
Jose Diaz-Gonzalez d694a73aed Merge pull request #1683 from u2mejc/u2mejc-certs.bat
Add bats test for certs plugin
2015-11-11 22:17:37 -05:00
Justin Clark 8a1f7fb900 Cause certs:remove to return non zero on error
This was caught when writing the certs.bats. This patch will return
non zero on error instead of zero which can casue false negatives
in testing.
2015-11-11 18:18:06 -08:00
Justin Clark 3c1b85f272 Add bats test for certs plugin 2015-11-11 17:23:05 -08:00
Michael Hobbs cff8e27545 Merge pull request #1682 from progrium/1678_mh-nullglob-fix
set nullglob when looking for PORT files
2015-11-11 15:51:02 -08:00
Michael Hobbs 75b8953799 set nullglob when looking for PORT files. closes #1678 2015-11-11 12:01:56 -08:00
Jose Diaz-Gonzalez 9b283fd6ec Merge pull request #1681 from progrium/josegonzalez-patch-1
Fix email in code of conduct
2015-11-11 12:14:30 -05:00
Jose Diaz-Gonzalez 8f5eacf516 Fix email in code of conduct
Closes #1676

[ci skip]
2015-11-11 12:14:24 -05:00
Jose Diaz-Gonzalez ffbb2f3c42 Merge pull request #1667 from u2mejc/u2mejc-certs
Fix dokku certs:add file input bug
2015-11-10 20:16:54 -05:00
Jose Diaz-Gonzalez acbd1b8655 Merge pull request #1666 from progrium/1572_mh-nginx-logrotate
revert dokku group changes and add dokku user to adm group
2015-11-10 15:09:23 -05:00
Jose Diaz-Gonzalez b6240fcb9a Merge pull request #1642 from cjblomqvist/patch-3
Add new plugin adding app name to env
2015-11-10 15:08:18 -05:00
Jose Diaz-Gonzalez 23f4bb7983 Merge pull request #1677 from ignlg/patch-1
Added dokku-builders-plugin to plugins page
2015-11-10 15:07:35 -05:00
Jose Diaz-Gonzalez cd633d4427 Merge pull request #1665 from callahad/funroll-curls
Replace curl with wget; see #1567
2015-11-10 14:00:44 -05:00
Michael Hobbs 0853850f7a revert dokku group changes and add dokku user to adm group. closes #1572 2015-11-10 09:21:09 -08:00
Ignacio Lago db02e2a11a Added dokku-builders-plugin to plugins page 2015-11-10 17:38:01 +01:00
Dan Callahan a49adef9b0 Use wget instead of curl when bootstrapping 2015-11-09 22:52:58 -06:00
Jose Diaz-Gonzalez bb9fd8b320 Merge pull request #1675 from progrium/josegonzalez-patch-1
Create CODE_OF_CONDUCT.md
2015-11-09 21:00:35 -05:00
Jose Diaz-Gonzalez 4ddbb84367 Create CODE_OF_CONDUCT.md
Closes #1669

[ci skip]
2015-11-09 21:00:27 -05:00
Jose Diaz-Gonzalez f3f9a11813 Merge pull request #1674 from progrium/buildpack-docs
Expand buildpack deployment documentation
2015-11-09 14:59:35 -05:00
Jose Diaz-Gonzalez 2a7e2393ad Expand buildpack deployment documentation
This should consolidate a lot of knowledge around how dokku deals with buildpacks, as well as clears up a few misconceptions - mainly that dokku doesn't support multiple/custom buildpacks.

By bringing this information front-and-center, we can avoid a lot of questions by users trying to use dokku.

[ci skip]
2015-11-09 14:56:45 -05:00
Jose Diaz-Gonzalez fc125d41e8 Add user-auth plugin trigger
This plugin trigger should allow users to pair down the available commands for a given user. While this does not affect help output - or any output at all - this is a good first step in allowing administrative access to certain commands while still allowing users to deploy/manage given applications.

Note that because of how dokku works, all parsing of commands must be done within the pluginhook, and we cannot give visibility into the actual command or application that will be affected by a given run.
2015-11-08 15:36:04 -05:00
Jose Diaz-Gonzalez 0eab678fcc add documentation to example ci skip
[ci skip]
2015-11-08 15:33:57 -05:00
Jose Diaz-Gonzalez 7307b385d8 Ensure we exit with the proper status code 2015-11-08 15:33:15 -05:00
Jose Diaz-Gonzalez 3585ee8612 Release 0.4.4 v0.4.4 2015-11-07 21:55:05 -05:00
Justin Clark b7fbd9aea0 Fix dokku certs:add file input bug
- fixes issue #1658
- add better output for argument files missing
- don't delete (move) the certs passed in
2015-11-06 16:47:19 -08:00
Jose Diaz-Gonzalez 5dbb31cf8a Merge pull request #1612 from Flink/logs-options
Add multiple options to the logs plugin
2015-11-06 00:32:32 -05:00
Jose Diaz-Gonzalez 26d50b0140 Merge pull request #1660 from callahad/deb
Fixup debian/control for Debian
2015-11-06 00:18:51 -05:00