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
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
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
43869dd48d
Merge pull request #1118 from progrium/mh-ps-scale
...
container-level scaling
2015-05-18 11:27:28 -07:00
Michael Hobbs
bd0b14692a
lintball
2015-05-18 10:27:16 -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
1f6badc6a1
lintball fix
2015-05-18 08:46:42 -07:00
Jose Diaz-Gonzalez
0816ee7575
Merge pull request #1180 from sherbondy/patch-1
...
Update docker-options.md
2015-05-18 10:50:38 -04:00
Michael Hobbs
0d2e5f1a14
Merge branch 'master' into mh-ps-scale
2015-05-17 17:45:01 -07:00
Jose Diaz-Gonzalez
7dd52ef1fc
Merge pull request #1192 from alessio/alessio-dokku-events
...
Add reference to dokku-events plugin
2015-05-17 19:39:41 -04:00
Alessio Treglia
347366b6e4
Add reference to dokku-events plugin
2015-05-17 22:20:46 +01:00
Jose Diaz-Gonzalez
3639f16137
Merge pull request #1168 from cjblomqvist/pr/1155
...
Better, actually working, git-rev plugin
2015-05-16 14:32:22 -04:00
Jose Diaz-Gonzalez
eac3eba50e
Merge pull request #1179 from trsc/prevent_dismissal_of_urls_in_checks_file
...
prevent dismissal of URLs in CHECKS file that contain query params
2015-05-16 14:30:21 -04:00
Jose Diaz-Gonzalez
5606a308b6
Release 0.3.18
2015-05-16 14:10:59 -04:00
Jose Diaz-Gonzalez
9980b74688
Merge pull request #1190 from progrium/minor-vagrant-fixes
...
Fix docker gpg key installation
2015-05-16 13:43:07 -04:00
Jose Diaz-Gonzalez
414b1fd744
Merge pull request #1171 from 3onyc/debconf
...
[RFC] Use debconf for package configuration
2015-05-16 13:41:47 -04:00
Jose Diaz-Gonzalez
b99e26811b
Merge pull request #1189 from vincentfretin/patch-7
...
wait 30 seconds and not 30 minutes
2015-05-16 13:41:17 -04:00
Vincent Fretin
2e69ff6041
wait 30 seconds and not 30 minutes
2015-05-16 18:20:50 +02:00
3onyc
d9a989d6b0
Use debconf to allow for command-line or unattended installation
2015-05-15 17:43:40 +02:00
Jose Diaz-Gonzalez
75180f7f9b
[ci skip] ensure we follow redirects and use ssl when grabbing the docker gpg key
...
Also install curl when running `vagrant up dokku-deb`
2015-05-12 15:47:12 -04:00
Jose Diaz-Gonzalez
fc466e2c05
[ci skip] Fix FORWARDED_PORT
2015-05-12 14:27:49 -04:00
Jose Diaz-Gonzalez
a54f9ebc7c
Merge pull request #1172 from progrium/1169_mh-fix-empty-nonssl-vhosts
...
unify default and custom nginx template processing
2015-05-12 10:33:01 -04:00
Ethan Sherbondy
1da6cd6b3c
Update docker-options.md
...
My changes may not be quite correct, but as far as I can tell, DOCKER_OPTIONS now requires specifying a phase explicitly.
Also updated references to `--link` since `-link` has been deprecated in Docker.
2015-05-11 20:59:37 -04:00
Michael Hobbs
c5337cf6a2
include output when overriding nginx template
2015-05-11 12:00:44 -07:00
Jose Diaz-Gonzalez
b0189049b7
Merge pull request #1178 from jagandecapri/patch-1
...
Update plugins.md
2015-05-11 11:16:46 -04:00
Jagatheesan Jack
fc4699dee9
Update plugins.md
...
Update plugins.md with another Bower/Gulp plugin.
2015-05-11 21:31:33 +08:00
Andreas Follmann
6eefcbb87c
prevent dismissal of URLs in CHECKS file that contain query params
2015-05-11 15:31:28 +02:00
Jose Diaz-Gonzalez
d9334900fb
Merge pull request #1173 from progrium/josegonzalez-badges
...
[ci skip] standardize readme badges
2015-05-07 01:30:29 -04:00
Jose Diaz-Gonzalez
f92d8d9a6a
[ci skip] standardize readme badges
2015-05-07 01:30:00 -04: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
cjblomqvist
cb1aac75fb
Better, actually working, git-rev plugin
...
The previous one broke deployment on first deployment and was always one (relative deploys) REV behind when "working".
2015-05-04 11:34:13 +02:00
Michael Hobbs
4aedb6507a
Merge branch 'master' into mh-ps-scale
2015-04-30 10:32:29 -07:00
Jose Diaz-Gonzalez
02277cc411
Merge pull request #1150 from cjblomqvist/patch-1
...
Add monit plugin
2015-04-30 07:35:29 -04:00
Jose Diaz-Gonzalez
495994daf0
Merge pull request #1153 from econya/readme-how-to-contribute
...
Add README-section: how to contribute
2015-04-30 07:35:09 -04:00
cjblomqvist
56d0af02c4
Update plugins.md
2015-04-30 09:51:30 +02:00
cjblomqvist
1a70dd1707
Update plugins.md
2015-04-30 09:51:14 +02:00
Jose Diaz-Gonzalez
e9ddde8a82
improve contribution section in README as proposed by josegonzalez.
2015-04-30 08:39:08 +02:00
Michael Hobbs
da92419023
Merge pull request #1151 from LTe/docker-stop
...
Do not kill docker container with SIGKILL
2015-04-29 13:57:40 -07:00
Piotr Niełacny
4aa970ace8
Do not kill docker container with SIGKILL
...
When we will use `kill` command on `docker` main process will receive
`SIGKILL` signal. This will result in immediate termination of
processes. We need to send a signal `SIGTERM` to main process and give
the opportunity to close application in correct way.
2015-04-29 16:00:16 +02:00
