Commit Graph

2063 Commits

Author SHA1 Message Date
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
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
Jose Diaz-Gonzalez
c2fc3141a9 Merge pull request #1643 from Flink/fix-no-vhost
Fix generated nginx config when NO_VHOST=1
2015-11-06 00:06:08 -05:00
Dan Callahan
23c25d01ff Fixup debian/control for Debian
* Bump `Version` field.
* Set minimum nginx version to 1.4.6, per #1654
* Depend on both `rubygem-foo` (Ubuntu) and `ruby-foo` (Debian).
* Add distro-default `docker.io (>= 1.6.2)` as an alternative.

  Version 1.6.2 is in both `trusty-updates` and `jessie-backports`,
  while `trusty` itself has `0.9.1`. We seriously want to avoid that.

This also updates the docs so people don't forget to bump the version
field in the future. Even though we really do that for them with sed.
2015-11-05 22:34:28 -06:00
Jose Diaz-Gonzalez
de832c596a Merge pull request #1644 from mmerickel/watch-events-logrotate
watch dokku events through a logrotate
2015-11-05 22:01:19 -05:00
Jose Diaz-Gonzalez
237dfe2bbd Merge pull request #1634 from callahad/bats
bats is available in homebrew
2015-11-05 21:59:58 -05:00
Jose Diaz-Gonzalez
49a07e5210 Merge pull request #1664 from progrium/mh-add-rev-to-pre-receive-app
add $REV to pre-receive-app call
2015-11-05 21:59:25 -05:00
Jose Diaz-Gonzalez
a1983e0131 Merge pull request #1653 from callahad/SC2145
Resolve SC2145: 'Argument mixes string and array.'
2015-11-05 21:57:02 -05:00
Michael Hobbs
95a7a93cb9 [ci skip] update docs 2015-11-05 18:46:18 -08:00
Michael Hobbs
455033703a add $REV to pre-receive-app call 2015-11-05 17:18:44 -08:00
Jose Diaz-Gonzalez
0470d493ae Merge pull request #1662 from xadh00m/master
Only return users of group 'adm'
2015-11-05 11:15:48 -05:00
Mirko Geissler
c2858e5fb3 Merge pull request #1 from xadh00m/adm_group_fix
Only return users of group 'adm'
2015-11-05 11:52:42 +01:00
Mirko Geissler
f85775b870 Only return users of group 'adm'
This fixes the issue where all groups starting with 'adm' are returned which broke the installation.
2015-11-05 11:51:29 +01:00
Jose Diaz-Gonzalez
d50f3cd151 Merge pull request #1655 from callahad/SC2162
Resolve SC2162: 'read without -r mangles backslashes'
2015-11-05 00:36:48 -05:00
Jose Diaz-Gonzalez
9b887b6262 Merge pull request #1656 from callahad/SC2001
Resolve SC2001: 'See if you can use ${var//search/replace} instead'
2015-11-05 00:36:14 -05:00
Jose Diaz-Gonzalez
f3cc2310da Merge pull request #1657 from callahad/doc-updates
Various small doc updates
2015-11-05 00:35:35 -05:00
Kim Ausloos
ce26004fc8 Various small doc updates
Replaces #1622, addresses comments by @josegonzalez

[ci skip]
2015-11-04 21:26:54 -06:00
Dan Callahan
ff07842dc5 Resolve SC2001: 'See if you can use ${var//search/replace} instead'
https://github.com/koalaman/shellcheck/wiki/SC2001
2015-11-04 20:43:41 -06:00
Dan Callahan
c389b213b5 Resolve SC2162: 'read without -r mangles backslashes'
More information:

https://github.com/koalaman/shellcheck/wiki/SC2162

http://wiki.bash-hackers.org/commands/builtin/read
2015-11-04 20:40:42 -06:00
Jose Diaz-Gonzalez
e1e7fbcc52 Merge pull request #1652 from callahad/SC2143
Resolve SC2143: 'Instead of [ -n $(foo | grep bar) ], use foo | grep -q bar'
2015-11-04 17:20:45 -05:00
Dan Callahan
84c0988fd8 Resolve SC2145: 'Argument mixes string and array.'
https://github.com/koalaman/shellcheck/wiki/SC2145
2015-11-04 11:30:49 -06:00
Dan Callahan
9229e1a9a7 Resolve SC2143: 'Instead of [ -n $(foo | grep bar) ], use foo | grep -q bar'
...we actually don't violate this

https://github.com/koalaman/shellcheck/wiki/SC2143
2015-11-04 11:00:59 -06:00
Jose Diaz-Gonzalez
5f83476811 Merge pull request #1647 from callahad/SC2115
Resolve SC2115: 'Use "${var:?}" to ensure this never expands to /'
2015-11-04 11:54:53 -05:00
Jose Diaz-Gonzalez
0bd06e70d5 Merge pull request #1651 from callahad/SC2029
Resolve SC2029: 'this expands on client side'
2015-11-04 11:54:38 -05:00
Jose Diaz-Gonzalez
c78bf267a3 Merge pull request #1648 from callahad/SC2154
Resolve SC2154: 'variable is referenced but not assigned'
2015-11-04 11:54:16 -05:00
Jose Diaz-Gonzalez
c8c83703ed Merge pull request #1649 from callahad/SC2164
Resolve SC2164: 'Use cd ... || exit in case cd fails.'
2015-11-04 11:54:04 -05:00
Jose Diaz-Gonzalez
baac2ceda2 Merge pull request #1650 from callahad/SC2148
Resolve SC2148: 'target shell is unknown'
2015-11-04 11:53:48 -05:00
Dan Callahan
d465ceb045 Resolve SC2154: 'variable is referenced but not assigned'
In this case, Bats sets $status, $output, and $lines, but ShellCheck
doesn't statically know that. Therefore, we ignore SC2154 when those
variables are first introduced in ./tests/unit/test_helper.bash

https://github.com/koalaman/shellcheck/wiki/SC2154
2015-11-03 22:00:22 -06:00
Dan Callahan
8ed0193b1d Resolve SC2115: 'Use "${var:?}" to ensure this never expands to /'
https://github.com/koalaman/shellcheck/wiki/SC2115
2015-11-03 22:00:05 -06:00
Dan Callahan
1de54d52ac Resolve SC2164: 'Use cd ... || exit in case cd fails.'
https://github.com/koalaman/shellcheck/wiki/SC2164
2015-11-03 21:55:09 -06:00
Dan Callahan
e1b5b1aafc Resolve SC2148: 'target shell is unknown'
https://github.com/koalaman/shellcheck/wiki/SC2148
2015-11-03 21:46:23 -06:00
Dan Callahan
344d48e01b Resolve SC2029: 'this expands on client side'
https://github.com/koalaman/shellcheck/wiki/SC2029

This patch addes inline directives where this is the desired behavior,
instead of globaly excluding the check.
2015-11-03 21:40:31 -06:00
Jose Diaz-Gonzalez
279c49f084 Merge pull request #1645 from rvalyi/master
a git repo can be accessed via ssh
2015-11-03 19:56:48 -05:00
Raphaël Valyi
2b64fe4666 a git repo can be accessed via ssh 2015-11-03 01:11:12 -02:00
Michael Merickel
2d109a20c5 watch dokku events through a logrotate 2015-11-02 14:20:55 -06:00
Loïc Guitaut
804c822ace Fix generated nginx config when NO_VHOST=1
Fixes #1625
2015-11-02 19:08:41 +01:00