Commit Graph
3191 Commits
Author SHA1 Message Date
Alessio Treglia efc55bd195 Attempt to fix circleci build failure
Parse output and check return code after running test commands
with the 'run' utility.
2015-07-01 09:15:08 +01:00
Alessio Treglia b24e78257c Fix horrible typo 2015-06-30 17:34:15 +01:00
Alessio Treglia b380bde9f3 Add small test suite for events logging 2015-06-30 12:05:35 +01:00
Arthur Schreiber b40a86a2fc Add a testcase 2015-06-24 11:22:48 +02:00
Michael Hobbs b35190101c let circleci dictate docker install 2015-05-27 13:19:28 -07:00
Andy Chambers eedb05d656 [Fixes #1158] Split nginx logs by $APP
* nginx access logs to /var/log/nginx/${APP}-access.log
 * nginx error logs to /var/log/nginx/${APP}-error.log
2015-05-24 23:59:17 -07:00
Michael Hobbs af38e4f25a filter out literal wildcard when deploying an unrelated domain. closes #1185 2015-05-19 17:58:02 -07:00
Michael Hobbs c5a74fac90 Merge pull request #1193 from progrium/1187_mh-docker-opts-over-ssh
handle docker opts over ssh without escaping quotes. closes #1187
2015-05-18 12:16:08 -07:00
Michael Hobbs a785bf82e6 handle docker opts over ssh without escaping quotes. closes #1187 2015-05-18 09:01:12 -07:00
Michael Hobbs 0d2e5f1a14 Merge branch 'master' into mh-ps-scale 2015-05-17 17:45:01 -07:00
Michael Hobbs b836c1f65a use regex when filtering nonssl vhosts. process custom templates in the same manner as default templates. closes #1169 2015-05-06 16:49:37 -07:00
Michael Hobbs 4aedb6507a Merge branch 'master' into mh-ps-scale 2015-04-30 10:32:29 -07:00
Jose Diaz-Gonzalez 713a8d4f31 Merge pull request #1146 from progrium/1142_mh-domains-no-redeploy
don't re-deploy on domains:add. allow multple domains on command line. closes #1142
2015-04-27 22:11:01 -04:00
Michael Hobbs a6c7cc50ce test off port git remote 2015-04-25 10:01:01 -07:00
Michael Hobbs c8c4a6a0c6 pass through return code when calling destroy_app. allow custom git remote 2015-04-25 10:01:01 -07:00
Michael Hobbs 2f0f2889db need to restart now 2015-04-24 15:41:32 -07:00
Michael Hobbs dce031d38d don't re-deploy on domains:add. allow multple domains on command line. closes #1142 2015-04-24 15:41:32 -07:00
Michael Hobbs 31fafe55d3 Merge pull request #1145 from progrium/1135_mh-docker-options-over-ssh
allow docker-options over ssh. plus test. closes #1135
2015-04-24 15:40:45 -07:00
Michael Hobbs 0c715d4b39 more test efficiencies and cleanup 2015-04-24 15:05:21 -07:00
Michael Hobbs a529f6fce8 lintball 2015-04-24 14:02:44 -07:00
Michael Hobbs 0d838d1248 split up unit-tests and use 4 containers (they're free) 2015-04-24 13:52:14 -07:00
Michael Hobbs 3d2af158ff allow docker-options over ssh. plus test. closes #1135 2015-04-24 12:10:02 -07:00
Michael Hobbs a18fa7afbe we only need the first container here 2015-04-24 11:30:20 -07:00
Michael Hobbs 33258663f4 uncomment my accidental comment out 2015-04-21 14:33:28 -07:00
Michael Hobbs 979c1155c2 add process with no listener 2015-04-21 14:33:28 -07:00
Michael Hobbs 7348d7790c test scaling different proc types 2015-04-21 14:33:28 -07:00
Michael Hobbs 715921c60e comment out skipped test to save time 2015-04-21 14:33:28 -07:00
Michael Hobbs 930987ad02 container/ip/port file cleanup when scaling down. more tests 2015-04-21 14:32:31 -07:00
Michael Hobbs 0f8be7c946 fix missing tmpdir prefix 2015-04-21 14:32:30 -07:00
Michael Hobbs 99d2601f2f fix tests 2015-04-21 14:32:30 -07:00
Michael Hobbs f55e047619 negative test for validate_nginx 2015-04-21 11:53:00 -07: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 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
Michael Hobbs c2053d5322 support dockerfiles without expose command. closes #1083 2015-04-03 12:13:39 -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
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
Michael Hobbs 77257c484f show logs on deploy success and failure. closes #1044 2015-03-20 12:32:49 -07:00
Michael Hobbs c83fbad205 xip.io style vhosts with tests. closes #1005 2015-03-19 11:23:00 -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
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 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 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
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
Michael Hobbs 2fb48c414b confine arg shifting to between dokku and command. closes #1017 2015-03-06 11:58:35 -08:00