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,306 Commits 6 Branches 319 Tags
daeea6ba1306537bb15bddd8cdfdb3d8b34820e6
Commit Graph

339 Commits

Author SHA1 Message Date
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
Michael Hobbs
af38e4f25a filter out literal wildcard when deploying an unrelated domain. closes #1185 2015-05-19 17:58:02 -07: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
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
Michael Hobbs
0d2e5f1a14 Merge branch 'master' into mh-ps-scale 2015-05-17 17:45:01 -07: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
Vincent Fretin
2e69ff6041 wait 30 seconds and not 30 minutes 2015-05-16 18:20:50 +02:00
Michael Hobbs
c5337cf6a2 include output when overriding nginx template 2015-05-11 12:00:44 -07:00
Andreas Follmann
6eefcbb87c prevent dismissal of URLs in CHECKS file that contain query params 2015-05-11 15:31:28 +02: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
Michael Hobbs
4aedb6507a Merge branch 'master' into mh-ps-scale 2015-04-30 10:32:29 -07: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
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
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
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
Michael Hobbs
39dd4fc700 fix typo in output 2015-04-21 23:22:08 -07:00
Michael Hobbs
c2fa8d14c9 scale web to 1 by default and ignore all others 2015-04-21 22:13:45 -07:00
Michael Hobbs
eb0935a691 make dokku ls pretty 2015-04-21 22:02:21 -07:00
Michael Hobbs
9d504fe93a make sure we cleanup tmp. logging when we hit edge cases 2015-04-21 21:36:03 -07:00
Michael Hobbs
e74c6460fb make semantic sense of _image functions 2015-04-21 20:27:16 -07:00
Michael Hobbs
2cb957d1dd move release_and_deploy to plugin functions. only attempt Procfile copy if we're buildstep based 2015-04-21 20:21:25 -07:00
Michael Hobbs
3361a20a30 only check containers running proc named web for now 2015-04-21 14:33:28 -07:00
Michael Hobbs
636e139e4a only balance web containers 2015-04-21 14:33:28 -07:00
Michael Hobbs
ddf893bc8a fix rebuildall and restartall 2015-04-21 14:33:28 -07:00
Michael Hobbs
9a704bc656 use test in both cases 2015-04-21 14:33:28 -07:00
Michael Hobbs
d44788721f format multiple scale lines 2015-04-21 14:32:31 -07:00
Michael Hobbs
14cc01dd5b use helper functions 2015-04-21 14:32:31 -07:00
Michael Hobbs
bbc03dbfdd helper functions 2015-04-21 14:32:30 -07:00
Michael Hobbs
d5cc7595fd default web proc. avoid unclear file not found error when procfile is missing 2015-04-21 14:32:30 -07:00
Michael Hobbs
435f7e69eb only attempt copy if image exists 2015-04-21 14:32:30 -07:00
Michael Hobbs
d42bb79d38 handle non-herokuish deploys that don't create Procfiles. i.e. buildpack-nginx 2015-04-21 14:32:30 -07:00
Michael Hobbs
389b5efa06 only release and deploy if we're modifying scale settings 2015-04-21 14:32:30 -07:00
Michael Hobbs
5c85e8bf65 app repo SCALE file takes precedence over local settings 2015-04-21 14:32:30 -07:00
Michael Hobbs
99d2601f2f fix tests 2015-04-21 14:32:30 -07:00
Michael Hobbs
e27d0e6fa5 wrap container id checks and reading into common function that attempts new and old style container id files 
aggregate log streams
 2015-04-21 14:32:30 -07:00
Michael Hobbs
33f872183e initial pass at container-level scaling 2015-04-21 14:27:23 -07:00
Michael Hobbs
661b6706de fix verify_app_name to bomb on null app. use it in nginx:build-config 2015-04-21 10:58:11 -07:00
Jose Diaz-Gonzalez
b299f66c28 Validate nginx configuration before reloading nginx. Closes #999 2015-04-21 02:07:27 -04:00
Jose Diaz-Gonzalez
b5495ed0c3 use helper functions instead of echo command 2015-04-21 01:14:10 -04:00
Jose Diaz-Gonzalez
d6aa8d59f1 [ci skip] ensure users run dokku-installer as sudo user 2015-04-19 16:55:08 -04:00
Jose Diaz-Gonzalez
d9d3a16e5c Prompt users to run the web installer via MOTD. Closes #943 2015-04-18 03:56:19 -04:00
Josh Cohen
e33d17b7dd updated text from @savant 2015-04-18 05:38:23 +00:00
Josh Cohen
30f9ab740d Logging info suggesting tuned CHECKS 2015-04-17 23:25:43 +00:00
3onyc
bc8750ebe3 Call pre-build-dockerfile before docker build 2015-04-14 20:46:19 +02:00
Jose Diaz-Gonzalez
1a151ddabe Merge pull request #1056 from joshco/feature/retries 
Review: Feature/retries
 2015-04-13 17:18:00 -04:00
Josh Cohen
b5eef489fd linting fixes 2015-04-13 20:22:14 +00:00