Commit Graph

1148 Commits

Author SHA1 Message Date
Josh Cohen
b5eef489fd linting fixes 2015-04-13 20:22:14 +00:00
Josh Cohen
33eca97c87 Merge branch 'feature/retries' of github.com:joshco/dokku into feature/retries 2015-04-11 01:11:11 +00:00
Josh Cohen
cc565661e3 fix linting issues
rename UNCHECKED -> FAILEDCHECKS
2015-04-11 01:10:14 +00:00
Josh Cohen
132c0b1c81 Merge remote-tracking branch 'origin/master' into feature/retries 2015-04-07 18:27:55 +00:00
Josh Cohen
4e6a980bc6 update documentation for ATTEMPTS change 2015-04-07 11:02:34 -04:00
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
Jose Diaz-Gonzalez
705c04504c Merge pull request #1088 from progrium/1083_mh-dockerfile-noexpose
support dockerfiles without expose command. closes #1083
2015-04-03 15:56:58 -04:00
Jose Diaz-Gonzalez
2aeb298663 Merge pull request #1065 from progrium/mh-dev-env-bugs
minor dev env cleanup
2015-04-03 15:18:59 -04:00
Jose Diaz-Gonzalez
7df1642e4a Merge pull request #1060 from progrium/nginx-conf-template
Add .template suffix to nginx configuration templates. Refs #1054
2015-04-03 15:18:29 -04:00
Jose Diaz-Gonzalez
29023927f5 Merge pull request #1081 from progrium/1063_mh-test-env-sans-newline
force testing .env with no newline and actually fix #1025 and #1026. closes #1063
2015-04-03 15:18:17 -04:00
Jose Diaz-Gonzalez
6ac59dcdfc Merge pull request #1084 from awendt/avoid-port-collisions
Make port forwarding configurable
2015-04-03 15:18:00 -04:00
Michael Hobbs
c2053d5322 support dockerfiles without expose command. closes #1083 2015-04-03 12:13:39 -07:00
Michael Hobbs
5c938fee8a Merge pull request #1087 from progrium/mh-docker-options-ni-exit
make docker-options adhere to DOKKU_NOT_IMPLEMENTED_EXIT pattern
2015-04-03 11:32:24 -07:00
Michael Hobbs
ba33c161f5 make docker-options adhere to DOKKU_NOT_IMPLEMENTED_EXIT pattern 2015-04-03 10:51:23 -07:00
Jose Diaz-Gonzalez
6374178046 Merge pull request #1082 from progrium/mh-test-updates
test cleanup with slight performance boost
2015-04-02 11:23:02 -04:00
André Wendt
295c897b7e Make port forwarding configurable 2015-04-02 09:27:10 +02:00
Jose Diaz-Gonzalez
814c2a39c5 Merge pull request #1080 from progrium/1062_mh-docker-options
initial pass at including docker-options plugin. closes #1062
2015-04-02 00:57:07 -04:00
Michael Hobbs
7e7eb1dc87 docs update 2015-04-01 17:50:40 -07:00
Michael Hobbs
4e472c39e3 uniform unit test labels 2015-04-01 17:44:34 -07:00
Michael Hobbs
6d0b4ef4ec test cleanup with slight performance boost 2015-04-01 17:30:09 -07:00
Michael Hobbs
1bad26426e force testing .env with no newline and actually fix #1025 and #1026. closes #1063 2015-04-01 13:49:55 -07:00
Michael Hobbs
df8f4fb882 initial pass at including docker-options plugin. closes #1062 2015-04-01 12:57:06 -07:00
Jose Diaz-Gonzalez
89af9cf5db Merge pull request #1079 from rorykoehler/correcting-post-install-link
corrected configuration link in bootstrap.sh
2015-04-01 11:45:00 -04:00
Rory
0f4ee909d5 corrected configuration link in bootstrap.sh 2015-04-01 13:44:49 +02:00
Jose Diaz-Gonzalez
48132aa658 Merge pull request #1077 from Flink/dokku-psql-single-container-plugin
Add dokku-psql-single-container to plugins
2015-03-30 17:31:02 -04:00
Loïc Guitaut
af924efe17 Add dokku-psql-single-container to plugins 2015-03-30 23:24:34 +02:00
Jose Diaz-Gonzalez
79366216cc Merge pull request #1074 from Flink/dokku-client-better-remote-detection
Better detection of dokku remote
2015-03-30 10:54:25 -04:00
Loïc Guitaut
61136e2591 Better detection of dokku remote
Previously this script was matching for a remote named 'dokku' even
when DOKKU_HOST is provided and completely custom. I have a case where
I have 2 remotes with dokku, one on a staging server and another on a
production server.
So by matching for 'dokku@$DOKKU_HOST' instead, the script can determine
correctly which remote to use.
2015-03-30 11:25:33 +02:00
Jose Diaz-Gonzalez
5ecfc7bb91 Merge pull request #1064 from progrium/mh-testing-docs
[ci skip] document test suite
2015-03-30 01:33:26 -04:00
Jose Diaz-Gonzalez
020215ac0a Merge pull request #1068 from matiaskorhonen/rc.local-fix
Fixes escaping in the rc.local script in the Linode StackScript
2015-03-29 18:30:27 -04:00
Matias Korhonen
bb54f845aa Fixes escaping in the rc.local script
`uname -r` was getting executed before the kernel change
2015-03-29 18:40:23 +03:00
Jose Diaz-Gonzalez
802c183b56 Merge pull request #1067 from martinAnsty/docs-nginx-wording
Fix nginx docs wording around config template eg
2015-03-27 18:57:44 -04:00
Martin Ansty
c4d0d37113 Fix nginx docs wording around config template eg 2015-03-27 22:38:13 +00:00
Michael Hobbs
2b59c4b8eb [ci skip] document test suite 2015-03-27 14:36:40 -07:00
Michael Hobbs
e1672b2764 call make stack in subprocess 2015-03-27 14:26:21 -07:00
Michael Hobbs
b6ce856acb set DEBIAN_FRONTEND appropriately to avoid warnings 2015-03-27 14:25:52 -07: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
Jose Diaz-Gonzalez
50f7b4236b Add .template suffix to nginx configuration templates. Refs #1054 2015-03-26 14:33:27 -04:00
Jose Diaz-Gonzalez
af626069dd Release 0.3.16 v0.3.16 2015-03-25 01:03:51 -04:00
Jose Diaz-Gonzalez
be533692fd Merge pull request #1057 from progrium/deb-packaging
Deb packaging
2015-03-25 00:38:24 -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