Commit Graph

1685 Commits

Author SHA1 Message Date
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
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
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
Michael Hobbs
a983456030 remove magic additions to VHOST based on SSL cert. fixes #1368 2015-09-03 22:35:00 -04:00
Jose Diaz-Gonzalez
0904c3d458 Merge pull request #1225 from progrium/mh-image-tagging
allow tagging and deployment of tagged app images
2015-09-03 22:22:51 -04:00
Michael Hobbs
9eb30d9e33 make local consistent in functions 2015-09-03 18:55:52 -07:00
Michael Hobbs
74e1bf9f46 [ci skip] move taging to deployment doc 2015-09-03 18:55:33 -07:00
Michael Hobbs
5f7c4426b7 rename tag to tags. make verbs more consistent 2015-09-03 18:26:02 -07:00
Michael Hobbs
ccb9e4a571 remove duplicate output 2015-09-03 17:25:28 -07:00
Michael Hobbs
9c37069a6a create get_app_image_repo() to define our app image pattern and use it 2015-09-03 17:21:22 -07:00
Michael Hobbs
433db65635 use PLUGIN_PATH 2015-09-03 16:52:35 -07:00
Michael Hobbs
14acb8af1a move tag_image() to shared functions. explicitly set IMAGE 2015-09-03 16:52:23 -07:00
Michael Hobbs
880c4d11a0 include setting IMAGE_TAG from args 2015-09-03 16:43:44 -07:00
Michael Hobbs
495b1d2ba0 refactor to explicitly set IMAGE via get_app_image_name() 2015-09-03 16:12:36 -07:00
Michael Hobbs
2f16b06a76 [ci skip] fix up docs 2015-09-02 12:22:57 -07:00
Michael Hobbs
8be5c874ec errant use of local. derp 2015-09-02 11:59:50 -07:00
Michael Hobbs
d696013fe2 use get_running_image_tag in new enter plugin 2015-09-02 11:19:46 -07:00
Michael Hobbs
d8828c2d25 [ci skip] add documentation note about $IMAGE and get_running_image_tag() 2015-09-02 11:19:20 -07:00
Michael Hobbs
1c8722c763 fix my copypasta in unit test 2015-09-02 11:19:20 -07:00
Michael Hobbs
5be7641f87 call tag-add and tag-remove pluginhooks 2015-09-02 11:19:20 -07:00
Michael Hobbs
04a4da7fc5 allow tagging and deployment of tagged app images 2015-09-02 11:18:01 -07:00