Mirrors/dokku
1
0
Fork 0
mirror of https://github.com/dokku/dokku.git synced 2025-12-29 00:25:08 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,323 Commits 6 Branches 319 Tags
b40a86a2fc865d22c8b33f1468f27fde138a4c00
Commit Graph

75 Commits

Author SHA1 Message Date
Arthur Schreiber
b40a86a2fc Add a testcase 2015-06-24 11:22:48 +02: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
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
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
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
df8f4fb882 initial pass at including docker-options plugin. closes #1062 2015-04-01 12:57:06 -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
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
Lewis Marshall
3a7e1bfa16 Fix URL schemes in dokku urls output 
Previously, the presence of TLS certificates would cause `dokku urls` to
output all https URLs, even for domains which were not configured to use
TLS.

This change introduces a URLS file in the app's directory which contains
the URLs with schemes based on whether they have been configured to use
TLS in the nginx config.

Signed-off-by: Lewis Marshall <lewis@lmars.net>
 2015-03-01 01:29:38 +00:00
Michael Hobbs
482b680e16 [client unit-test] don't run create/destroy twice. actually clean up from create 2015-02-25 19:47:45 -08:00
Lewis Marshall
a4d79e2de9 Support multiple domains using a wildcard TLS certificate 
Previous to this change, each TLS domain would be written to nginx.conf
using the nginx.ssl.conf template (lines 69-73) but with an empty
"server_name" directive (because NOSSL_SERVER_NAME was not set).

This would then become irrelevant because nginx.conf would get truncated
on line 88, and a single parsing of the template would then be written to
nginx.conf on line 89, meaning only the last TLS domain would be set up to
actually use TLS.

This patch changes this behaviour so that all TLS domains get added to
nginx.conf using the nginx.ssl.conf template (which includes redirecting
HTTP -> HTTPS), and all non-TLS domains get added using the nginx.conf
template, so do not get redirected to a TLS domain.

Signed-off-by: Lewis Marshall <lewis@lmars.net>
 2015-02-26 01:58:17 +00:00
Lewis Marshall
6b973a9565 Refactor nginx tests 
Signed-off-by: Lewis Marshall <lewis@lmars.net>
 2015-02-26 01:24:39 +00:00
Michael Hobbs
fb8f08d280 remove quoting from dockerfile env. closes #1002 2015-02-24 11:56:54 -08:00
Michael Hobbs
f366a37cd1 remove quoting around cleanup and disable lint for those lines. also make cleanup test more robust 2015-02-24 10:41:02 -08:00
Alessio Treglia
d79966af05 Cleanup unit test 2015-02-13 14:18:07 +00:00
Michael Hobbs
12777d9bf0 simplify SSL hostname handling and avoid overwriting variables. refs #971 2015-02-12 13:27:47 -08:00
Michael Hobbs
7357df7c9d first pass at dockerfile support 2015-02-07 17:56:01 -08:00
Michael Hobbs
b10120af12 Merge pull request #955 from progrium/mh-small-style-refactor 
quick style refactor
 2015-02-07 14:40:04 -08:00
Michael Hobbs
a9c1ed0c6d [ci skip] comment out skipped tests as we pay the cost for setup() and teardown() anyway 2015-02-07 14:37:30 -08:00
Michael Hobbs
959c51eb50 refactor function defs to be posix-like. remove usage of force positional argument in tests. support --force like arguments in client" 2015-02-07 11:35:04 -08:00
Michael Hobbs
6ad65dd9b4 first stab at a common functions library. include argument parsing and a few definitions wired up. closes #932. closes #945 2015-02-05 11:32:46 -08:00
Michael Hobbs
30d660335f Merge pull request #941 from progrium/931-mh-source-glabal-env-deploy-run 
source global env prior to app env. closes #931
 2015-02-04 07:32:12 -08:00
Michael Hobbs
5fb30ab934 source global env prior to app env. closes #931 2015-02-03 13:47:20 -08:00
Michael Hobbs
9f985077c7 implement rebuild command that reuses git_archive_all 2015-01-27 15:00:00 -08:00