github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
2,098 Commits 2 Branches 347 Tags
a2ccbcbbfbdd41b03fb623c1434f262f5bb030c7
Commit Graph

593 Commits

Author SHA1 Message Date
Michael Hobbs
a2ccbcbbfb Merge pull request #1701 from progrium/mh-dont-call-nginx-build-twice 
don't call nginx_build_config twice
 2015-11-19 12:09:02 -05:00
Michael Hobbs
498d52ecdf don't call nginx_build_config twice and make ip regex functions globally accessible 2015-11-19 09:10:04 -05:00
Jose Diaz-Gonzalez
6cd1b768ff Fix casing on help output 
[ci skip]
 2015-11-19 03:14:48 -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
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
Marc Diethelm
200d1128a1 Update docker-options plugin help for consistency with help docs 2015-11-15 22:50:24 +01:00
Justin Clark
ef7d49bafc Fix App tls has not been deployed error 2015-11-13 16:40:22 -08: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
Michael Hobbs
75b8953799 set nullglob when looking for PORT files. closes #1678 2015-11-11 12:01:56 -08: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
Michael Hobbs
0853850f7a revert dokku group changes and add dokku user to adm group. closes #1572 2015-11-10 09:21:09 -08: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
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
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
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
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
455033703a add $REV to pre-receive-app call 2015-11-05 17:18:44 -08: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
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
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
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
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
Loïc Guitaut
7f5c2caed6 Add multiple options to the logs plugin 
New version of the logs plugin broke compatibility (as reported in #1534).
So options have been added to handle display:
* -t/--tail to tail logs (already existed)
* -n/--num NUM to display only this number of lines
* -p/--ps PS to display logs only from provided process
* -q/--quiet to display raw logs without color, time and names

This should close #1534
 2015-11-02 15:31:17 +01:00
Michael Hobbs
e28c75e56a move RESTORE variable to DOKKU_APP namespace 2015-10-29 07:55:09 -07:00
Jose Diaz-Gonzalez
f13796fa57 Merge pull request #1613 from kdomanski/restore 
add ps:restore to start applications which weren't manually stopped
 2015-10-28 14:15:57 -04:00
Justin Clark
4f6843104c Add trace to help output 2015-10-27 17:15:38 -07:00
Kamil Domański
6c19414b7a add ps:restore to start applications which weren't manually stopped 2015-10-26 20:06:53 +01:00
Kamil Domański
f705004975 Add post-stop plugn trigger 2015-10-26 17:57:18 +01:00
Jose Diaz-Gonzalez
d17cb43bd3 Add missing sudo call to nginx reload 2015-10-25 22:56:48 -04:00
Jose Diaz-Gonzalez
b3041661b3 Correctly set syslog user as owner on dokku logs for non-debian systems 
On debian, rsyslog runs as root, so we don't want to force the non-existent syslog owner.

Fix syntax error
 2015-10-25 00:09:26 -04:00
Jose Diaz-Gonzalez
18d6e1be3b Add special case commands for instances where we are running dokku in debian 
Refs #976
 2015-10-24 23:12:38 -04:00
Jose Diaz-Gonzalez
f3959c38b0 Favor chgrp over chown to ensure proper group on logs 
Refs #976
 2015-10-24 22:44:10 -04:00
Jose Diaz-Gonzalez
9878c0b6fa Ensure we have a directory for the dokku motd message. Refs #976 2015-10-24 22:11:27 -04:00
Jose Diaz-Gonzalez
99a64e6f86 Merge pull request #1602 from progrium/pre-receive-app 
Add pre-receive-app plugin trigger
 2015-10-24 02:26:16 -04:00
Jose Diaz-Gonzalez
8d2f465318 Add missing plugin triggers 2015-10-24 00:24:44 -04:00
Jose Diaz-Gonzalez
7d31c4fc1e Add pre-receive-app plugin trigger 
Users can modify the temporary working directory to add or remove any necessary files before an application is processed for deployment.
 2015-10-24 00:11:29 -04:00
Jose Diaz-Gonzalez
0d15020dac Merge pull request #1590 from progrium/1588_mh-dockerfile-trigger-docker-args-build 
trigger docker-args-build for dockerfile deployments
 2015-10-21 21:36:03 -04:00
Michael Hobbs
4accec2ac9 trigger docker-args-build for dockerfile deployments. closes #1588 2015-10-21 17:27:30 -07:00
Michael Hobbs
0a9db4174b patch broken nginx 1.8.0 logrotate script. closes #1578 2015-10-21 17:21:04 -07:00
Michael Hobbs
f9e636ddb1 make sure dokku can read nginx logs and don't remove other perms. closes #1572 2015-10-20 16:07:42 -07:00
Michael Hobbs
3f9d770a79 fix logic error in enabling nginx. fixes #1565 2015-10-15 15:59:16 -07:00