Commit Graph
14761 Commits
Author SHA1 Message Date
KernelMadness 7eb8da5302 limit amount of lines in "dokku logs -t" 2015-09-14 23:59:19 +03:00
Jose Diaz-Gonzalez d3cdef44d9 Merge pull request #1463 from progrium/josegonzalez-patch-3
Update `Xenify Distro` option
2015-09-11 16:38:21 -04:00
Jose Diaz-Gonzalez 59c8be210b Update Xenify Distro option
Refs #1226
2015-09-11 16:16:09 -04:00
Michael Hobbs 8b357b2805 bump herokuish version to 0.3.3 2015-09-10 20:18:02 -07:00
Michael Hobbs 51e8b540cc Merge pull request #1458 from progrium/mh-trace
set TRACE=true when DOKKU_TRACE is set
2015-09-10 14:36:33 -07:00
Michael Hobbs 01525e3164 set TRACE=true when DOKKU_TRACE is set 2015-09-10 14:07:07 -07:00
Jose Diaz-Gonzalez 9bc7f459ef Merge pull request #1457 from lukechilds/bashstyle
Bashstyle fixes
2015-09-10 16:38:21 -04:00
Luke Childs 2123917e9b Consistent spacing before do/then 2015-09-10 20:46:29 +01:00
Luke Childs a7c0020ceb while and do on same line in dokku deploy 2015-09-10 20:43:48 +01:00
Luke Childs 299d530959 Use [[ instead of [ in dokku deploy 2015-09-10 20:33:10 +01:00
Jose Diaz-Gonzalez 1b5756ca54 Merge pull request #1447 from alanjds/fix-appname-detection
Fix: appname was not correctly detected
2015-09-10 12:45:41 -04:00
Jose Diaz-Gonzalez 9e98fe11e0 Merge pull request #1455 from progrium/1356_mh-safe-stop-kill-event
continue but log an event if/when container retirement fails
2015-09-10 12:45:25 -04:00
Michael Hobbs b2949d2199 log when killing old app container(s) fails 2015-09-10 08:47:48 -07:00
Michael Hobbs ff6de12196 Merge remote-tracking branch 'akatrevorjay/pull-req-0' into 1356_mh-safe-stop-kill-event 2015-09-10 08:30:50 -07:00
Alan Justino b4b4e266b2 Hoping Travis to like it this time... 2015-09-10 00:18:34 -03:00
Jose Diaz-Gonzalez c4766b7f8d Merge pull request #1451 from progrium/josegonzalez-patch-2
Revert change that whitelisted dokku-labeled containers
2015-09-08 14:35:07 -04:00
Jose Diaz-Gonzalez 88bd50abaf Revert change that whitelisted dokku-labeled containers
Rather than having a one-off hack for "blessed" containers, we should solve the issue properly. As that would take a bit more work, reverting to the previous state is preferred.

Better that we solve a problem problem than with a hack that we'll need to roll back in the future.

Refs #1220

[ci skip]
2015-09-08 14:35:00 -04:00
Jose Diaz-Gonzalez 39f09740b7 Merge pull request #1450 from progrium/mh-rename-events-hooks
rename event plugin buildstep hooks to buildpack
2015-09-08 11:52:27 -04:00
Jose Diaz-Gonzalez dca4e87d31 Merge pull request #1449 from progrium/josegonzalez-patch-2
Match herokuish deb with released version number
2015-09-08 11:51:16 -04:00
Jose Diaz-Gonzalez 1265463dcf Match herokuish deb with released version number
[ci skip]
2015-09-08 11:50:59 -04:00
Michael Hobbs b71f6f4660 rename buildstep hooks to buildpack 2015-09-08 08:50:17 -07:00
Jose Diaz-Gonzalez 56e7c09733 Merge pull request #1448 from progrium/josegonzalez-patch-2
Do not delete containers with the label dokku.service
2015-09-08 11:21:46 -04:00
Jose Diaz-Gonzalez 34c5b53857 Do not delete containers with the label dokku.service
[ci skip]
2015-09-08 11:21:38 -04:00
Alan Justino ad9d331257 Fix: appname was not correctly detected 2015-09-08 11:24:03 -03:00
Jose Diaz-Gonzalez a26602f3f2 Merge pull request #1446 from johnfraney/patch-1
Update nginx.md
2015-09-07 21:52:44 -04:00
John Franey 5fa167c408 Update nginx.md
Remove extra word in Nginx documentation
2015-09-07 22:50:59 -03:00
Jose Diaz-Gonzalez 5f17720d3f Update compatible version 2015-09-07 04:06:11 -04:00
Jose Diaz-Gonzalez 1de092d84e Merge pull request #1444 from progrium/docker-cleanup
Docker cleanup
2015-09-06 20:13:32 -04:00
Jose Diaz-Gonzalez ba82b544f0 Proper spacing in dokku_log_warn 2015-09-06 19:40:44 -04:00
Jose Diaz-Gonzalez d0c0ffc19c Do not remove any containers that have the label dokku. Closes #1220
This can be used to mark data containers as non-removable by the cleanup function
2015-09-06 19:23:15 -04:00
Jose Diaz-Gonzalez 342e9aa95b Move dokku cleanup into docker_cleanup function
This should slightly reduce DOKKU_TRACE output.
2015-09-06 19:21:12 -04:00
Jose Diaz-Gonzalez 7a1c080051 Merge pull request #1414 from progrium/1368_mh-certs-plugin
certs plugin
2015-09-04 13:26:43 -04:00
Jose Diaz-Gonzalez d50db13065 Re-add old ssl docs while 0.4.0 is still not released
[ci skip]
2015-09-04 13:26:12 -04:00
Jose Diaz-Gonzalez 3c894fd130 Move version into place before running copyfiles
Otherwise `make addman` will fail during test runs
2015-09-04 12:52:15 -04:00
Michael Hobbs 515afa8d62 lintballs 2015-09-03 21:44:19 -07:00
Jose Diaz-Gonzalez adfc3a8101 Use dokku_log_fail in favor of dokku_log_warn
If a command will exit because of invalid input, that isn't a warning, it's a failure.
2015-09-04 00:18:41 -04:00
Jose Diaz-Gonzalez 95161a2a9f Use dokku_log_fail in all cases where there is an exit 1 2015-09-04 00:17:45 -04:00
Jose Diaz-Gonzalez 76cf4d2969 Add support for certificate setting via files on disk (when on server)
This can be used as an alternative to importing via stdin, which may be preferred when working directly on a server, or via scripted installation/deployments.
2015-09-04 00:13:48 -04:00
Jose Diaz-Gonzalez 71ebf1e476 Add certs:update alias for certs:add 2015-09-04 00:00:07 -04:00
Jose Diaz-Gonzalez 1371056b20 Update documentation regarding multiple ssl certificate usage
[ci skip]
2015-09-03 23:55:06 -04:00
Jose Diaz-Gonzalez 148d563b82 Update note on replacing certificate 2015-09-03 23:37:23 -04:00
Jose Diaz-Gonzalez db4e847e8d Update documentation on ssl management
Also move into subdirectory

[ci skip]
2015-09-03 23:35:18 -04:00
Jose Diaz-Gonzalez d37e64d3d6 Move nginx:import-ssl to certs:add 2015-09-03 23:04:05 -04:00
Jose Diaz-Gonzalez f2e153744c [ci skip] minor formatting changes 2015-09-03 22:38:24 -04:00
Michael Hobbs 5cb62b168f lintball. also run nginx:build-config if domains:add fails 2015-09-03 22:35:38 -04:00
Michael Hobbs 8ea5cfa2aa document 'public' functions convention 2015-09-03 22:35:38 -04:00
Michael Hobbs 5378337456 document certs plugin 2015-09-03 22:35:00 -04:00
Michael Hobbs 983e0910b1 implement certs:remove. spit out csr on certs:generate 2015-09-03 22:35:00 -04:00
Michael Hobbs aec138ef32 heroku-like certs:info output 2015-09-03 22:35:00 -04:00
Michael Hobbs f9da2d5c25 initial pass at cert plugin functionality 2015-09-03 22:35:00 -04:00