Commit Graph
14676 Commits
Author SHA1 Message Date
O'meid 777a09847c Make bootstrap.sh safe from bad connection
This allows to run the bootstrap.sh directly and "safely" without storing it on disk.

Signed-off-by: O'meid <public@omeid.me>
2015-08-04 17:13:42 +10:00
Jose Diaz-Gonzalez 00d834bdc3 Merge pull request #1365 from progrium/1364_mh-sh-not-bash
support dockerfile images that don't include bash
2015-08-03 15:30:32 -04:00
Michael Hobbs 8edea8512d use /bin/sh instead of /bin/bash in order to support dockerfile images that don't include bash. fixes #1364 2015-08-03 11:42:30 -07:00
Jose Diaz-Gonzalez 466df88660 Merge pull request #1358 from bkniffler/patch-1
Add suggestion for low memory VMs
2015-08-01 22:02:01 -04:00
bkniffler 9fb7c205df Move small memory instructions to advanced installation - installation.md 2015-07-31 18:26:07 +02:00
bkniffler fa36d38fb7 Small fix 2015-07-31 18:19:56 +02:00
bkniffler 3a0a873079 Move small memory instructions to advanced installation 2015-07-31 18:18:37 +02:00
Jose Diaz-Gonzalez b371bca82e Merge pull request #1357 from progrium/1355_mh-deploy-no-webproc
only run domains and nginx config if we have a port and ip
2015-07-31 10:47:23 -04:00
Jose Diaz-Gonzalez 05b7a8ecbd Merge pull request #1359 from progrium/1258_mh-dokku-wait-to-retire-per-app
allow DOKKU_WAIT_TO_RETIRE to be defined per app
2015-07-31 10:31:51 -04:00
Michael Hobbs c02ba86c81 allow DOKKU_WAIT_TO_RETIRE to be defined per app. closes #1258 2015-07-30 15:03:19 -07:00
bkniffler 003ab07ff4 Adapt to other shell example script 2015-07-30 23:57:52 +02:00
bkniffler d66b4665d0 Little correction 2015-07-30 23:53:01 +02:00
bkniffler 07cb639bd5 Add suggestion for low memory VMs 2015-07-30 23:38:27 +02:00
Michael Hobbs 11e10fceef only run domains and nginx config if we have a port and ip. fixes #1355 2015-07-30 14:29:36 -07:00
Trevor Joynson (trevorj) c750f5a768 Allow stop/kill to continue in the event that it cannot stop or kill one of the old containers.
Also actually attempt to kill if stop has a bad exit code.
2015-07-30 16:42:13 -04:00
Michael Hobbs b0d55ce589 Merge pull request #1354 from alessio/events-new-receive-branch-hook
Log receive-branch pluginhook
2015-07-30 08:39:02 -07:00
Alessio Treglia 78c0cdc12d Log receive-branch pluginhook
Such new pluginhook was introduced in dokku v0.3.22.
2015-07-30 15:37:47 +01:00
Adam Vigneaux c1a0e0ce68 Improve file searching and variable usage
- Count files using find and grep instead of ls and wc
- Use the same variable to find files and move files, allowing files to
be in a subdirectory
2015-07-28 18:48:31 -04:00
Michael Hobbs d21caa4811 Merge branch 'master' into 1091_mh-switch-to-herokuish 2015-07-28 10:55:44 -07:00
Michael Hobbs fd3f84669b Merge pull request #1292 from progrium/mh-columnar-help-output
use column to format help output
2015-07-28 10:51:50 -07:00
Michael Hobbs 36d607a4f4 [ci skip] update docs 2015-07-28 09:36:42 -07:00
Michael Hobbs b30db17def use column to format help output 2015-07-28 09:31:56 -07:00
Michael Hobbs d05df06f1a Merge pull request #1349 from alexkruegger/master
add plugin dokku-app-configfiles
2015-07-28 08:51:03 -07:00
alexkruegger 7e89932dba Update plugins.md 2015-07-28 18:48:00 +03:00
alexkruegger 7cd1b6cdc5 add plugin dokku-app-configfiles 2015-07-28 18:05:29 +03:00
Jose Diaz-Gonzalez 8df24ff4a6 Merge pull request #1346 from progrium/1220_mh-document-dokku-cleanup
document dokku cleanup and the potential of compat issues
2015-07-27 13:08:08 -04:00
Michael Hobbs 67ab803283 [ci skip] document dokku cleanup and the potential of compat issues. closes #1220 2015-07-27 09:50:06 -07:00
Jose Diaz-Gonzalez e9efcbead4 Merge pull request #1321 from econya/master
In doc: mention alternative to nginx.conf templates: include-dir.
2015-07-26 22:56:41 -04:00
Adam Vigneaux dc5f34534b Improve formatting 2015-07-26 22:37:56 -04:00
Adam Vigneaux 14e72ea337 Add better error checking on nginx:import-ssl 2015-07-26 22:21:32 -04:00
Michael Hobbs 3525f699f9 Merge pull request #1341 from progrium/1336_mh-use-dockerfile-port-sans-vhost
set and use $port whenever $PROC_TYPE == 'web'
2015-07-24 12:45:15 -07:00
Michael Hobbs 9593bd6d48 simplify docker run logic in deploy 2015-07-24 12:15:10 -07:00
Michael Hobbs da5f42a13e set and use $port whenever $PROC_TYPE == 'web'. closes #1336 2015-07-24 10:40:00 -07:00
Michael Hobbs 0deea445d6 Merge pull request #1337 from progrium/josegonzalez-buildstep
Update PREBUILT_STACK_URL to latest buildstep release
2015-07-23 11:12:26 -07:00
Jose Diaz-Gonzalez 84538e1c1d Update PREBUILT_STACK_URL to latest buildstep release 2015-07-23 13:33:11 -04:00
Jose Diaz-Gonzalez 97eefef04a Fix version
[ci skip]
2015-07-22 14:36:48 -04:00
Jose Diaz-Gonzalez 04b9f0cb9a Fix version
[ci skip]
2015-07-22 14:36:19 -04:00
Jose Diaz-Gonzalez b3ddea604a Fix docs link
[ci skip]
2015-07-22 14:14:56 -04:00
Jose Diaz-Gonzalez 511d9717ec Merge pull request #1305 from progrium/template
Updated Docs Site
2015-07-22 14:13:00 -04:00
Jose Diaz-Gonzalez c14f29b01b fix link to documentation [ci skip] 2015-07-22 14:07:52 -04:00
Jose Diaz-Gonzalez ccc3b810c7 Add missing Release Process link [ci skip] 2015-07-22 14:06:39 -04:00
Jose Diaz-Gonzalez 53a3438cf7 Link docs page 2015-07-22 14:05:22 -04:00
Jose Diaz-Gonzalez cafbb8a4f9 minor column tweak 2015-07-22 14:05:22 -04:00
Jose Diaz-Gonzalez 230cdaf996 change column sizes 2015-07-22 14:05:22 -04:00
Jose Diaz-Gonzalez 1ef42b527d add padding 2015-07-22 14:05:22 -04:00
Jose Diaz-Gonzalez cefe772330 remove todo 2015-07-22 14:05:22 -04:00
Jose Diaz-Gonzalez 6dc2b218c7 style tables after the fact 2015-07-22 14:05:22 -04:00
Jose Diaz-Gonzalez 025699cd01 Fix margin on pages 2015-07-22 14:05:22 -04:00
Jose Diaz-Gonzalez a8b1f4fae5 Attempt to add a sidebar and use fluid container positioning for non-home pages 2015-07-22 14:05:22 -04:00
Jose Diaz-Gonzalez 9b64298314 Use a fluid container 2015-07-22 14:05:22 -04:00