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

55 Commits

Author SHA1 Message Date
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
Michael Hobbs
3e100e3002 conditionally set interactive and tty on dokku run. 
closes #552
closes #913
 2015-01-21 13:49:46 -08:00
Michael Hobbs
2ff2ca55c1 drop support for create/delete in favor of standard apps:create and apps:destroy 2015-01-17 16:24:50 -08:00
Michael Hobbs
666f2d7434 add random app generator in bash. support create and delete verbs. tested on bash 4.3.18 and 3.2.53 2015-01-16 18:46:55 -08:00
Michael Hobbs
161111aab5 lintball client. add tests. add help message 2015-01-16 15:19:14 -08:00
Michael Hobbs
cb39110904 new assertion for a specific exit status 2015-01-16 15:18:24 -08:00
Michael Hobbs
c7bd7119b8 assert on intermediate steps 2015-01-16 14:59:01 -08:00
Jose Diaz-Gonzalez
19871fe81d Merge pull request #900 from progrium/mh-nginx-ssl-san-hostname 
support extracting SANs from SSL certificates and adding them to nginx config
 2015-01-16 15:22:15 -05:00
Michael Hobbs
40e628778b revive deploy:all with deprecation warning 2015-01-15 15:43:03 -08:00
Michael Hobbs
6cd89fa72a support extracting SANs from SSL certificates and adding them to nginx config 2015-01-15 12:08:27 -08:00
Michael Hobbs
17d78856e0 skip one ps test as circleci does not yet support docker exec 2015-01-14 16:24:09 -08:00
Michael Hobbs
c0028f122b initial pass at a ps plugin 2015-01-14 15:19:58 -08:00
Michael Hobbs
80d13c0005 allow users to add a domain to an app if there is no global vhost 2015-01-11 14:35:02 -08:00
Michael Hobbs
da465a61dd disable VHOST deployment if global VHOST file is missing 2015-01-08 15:58:08 -08:00
Michael Hobbs
896ce50c93 support pre deployment usage of domains plugin. fixes interface binding issue 2015-01-06 12:42:21 -08:00
Jose Diaz-Gonzalez
566cc15081 Merge pull request #864 from progrium/860-mh-bind-to-internal-ip 
bind docker container to internal port if using vhosts
 2015-01-05 19:58:18 -05:00
Michael Hobbs
441d212ef2 add ipv6 detection for external port binding 2015-01-05 10:47:20 -08:00
Michael Hobbs
e95d1e8602 add test to validate server_tokens is off 2015-01-02 17:21:57 -08:00
Michael Hobbs
948d7902f2 bind docker container to internal port if using vhosts 2015-01-02 16:27:19 -08:00
Michael Hobbs
de09260c33 add certificate CN to app VHOST if it's not already 2014-12-23 23:08:22 -08:00
Michael Hobbs
43fe6edb04 build app urls based on wildcard ssl or app ssl 2014-12-23 13:52:50 -08:00