Commit Graph

1866 Commits

Author SHA1 Message Date
Jose Diaz-Gonzalez
f75cf277dd Add missing description to history output in HISTORY.md
[ci skip]
2015-10-12 20:40:22 -04:00
Jose Diaz-Gonzalez
c8514d4590 Merge pull request #1545 from Flink/plugins-update
Add/remove some plugins
2015-10-12 20:21:16 -04:00
Loïc Guitaut
50e35dd481 [ci skip] Add/remove some plugins 2015-10-12 22:33:00 +02:00
Jose Diaz-Gonzalez
b1d985df19 Merge pull request #1544 from progrium/josegonzalez-patch-1
Bump compatibility for two more community plugins
2015-10-12 15:56:16 -04:00
Jose Diaz-Gonzalez
89b24bef19 Bump compatibility for two more community plugins
[ci skip]
2015-10-12 15:56:04 -04:00
Jose Diaz-Gonzalez
8b21b5dc13 Merge pull request #1511 from Flink/named-containers
Add `named-containers` as a core plugin
2015-10-08 17:43:14 -04:00
Jose Diaz-Gonzalez
5dfad4a89b Merge pull request #1525 from progrium/josegonzalez-patch-1
Add gratipay shield to readme
2015-10-08 10:43:50 -04:00
Jose Diaz-Gonzalez
d46221a4f5 Merge pull request #1537 from progrium/josegonzalez-patch-2
Update herokuish to depend upon docker-engine-cs
2015-10-07 12:41:19 -04:00
Jose Diaz-Gonzalez
18934c1b5b Update herokuish to depend upon docker-engine-cs
[ci skip]
2015-10-07 12:39:36 -04:00
Jose Diaz-Gonzalez
8a2f82efbf Merge pull request #1536 from progrium/josegonzalez-patch-2
Add docker-engine-cs as docker-engine alternative
2015-10-07 12:35:17 -04:00
Jose Diaz-Gonzalez
680db39ba9 Merge pull request #1529 from pzula/update-config-set-help
Adds helpful information regarding whitespacing when setting config
2015-10-07 12:34:58 -04:00
Loïc Guitaut
e7e43141d6 Add named-containers as a core plugin 2015-10-07 17:30:11 +02:00
Jose Diaz-Gonzalez
19f66f69ee Add docker-engine-cs as docker-engine alternative
docker-engine-cs is the commercially supported version of docker, and therefore should be fully compatible.
2015-10-07 11:16:30 -04:00
Jose Diaz-Gonzalez
4c1cc38338 Merge pull request #1530 from Flink/fix-nginx-ssl-conf
Fix nginx configuration for SSL
2015-10-06 17:46:48 -04:00
Loïc Guitaut
75b06bb02e Fix nginx configuration for SSL
When generating config for SSL vhost, configuration for non ssl vhost
was always added (not the redirect one). This should fix the issue.
2015-10-06 23:12:24 +02:00
Persa Zula
fb5e5de6a3 Adds helpful information regarding whitespacing when setting config values 2015-10-05 21:57:00 -04:00
Jose Diaz-Gonzalez
01a6a5719e Add gratipay shield to readme
Closes #1340

[ci skip]
2015-10-02 17:44:08 -04:00
Jose Diaz-Gonzalez
07e94de205 Merge pull request #1524 from callahad/linode
Document idiosyncracies with Linode - Fixes #1226
2015-10-02 14:20:48 -04:00
Dan Callahan
81523b3bd0 Document idiosyncracies with Linode - Fixes #1226 2015-10-02 12:53:58 -05:00
Jose Diaz-Gonzalez
3a8f227355 Merge pull request #1523 from callahad/frontend
Make room for the longer URL from #1522
2015-10-02 10:54:18 -04:00
Dan Callahan
85f785c93c Make room for the longer URL from #1522 2015-10-01 23:44:37 -05:00
Jose Diaz-Gonzalez
2c8678ebd0 Merge pull request #1522 from progrium/correct-urls
Avoid redirects and use raw.githubusercontent.com for github links
2015-10-01 17:26:54 -04:00
Jose Diaz-Gonzalez
ee853a5b35 Avoid redirects and use raw.githubusercontent.com for github links
[ci skip]
2015-10-01 17:26:06 -04:00
Jose Diaz-Gonzalez
fe19ef15bc Merge pull request #1521 from edm00se/patch-1
corrected README.md's ref to bootstrap.sh URL
2015-10-01 17:22:08 -04:00
Eric McCormick
a7ec8dbd05 reverted README.md's bootstrap.sh URL to versioned
by request: https://github.com/progrium/dokku/pull/1521
2015-10-01 16:10:03 -05:00
Eric McCormick
b776d4cfef corrected README.md's ref to bootstrap.sh URL
raw.github.com wasn't working for me, clicking the raw link in GH's repo led me https://raw.githubusercontent.com/progrium/dokku/master/bootstrap.sh
2015-10-01 16:03:07 -05:00
Jose Diaz-Gonzalez
629ed5cca6 Merge pull request #1519 from 3onyc/fix-typos
Fix typos
2015-10-01 15:48:16 -04:00
Jose Diaz-Gonzalez
4c002030d5 Merge pull request #1520 from kimausloos/master
Small docs fix - plugins section
2015-10-01 15:48:11 -04:00
Kim Ausloos
bd0377570d Small docs fix 2015-10-01 21:43:10 +02:00
3onyc
e0a89609ed Fix typos
* certicate -> certificate
* stackoverflow -> Stack Overflow
2015-10-01 19:33:01 +02:00
Michael Hobbs
92e9ab84ac update plugin command 2015-09-30 09:13:41 -07:00
Jose Diaz-Gonzalez
40e869fe00 Merge pull request #1515 from leonardodino/patch-1
Allow local prebuilt stack sourcing
2015-09-29 12:39:49 -04:00
Leonardo Dino
717ac8703b Allow local prebuilt stack sourcing
for faster installation (especially when testing) it's useful to just load a local .tgz file (exportend and compressed herokuish container)
2015-09-29 13:31:18 -03:00
Jose Diaz-Gonzalez
474ea3c9b3 Release 0.4.1 v0.4.1 2015-09-28 21:50:40 -04:00
Jose Diaz-Gonzalez
781b8e9009 Merge pull request #1514 from progrium/mh-no-exit0-in-config-func
do not use exit 0 in config functions
2015-09-28 21:49:58 -04:00
Michael Hobbs
6b01da6dda fix CURL_TIMEOUT settings 2015-09-28 18:06:10 -07:00
Michael Hobbs
b49cceefd7 don't use exit 0 in config functions 2015-09-28 17:44:10 -07:00
Jose Diaz-Gonzalez
c941a64eba Merge pull request #1512 from Flink/colored-logs
Colorize logs
2015-09-28 11:33:36 -04:00
Loïc Guitaut
03dee47d69 Colorize logs
Move logs into a dedicated plugin.
2015-09-28 12:34:58 +02:00
Jose Diaz-Gonzalez
3ff11e0b9f Merge pull request #1504 from progrium/1503_mh-add-plugin-doc
change plugin install doc to show one-step method
2015-09-27 17:45:53 -04:00
Michael Hobbs
a79834739e [ci skip] change plugin install doc to show one-step method. closes #1503 2015-09-25 13:09:52 -07:00
Jose Diaz-Gonzalez
f8c9d9b823 Merge pull request #1502 from Cactusbone/patch-1
dokku-apt compatibility
2015-09-25 12:53:08 -04:00
Charly Koza
9ace6cfec5 dokku-apt compatibility 2015-09-25 12:18:43 +02:00
Jose Diaz-Gonzalez
9e0f8dc7d1 Merge pull request #1501 from progrium/josegonzalez-patch-1
Clarify bootstrap installation documentation
2015-09-24 12:30:15 -04:00
Jose Diaz-Gonzalez
7978aa9011 Clarify bootstrap installation documentation
We actually have the reverse situation where the bootstrap.sh uses the web installer by default.

[ci skip]
2015-09-24 12:25:15 -04:00
Jose Diaz-Gonzalez
be1dc623db Merge pull request #1500 from jazzzz/log-name
Log user name and fingerprint in events
2015-09-24 11:59:17 -04:00
Jazz
895b4d2c6a Log user name and fingerprint in events 2015-09-24 17:22:03 +02:00
Michael Hobbs
5e9c88ca63 Merge pull request #1496 from callahad/issue-1495
Don't prompt users when installing dokku package
2015-09-23 16:01:44 -07:00
Michael Hobbs
e345cb6b93 Merge pull request #1494 from callahad/issue-1493
Correctly install packages for DOKKU_TAG=v0.4.0
2015-09-23 15:59:48 -07:00
Dan Callahan
8f2db587f2 Don't prompt users when installing dokku package
Fixes #1495
2015-09-23 16:55:02 -05:00