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
Felix Wolfsteller
a36aaab686
add section about contribution to README
2015-04-29 10:52:38 +02:00
Felix Wolfsteller
c1d901723d
add section about curl timeout issues when pulling buildpack stuff while deploying.
2015-04-29 10:40:41 +02:00
cjblomqvist
952ff31189
Add monit plugin
2015-04-28 15:53:32 +02:00
Jose Diaz-Gonzalez
713a8d4f31
Merge pull request #1146 from progrium/1142_mh-domains-no-redeploy
...
don't re-deploy on domains:add. allow multple domains on command line. closes #1142
2015-04-27 22:11:01 -04:00
Jose Diaz-Gonzalez
42712f8896
Merge pull request #1148 from TheEmpty/patch-1
...
Add information about 444 for nginx in default_sever.
2015-04-27 21:35:39 -04:00
Mohammad El-Abid
e0adfd035f
Add information about 444 for nginx in default_sever.
2015-04-27 10:00:48 -04:00
Michael Hobbs
379ee525a8
Merge pull request #1144 from protonet/master
...
Allow git-remote with different port
2015-04-26 11:00:50 -07:00
Andreas Litt
b9e7a09f4c
Merge pull request #1 from progrium/1144_mh-test-git-remote-offport
...
add test for off-port git remote
2015-04-26 19:12:56 +02:00
Michael Hobbs
a6c7cc50ce
test off port git remote
2015-04-25 10:01:01 -07:00
Michael Hobbs
981e857ab1
add sshd config for off-port testing
2015-04-25 10:01:01 -07:00
Michael Hobbs
c8c4a6a0c6
pass through return code when calling destroy_app. allow custom git remote
2015-04-25 10:01:01 -07:00
Andreas Litt
383deb2b1b
exec git-receive-pack with correct path
2015-04-25 10:01:01 -07:00
Andreas Litt
9fdff11687
remove leading '/' from APP-Name.
2015-04-25 10:01:01 -07:00
Michael Hobbs
2f0f2889db
need to restart now
2015-04-24 15:41:32 -07:00
Michael Hobbs
dce031d38d
don't re-deploy on domains:add. allow multple domains on command line. closes #1142
2015-04-24 15:41:32 -07:00
Michael Hobbs
31fafe55d3
Merge pull request #1145 from progrium/1135_mh-docker-options-over-ssh
...
allow docker-options over ssh. plus test. closes #1135
2015-04-24 15:40:45 -07:00
Michael Hobbs
833f308d2f
Merge pull request #1147 from progrium/mh-parallelize-tests-plus-1-container
...
Utilize all 4 free CircleCI containers
2015-04-24 15:36:53 -07:00
Michael Hobbs
0c715d4b39
more test efficiencies and cleanup
2015-04-24 15:05:21 -07:00
Michael Hobbs
a529f6fce8
lintball
2015-04-24 14:02:44 -07:00
Michael Hobbs
0d838d1248
split up unit-tests and use 4 containers (they're free)
2015-04-24 13:52:14 -07:00
Michael Hobbs
3d2af158ff
allow docker-options over ssh. plus test. closes #1135
2015-04-24 12:10:02 -07:00
Michael Hobbs
673d43b532
output containers to be stopped and killed. attempt a kill on old containers after we attempt to stop them
2015-04-24 11:32:14 -07:00
Michael Hobbs
290745d324
only validate and restart nginx if we're deployed. use REGEX when handling SSL and NON-SSL hosts
2015-04-24 11:31:27 -07:00
Michael Hobbs
a18fa7afbe
we only need the first container here
2015-04-24 11:30:20 -07:00
Michael Hobbs
e9663caf5c
updated dokku ls output with container status
2015-04-24 10:49:18 -07:00
Andreas Litt
5968e81b17
exec git-receive-pack with correct path
2015-04-23 15:17:25 +02:00
Andreas Litt
3aa5231f7e
remove leading '/' from APP-Name.
2015-04-23 15:04:42 +02:00
Jose Diaz-Gonzalez
3c056527e8
Merge pull request #1140 from NigelThorne/patch-1
...
Replaced reference to gitreceive with sshcommand as per #746
2015-04-22 19:42:32 -04:00
Nigel Thorne
0fe3d92fd7
Replaced gitreceive with sshcommand as per #746
2015-04-23 09:37:50 +10:00
Jose Diaz-Gonzalez
2b8ea890ad
Merge pull request #1138 from chrisbutcher/patch-1
...
Include tip about using sshcommand acl-add
2015-04-22 18:59:23 -04:00
christopher butcher
9242a5dd31
Include tip about using sshcommand acl-add
2015-04-22 18:05:09 -04:00
