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,064 Commits 6 Branches 319 Tags
110d8a4863b44e2b6643fa8e7667c03192a81389
Commit Graph

1064 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Michael Hobbs
2fb48c414b confine arg shifting to between dokku and command. closes #1017 2015-03-06 11:58:35 -08:00
Loïc Guitaut
c4125f9e47 Add dokku-maintenance to plugins 2015-03-06 18:53:35 +01:00
Michael Hobbs
dc36e6008c Merge pull request #1004 from progrium/1002_mh-dockerfile-envvar-quoting 
remove quoting from dockerfile env. closes #1002
 2015-03-06 08:06:51 -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
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
Jose Diaz-Gonzalez
53f9974f6f Merge pull request #1001 from sekjun9878/patch-1 
Add sekjun9878/dokku-redis-plugin to plugins.md
 2015-02-24 19:42:37 -05:00
Michael Hobbs
fb8f08d280 remove quoting from dockerfile env. closes #1002 2015-02-24 11:56:54 -08:00
Jose Diaz-Gonzalez
5dafee84ba Merge pull request #1003 from progrium/mh-fix-cleanup 
remove quoting around cleanup and disable lint for those lines. also make cleanup test more robust
 2015-02-24 14:33:41 -05: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
Michael Yoo
64d4af160b Add sekjun9878/dokku-redis-plugin to plugins.md 2015-02-22 18:50:46 +10:30
Jose Diaz-Gonzalez
70e1e5d14d Merge pull request #996 from pmvieira/minor-typo-fix 
Minor typo fix in the pluginhooks documentation
 2015-02-20 12:51:35 -05:00
Jose Diaz-Gonzalez
7cdc2a6e49 Merge pull request #994 from alessio/develop 
Fix quoting.
 2015-02-20 12:51:26 -05:00
Pedro Vieira
26ae97eea2 Minor typo fix in the pluginhooks documentation 2015-02-20 15:11:19 +00:00
Alessio Treglia
f90d298027 Fix quoting. 
- Should prevent tests failure.
 2015-02-20 11:26:33 +00:00
Jose Diaz-Gonzalez
8f9ccf9b0b Merge pull request #992 from progrium/josegonzalez-doc-link-fix 
[ci skip] fix digital ocean docs
 2015-02-19 18:20:57 -05:00
Jose Diaz-Gonzalez
f0f363da4c [ci skip] fix digital ocean docs 
Closes #991
 2015-02-19 18:20:48 -05:00
Jose Diaz-Gonzalez
0e6c978d62 Merge pull request #967 from alessio/develop 
Really clean-up containers and images a-la-Docker
 2015-02-19 14:54:00 -05:00
Jose Diaz-Gonzalez
07ae5190c3 Merge pull request #987 from techniq/patch-1 
Improve Dockerfile example/test
 2015-02-19 13:54:42 -05:00
Jose Diaz-Gonzalez
3cfadb9c9b Merge pull request #986 from progrium/josegonzalez-static-buildpack 
Switch to yabawock's static nginx buildpack
 2015-02-19 13:50:23 -05:00
Jose Diaz-Gonzalez
886acfaf39 Merge pull request #989 from progrium/more-clients 
More clients
 2015-02-19 01:19:07 -05:00
Jose Diaz-Gonzalez
59dc7c0deb [ci skip] note that the easiest client to use is the bash one (zero extra dependencies) 2015-02-19 01:18:31 -05:00
Jose Diaz-Gonzalez
4c53911993 [ci skip] add a few more clients 2015-02-19 01:18:16 -05:00
Jose Diaz-Gonzalez
909f86a393 Merge pull request #988 from progrium/docs-minor-changes 
Docs minor changes
 2015-02-19 00:54:20 -05:00
Jose Diaz-Gonzalez
c7bde60966 [ci skip] add "Where To Get Help" section 2015-02-19 00:53:52 -05:00
Jose Diaz-Gonzalez
1cba586e90 Add an entry for dokku-toolbelt 2015-02-19 00:44:36 -05:00
Jose Diaz-Gonzalez
51d704c123 [ci skip] fix link to advanced installation docs 2015-02-19 00:33:37 -05:00
Jose Diaz-Gonzalez
3837cb42cf [ci skip] add a section on deprecated plugins 2015-02-19 00:32:59 -05:00
Sean Lynch
6dfc90d388 Improve Dockerfile example/test 
Placing `COPY` (or `ADD`) of the application directory after the `RUN apt-get install ...` statements will allow the layers created from those statements to be retrieved from docker's cache on subsequent runs.
 2015-02-19 00:07:12 -05:00
Jose Diaz-Gonzalez
3a6f2eca82 Switch to yabawock's static nginx buildpack 
The new herokuish branch of buildstep requires changes to the buildpack, but this buildpack should be compatible with the old buildstep.
 2015-02-18 18:31:11 -05:00
Jose Diaz-Gonzalez
0ed0e8d458 Merge pull request #984 from progrium/docs-minor-changes 
Docs minor changes
 2015-02-18 02:37:49 -05:00
Jose Diaz-Gonzalez
19a10e3455 [ci skip] do not use deprecated dokku delete command 2015-02-18 02:35:34 -05:00
Jose Diaz-Gonzalez
c475bfdc24 [ci skip] add STACK_URL reference to make it clear how to customize the buildstep source 2015-02-18 02:35:14 -05:00
Jose Diaz-Gonzalez
6240aaa605 [ci skip] Clarify that the user needs sudo access to install dokku. Closes #961 2015-02-18 02:34:49 -05:00
Jose Diaz-Gonzalez
05b1421027 Merge pull request #983 from progrium/installation-changes 
Installation changes
 2015-02-18 02:27:58 -05:00
Jose Diaz-Gonzalez
0822f12226 [ci skip] Consolidate advanced-installation instructions and simplify the install guide 
Also move vagrant instructions into their own file
 2015-02-18 02:26:12 -05:00
Jose Diaz-Gonzalez
914757360b [ci skip] add digitalocean-specific installation instructions 2015-02-18 02:25:41 -05:00
Jose Diaz-Gonzalez
485068479c [ci skip] add experimental linode stackscript 2015-02-18 02:24:50 -05:00
Jose Diaz-Gonzalez
724ec8e0a4 Merge pull request #982 from progrium/client-docs 
[ci skip] Add documentation for existing clients. Closes #977
 2015-02-18 02:11:23 -05:00
Jose Diaz-Gonzalez
5c5039a533 [ci skip] Add documentation for existing clients. Closes #977 2015-02-18 02:10:42 -05:00
Jose Diaz-Gonzalez
230066fc98 Merge pull request #981 from progrium/remove-old-files 
Remove old files
 2015-02-18 01:53:02 -05:00