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

1106 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Josh Cohen
95334ed3fe Merge branch 'feature/retries' of github.com:joshco/dokku into feature/retries 2015-04-07 14:54:56 +00:00
Josh Cohen
61270967c1 Change "RETRIES" to (MAX) "ATTEMPTS" as this better reflects behavior. 
ATTEMPTS=0 means don't run the checks.  Useful if you want to skip the checks and can be overridden by DOKKU_CHECKS_ATTEMPTS
ATTEMPTS=1 means run only once
 2015-04-07 14:51:49 +00:00
Josh
b33aebcae2 sanitize example app name 2015-03-26 19:13:45 -04:00
Josh Cohen
f90c7b9524 docs tweak 2015-03-26 18:32:50 -04:00
Josh Cohen
4a0c0eab25 add documentation 2015-03-26 18:29:39 -04:00
Josh
48f76bcfef Indentation 
Indentation for new outer loop
 2015-03-24 23:26:31 -04:00
Josh Cohen
3b252d43c6 Add RETRIES feature to checks. 
The system will loop through checks RETRIES times until they succeed.
if they do not eventually succeed, it will fail the deployment
 2015-03-25 03:17:44 +00:00
Michael Hobbs
2949b620d8 Merge pull request #1051 from Flink/dokku-airbrake-deploy-plugin 
Add dokku-airbrake-deploy to plugins
 2015-03-23 14:41:43 -07:00
Loïc Guitaut
3d7e7028fd Add dokku-airbrake-deploy to plugins 2015-03-23 22:26:45 +01:00
Jose Diaz-Gonzalez
9293572e41 Merge pull request #1049 from ebeigarts/dokku-slack 
Change Slack Notifications link
 2015-03-23 10:53:46 -04:00
Edgars Beigarts
cec2802df2 Change Slack Notifications link 2015-03-23 13:29:08 +02:00
Jose Diaz-Gonzalez
d6c5b648f2 Merge pull request #1047 from progrium/1044_mh-show-logs-on-deploy 
show logs on deploy success and failure
 2015-03-20 16:17:58 -04:00
Michael Hobbs
77257c484f show logs on deploy success and failure. closes #1044 2015-03-20 12:32:49 -07:00
Jose Diaz-Gonzalez
23b35a03b4 Merge pull request #1043 from progrium/1015_mh-upstart-docker-per-docs 
use upstart config from docker docs. closes #1015
 2015-03-19 19:47:11 -04:00
Michael Hobbs
f9b0f3ad34 use upstart config from docker docs. closes #1015 2015-03-19 16:12:33 -07:00
Michael Hobbs
65af77e1bc Merge pull request #1042 from progrium/1005_mh-add-xip-test 
Update to Support xip.io wildcard DNS as a VHOST
 2015-03-19 13:16:59 -07:00
Michael Hobbs
c83fbad205 xip.io style vhosts with tests. closes #1005 2015-03-19 11:23:00 -07:00
Alex Vidal
3b1e0ceb51 Support xip.io wildcard DNS as a VHOST 
http://xip.io

xip.io is a service by Basecamp that provides a wildcard DNS service on the public internet. Any <ip address>.xip.io will return a DNS response for the IP address, same with <subdomain>.<ip address>.xip.io.

The domains plugin in dokku uses a regex to match IP4 and IP6 addresses in the VHOST file, and disables VHOST support if found. This PR changes those patterns to require that the VHOST entry **ends with** the IP address.

This is a gist where my VHOST setting is "127.0.0.1.xip.io" that demonstrates the original output, linked directly to the line from `plugins/domains/commands`: https://gist.github.com/anonymous/c529177f20b36beda80d#file-debug-log-L1373
 2015-03-19 11:23:00 -07:00
Jose Diaz-Gonzalez
3caec44eac Merge pull request #1009 from progrium/993_mh-inspect-port-always 
extract first port from Dockerfile and set config variable for use in deploy phase. closes #993
 2015-03-19 13:54:35 -04:00
Michael Hobbs
767b45ae56 use config:set-norestart 2015-03-19 08:09:11 -07:00
Michael Hobbs
1a7586cd03 don't use config:set 2015-03-19 07:54:45 -07:00
Michael Hobbs
2834ce1f1a extract first port from Dockerfile and set config variable for use in deploy phase. closes #993 2015-03-19 07:54:45 -07:00
Jose Diaz-Gonzalez
fafa33e40d Merge pull request #1036 from progrium/908_mh-configset-norestart 
create config set/unset without restart. closes #908
 2015-03-19 10:52:31 -04:00
Michael Hobbs
3ce5df90bf document config:set-norestart and config:unset-norestart 2015-03-19 07:48:27 -07:00
Jose Diaz-Gonzalez
f1406fd93d Merge pull request #1038 from progrium/1020_mh-simple-check-deploy 
default container check. closes #1020
 2015-03-19 10:18:31 -04:00
Michael Hobbs
fdec668646 Merge pull request #1040 from ebeigarts/dokku-slack 
Add dokku-slack plugin information
 2015-03-19 06:04:41 -07:00
Edgars Beigarts
48fef51f76 Add dokku-slack plugin information 2015-03-19 10:55:50 +02:00
Michael Hobbs
72c829e29b default container check. closes #1020 2015-03-17 12:17:33 -07:00
Michael Hobbs
6cb770bf1c create config set/unset without restart. closes #908 2015-03-17 09:49:19 -07:00
Jose Diaz-Gonzalez
bdce8f6f05 Merge pull request #1035 from Flink/dokku-http-auth-plugin 
Add dokku-http-auth to plugins
 2015-03-17 12:21:21 -04:00
Loïc Guitaut
c7ef040e8c Add dokku-http-auth to plugins 2015-03-16 23:57:06 +01:00
Michael Hobbs
ee039fe4f1 lintball. disable SC1001 2015-03-16 12:43:34 -07:00
Jose Diaz-Gonzalez
7a5942e1ac Merge pull request #1032 from cameron-martin/patch-2 
Updated dokku-installer to use relative path.
 2015-03-16 14:35:46 -04:00
Cameron Martin
be6a19c210 Updated dokku-installer to use relative path. 2015-03-16 18:29:38 +00:00
Michael Hobbs
986e8f7b25 Merge pull request #1029 from broadly/checks-enhancements 
ADDED several enhancements for CHECKS file:
 2015-03-14 22:05:20 -07:00
Michael Hobbs
fffa6a1bc5 Merge pull request #1031 from progrium/mh-fix-circleci 
CI upgraded to 1.5.0. downgrading seems to break things?
 2015-03-14 19:22:49 -07:00
Michael Hobbs
a375eb3ec3 CI upgraded to 1.5.0. downgrading seems to break things? 2015-03-14 18:41:18 -07:00
Assaf Arkin
052e3e88c8 ADDED several enhancements for CHECKS file: 
- Specify how long to wait before running first check
- Specify timeout for each check
- Check specific hosts, e.g. http://signin.example.com
- Check both HTTP and HTTPS resources
 2015-03-14 10:13:36 -07:00
Jose Diaz-Gonzalez
00e0187ad1 Merge pull request #1028 from Flink/dokku-rails-logs-plugin 
Add rails-logs to plugins
 2015-03-13 21:14:13 -04:00
Loïc Guitaut
fbc2e22dd6 Add rails-logs to plugins 2015-03-14 01:40:03 +01:00
Jose Diaz-Gonzalez
86c11f1068 Merge pull request #1010 from progrium/mh-client-test-fix 
[client unit-test] don't run create/destroy twice. actually clean up from create
 2015-03-11 04:24:09 -04:00
Jose Diaz-Gonzalez
110d8a4863 Merge pull request #1026 from progrium/1025_mh-newlines-and-such 
ensure we have newlines around our config. closes #1025
 2015-03-11 04:24:01 -04:00
Michael Hobbs
bc00b5bfa8 Merge pull request #1027 from nickstenning/add-webhooks-plugin 
Add webhooks plugin to documentation
 2015-03-10 07:33:33 -07:00
Nick Stenning
3ab828a362 Add webhooks plugin to documentation 2015-03-10 15:27:54 +01:00
Michael Hobbs
88cd81e390 ensure we have newlines around our config. closes #1025 2015-03-09 19:32:05 -07:00
Michael Hobbs
42ee978549 Merge pull request #1013 from lmars/fix-urls 
Fix URL schemes in `dokku urls` output
 2015-03-09 12:05:25 -07:00
Michael Hobbs
b468c2e09e Merge pull request #1008 from lmars/fix-nginx-multiple-ssl-vhosts 
Support multiple domains using a wildcard TLS certificate
 2015-03-09 12:05:20 -07:00
Jose Diaz-Gonzalez
2922a95ff6 Merge pull request #1022 from Flink/patch-1 
Add dokku-maintenance to plugins
 2015-03-08 20:34:47 -04:00
Lewis Marshall
9202f110ab Fix wildcard TLS domain detection 
As per RFC 2818 [0], a CN of *.dokku.me will only match direct
subdomains of dokku.me, not sub-subdomains like www.test.dokku.me, but
Dokku currently enables TLS for subdomains of all levels.

I have changed the regex from .*\.dokku\.me to [^.]*\.dokku\.me so TLS
is only enabled for direct subdomains.

[0] - http://tools.ietf.org/html/rfc2818#section-3.1

Signed-off-by: Lewis Marshall <lewis@lmars.net>
 2015-03-08 21:32:31 +00:00
Jose Diaz-Gonzalez
054ccfe3fd Merge pull request #1018 from progrium/1017_mh-more-robust-arg-parsing 
confine arg shifting to between dokku and command. closes #1017
 2015-03-06 20:10:29 -05:00