Commit Graph

1340 Commits

Author SHA1 Message Date
Jose Diaz-Gonzalez
5668f76cdd Install specific version of docker [ci skip] 2015-06-30 15:52:21 -04:00
Jose Diaz-Gonzalez
7e1e0ebb80 Require lxc-docker <= 1.6.2
1.7.0 Has issues with `docker ps` output, breaking all plugins

[ci-skip]
2015-06-30 14:06:01 -04:00
Jose Diaz-Gonzalez
976c0be189 Merge pull request #1257 from progrium/josegonzalez-ssl-logs
Split nginx ssl logs by $APP
2015-06-27 12:55:44 -04:00
Jose Diaz-Gonzalez
e2e36a5045 Add logging to :80 stanza 2015-06-27 12:24:27 -04:00
Jose Diaz-Gonzalez
6bb513f12c Split nginx ssl logs by $APP
Refs #1158
2015-06-26 11:03:29 -04:00
Jose Diaz-Gonzalez
48eca101f1 Merge pull request #1252 from progrium/1139-vagrant-docs-fix
Fix ssh port for vagrant installation. Closes #1139. [ci skip]
2015-06-25 11:22:36 -04:00
Jose Diaz-Gonzalez
0e63b4e069 Fix ssh port for vagrant installation. Closes #1139. [ci skip] 2015-06-25 11:22:17 -04:00
Jose Diaz-Gonzalez
cd8292f7fa Merge pull request #1251 from progrium/nginx-restarts
Fallback to using /etc/init.d/nginx reload directly to restart nginx
2015-06-25 11:15:39 -04:00
Jose Diaz-Gonzalez
626cd958a5 Fallback to using /etc/init.d/nginx reload directly to restart nginx. Closes #1165. Refs #1247 2015-06-25 10:38:47 -04:00
Jose Diaz-Gonzalez
15bd9db79c Merge pull request #1250 from progrium/1201-sglebs
SSL documentation is misleading
2015-06-25 10:08:25 -04:00
Marcio Marchini
114cecc911 SSL documentation is misleading
fixes #1194
[ci skip]
2015-06-25 10:07:25 -04:00
Jose Diaz-Gonzalez
2a469df5e4 Merge pull request #1207 from rockymadden/client-appname-as-arg-bug
Fixed bug with client commands taking verb, appname, and also arguments.
2015-06-25 10:06:02 -04:00
Michael Hobbs
4d162aa209 Merge pull request #1245 from arthurschreiber/patch-1
Support config variables containing `\n`
2015-06-24 12:32:47 -07:00
Arthur Schreiber
b40a86a2fc Add a testcase 2015-06-24 11:22:48 +02:00
Jose Diaz-Gonzalez
cc8b1fccc1 Release 0.3.19 v0.3.19 2015-06-23 21:40:45 -04:00
Jose Diaz-Gonzalez
e674591567 Merge pull request #1246 from progrium/call-apt-get
Ensure we call apt-get before installing packages
2015-06-23 21:37:57 -04:00
Jose Diaz-Gonzalez
b39b0d4c78 Ensure we call apt-get before installing packages 2015-06-23 20:59:34 -04:00
Arthur Schreiber
0da389e8af Further fixes for config values containing newlines. 2015-06-23 23:53:10 +02:00
Arthur Schreiber
182ae4a50a Support config variables containing \n 2015-06-23 23:41:34 +02:00
Michael Hobbs
1aee972a82 Merge pull request #1237 from zyegfryed/patch-1
Typo (at at -> at)
2015-06-19 07:44:33 -07:00
Sébastien Fievet
b3269e3c95 Typo (at at -> at) 2015-06-19 10:23:44 +02:00
Michael Hobbs
c0f8764292 [ci skip] clarify phases in docker-options plugin 2015-06-17 08:12:46 -07:00
Michael Hobbs
6ebb897150 Merge pull request #1232 from progrium/1231_mh-dockerfile-build-cache-control
allow passing of docker build options and document dockerfile deployment. closes #1231
2015-06-15 16:22:31 -07:00
Michael Hobbs
ba4e87cb8b [ci skip] clean up documentation language 2015-06-15 09:09:49 -07:00
Michael Hobbs
ea66619f3c allow passing of docker build options and document dockerfile deployment. closes #1231 2015-06-15 09:00:33 -07:00
Michael Hobbs
62906cd542 Merge pull request #1227 from Flink/dockerfile-build-without-cache
Use --no-cache when building Dockerfile
2015-06-11 13:37:45 -07:00
Loïc Guitaut
9a71fff3f1 Use --no-cache when building Dockerfile
Since `docker build` is only invoked when actually building a new image
from a Dockerfile, using `--no-cache` allows to have an updated image
even if the Dockerfile hasn't changed.
This works well with Dockerfiles using `git` or packages referencing
latest versions instead of "static" ones.
2015-06-11 12:05:07 +02:00
Jose Diaz-Gonzalez
8880a9ce84 Merge pull request #1224 from lmars/docs-update
Update plugin-creation.md
2015-06-10 12:46:19 -04:00
Lewis Marshall
e61e6e94af Update plugin-creation.md
Signed-off-by: Lewis Marshall <lewis@lmars.net>
2015-06-09 23:34:54 +01:00
Jose Diaz-Gonzalez
d08cec5913 Merge pull request #1218 from progrium/mh-add-logspout-plugin
add dokku-logspout plugin
2015-06-06 14:37:54 -04:00
Michael Hobbs
473f28b0c3 [ci skip] add dokku-logspout plugin 2015-06-05 15:58:07 -07:00
Michael Hobbs
dda2ac03ee Merge pull request #1217 from kirushanth-sakthivetpillai/fix_broken_ssl_wildcard_redirect
Fix broken ssl wildcard redirect
2015-06-05 13:33:36 -07:00
Kirushanth Sakthivetpillai
db6e71b7d6 Update nginx.ssl.conf.template
use nginx $host variable intead of $ssl_server_nam (which may be *.example.com) which does bogus redirects
2015-06-05 15:01:22 -04:00
Michael Hobbs
daeea6ba13 Merge pull request #1206 from rockymadden/patch-1
Handle for installs in /usr/local/bin and the like.
2015-06-02 10:45:41 -07:00
Jose Diaz-Gonzalez
0bfa25f73e Merge pull request #1212 from progrium/mh-dont-install-docker-in-ci
let circleci dictate docker install (fixes master)
2015-05-27 18:03:29 -04:00
Michael Hobbs
b35190101c let circleci dictate docker install 2015-05-27 13:19:28 -07:00
Jose Diaz-Gonzalez
2ceed0cbdf Merge pull request #1210 from cddr/split-nginx-logs
[Fixes #1158] Split nginx logs by $APP
2015-05-25 23:23:52 -04: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
Rocky Madden
587de65441 When parsing args when handling verbs, appname can be included as an argument causing bugs with commands that accept a verb, appname, and also arguments. 2015-05-22 18:21:54 -06:00
Rocky Madden
7a6450f0f0 Fixed lint issue. 2015-05-22 17:07:54 -06:00
Rocky Madden
a90090bacd Handle for installs in /usr/local/bin and the like. 2015-05-22 16:58:26 -06:00
Jose Diaz-Gonzalez
3bf68616ad Merge pull request #1204 from 3onyc/bootstrap-fix
Fix bootstrap.sh, install curl when it's missing, make curl follow redirects, don't suppress stderr
2015-05-22 04:04:23 -04:00
3onyc
450f9f19b2 Make curl follow redirects, and don't suppress its output in bootstrap.sh 2015-05-22 08:50:37 +02:00
3onyc
f17b799638 Ensure curl is installed by bootstrap.sh if it's missing 2015-05-22 08:50:23 +02:00
Michael Hobbs
6e0eb5938a Merge pull request #1202 from progrium/1185_mh-filter-wildcard-server-name
filter out literal wildcard when deploying an unrelated domain. closes #1185
2015-05-20 06:43:14 -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
b6b8f4ddc1 Merge pull request #1200 from progrium/mh-fix-lint-1198
fix lintball from #1198
2015-05-19 09:47:18 -07:00
Michael Hobbs
140f5a4939 fix lintball from #1198 2015-05-19 09:39:27 -07:00
Michael Hobbs
f86a6704bd Merge pull request #1198 from 3onyc/fix-preinst
Check web_config before key_file (Fixes #1196)
2015-05-19 09:37:27 -07:00
3onyc
c2c18af425 Check web_config before key_file (Fixes #1196) 2015-05-19 15:11:06 +02:00