Commit Graph

2373 Commits

Author SHA1 Message Date
Jose Diaz-Gonzalez
7d71521851 Merge pull request #1941 from cu12/fix-check-plugin-command
Fix issue with plugins having plugins command
2016-02-25 00:59:07 -05:00
Domonkos Czinke
ac5944ec79 Fix issue with plugins having plugins command 2016-02-24 23:44:19 +01:00
Michael Hobbs
a146849a58 Merge pull request #1936 from dokku/mh-shellcheck-cleanup
cleanup shellcheck SC2086
2016-02-23 09:03:24 -08:00
Michael Hobbs
d1b87bd7b7 cleanup shellcheck SC2086 2016-02-23 07:50:06 -08:00
Michael Hobbs
ff9bb2cbd7 Merge pull request #1935 from dokku/mh-remove-nginx-test
remove unnecessary nginx test
2016-02-22 12:43:20 -08:00
Michael Hobbs
9b8f002aa8 remove unnecessary nginx test 2016-02-22 11:18:57 -08:00
Jose Diaz-Gonzalez
42f2f6b334 Merge pull request #1934 from dokku/mh-docker-ps-output-cleanup
fix get_running_image_tag() with docker 1.10.x
2016-02-22 14:12:05 -05:00
Michael Hobbs
676e8782ed fix get_running_image_tag() with docker 1.10.x 2016-02-22 10:21:20 -08:00
Jose Diaz-Gonzalez
d125ec5230 Merge pull request #1931 from dokku/relative-doc-links
Standardize on "relative" doc links
2016-02-21 03:14:46 -05:00
Jose Diaz-Gonzalez
f7d85b41cc Standardize on "relative" doc links
This will allow us to weather any future repository movements

[ci skip]
2016-02-21 03:12:48 -05:00
Jose Diaz-Gonzalez
86f9ba3b34 Merge pull request #1925 from dokku/jg-better-bootstrap
Update bootstrap.sh
2016-02-20 18:42:03 -05:00
Michael Hobbs
a9de2994bf Merge pull request #1836 from dokku/1824_mh-app-json
support scripts.dokku. in app.json
2016-02-20 06:35:40 -08:00
Michael Hobbs
48f2dc074c support scripts.dokku in app.json. closes #1824 2016-02-19 13:29:42 -08:00
Jose Diaz-Gonzalez
a4bfb46d6d Update bootstrap.sh
This pr makes it slightly easier to support dockerfile installations

- "simplifies" the bootstrap process by dividing it into distinct chunks
- Allows specifying `--no-install-recommends` when a dockerfile installation is detected
- Uses functions everywhere
- Removes global variables where possible
- Fixes shellcheck issues
- Allows specifying debconf via the command-line

[ci skip]
2016-02-19 04:35:43 -05:00
Jose Diaz-Gonzalez
55a4cb3274 Merge pull request #1892 from dokku/mh-nginx-vhosts-rewrite
nginx-vhosts rewrite
2016-02-18 22:56:09 -05:00
Michael Hobbs
9842d7498b nginx-vhosts rewrite 2016-02-18 18:38:54 -08:00
Jose Diaz-Gonzalez
4404e145c0 Merge pull request #1924 from dokku/1915-support-procfile-for-dockerfile-deploy
Fix #1564: Use Procfile for process types in Dockerfile apps
2016-02-18 21:23:06 -05:00
Paul McLanahan
6a01abb905 Fix #1564: Use Procfile for process types in Dockerfile apps
* Document new Procfile feature
* Add and update tests
* Fix a typo in generate_scale_file (ref #1923)
2016-02-18 21:22:26 -05:00
Jose Diaz-Gonzalez
8e297cd38e Release 0.4.14 v0.4.14 2016-02-18 18:52:53 -05:00
Michael Hobbs
9531a7afb7 Merge pull request #1923 from dokku/mh-typo-gen-scale-file
fix typo in generate_scale_file()
2016-02-17 14:57:07 -08:00
Michael Hobbs
5588357589 fix typo in generate_scale_file() 2016-02-17 13:03:43 -08:00
Jose Diaz-Gonzalez
b74a77ace0 Merge pull request #1922 from dokku/josegonzalez-patch-1
Link to our new ISSUE_TEMPLATE.md
2016-02-17 13:02:54 -05:00
Jose Diaz-Gonzalez
7cda485afe Link to our new ISSUE_TEMPLATE.md
Refs dear-github/dear-github#125

[ci skip]
2016-02-17 13:02:26 -05:00
Jose Diaz-Gonzalez
0cd1243e7a Merge pull request #1921 from dokku/josegonzalez-patch-1
Create ISSUE_TEMPLATE.md
2016-02-17 12:58:42 -05:00
Jose Diaz-Gonzalez
1f1d95b689 Create ISSUE_TEMPLATE.md
[ci skip]
2016-02-17 12:58:35 -05:00
Jose Diaz-Gonzalez
4f51432211 Merge pull request #1912 from mattberther/enter-non-tty
passing -i -t to docker exec only if tty present
2016-02-13 00:42:41 -05:00
Jose Diaz-Gonzalez
2b5397b639 Merge pull request #1913 from dokku/mh-one-off-docs
document appropriate crontab usage
2016-02-12 19:48:15 -05:00
Michael Hobbs
964c1ee983 [ci skip] document appropriate crontab usage 2016-02-12 16:36:30 -08:00
Matt Berther
a0253efc27 passing -i -t only if tty present 2016-02-12 16:44:44 -07:00
Jose Diaz-Gonzalez
111a93ad82 Merge pull request #1911 from 2mia/bugfix/git_url_plugin_install
bugfix: git url pattern
2016-02-12 12:18:39 -05:00
Mihai Iancu
c268fa840e bugfix: git url pattern
github git urls format is "git@...". `dokku plugin:install` command will fail due to format not being matched.
2016-02-12 18:07:57 +02:00
Jose Diaz-Gonzalez
8b8b689858 Merge pull request #1907 from dokku/mh-run-rm-container
fix dokku run --rm regression
2016-02-11 13:58:05 -05:00
Michael Hobbs
fae4d8b8bf fix dokku run --rm regression. add test. fixes #1906 2016-02-11 07:20:26 -08:00
Jose Diaz-Gonzalez
653dc1c518 Merge pull request #1901 from dokku/config-shebang
Add shebang to config/functions so editors see it as a shell script
2016-02-09 00:01:58 -05:00
Jose Diaz-Gonzalez
7c67350e15 Add shebang to config/functions so editors see it as a shell script 2016-02-08 23:30:36 -05:00
Jose Diaz-Gonzalez
5f8a9dc76c Merge pull request #1900 from dokku/josegonzalez-patch-1
Upgrade our CoC to 1.4 of the Contributor Covenant
2016-02-08 19:19:43 -05:00
Jose Diaz-Gonzalez
0f4774bf60 Upgrade our CoC to 1.4 of the Contributor Covenant
[ci skip]
2016-02-08 19:19:35 -05:00
Jose Diaz-Gonzalez
174b5b74ad Verify nginx configuration and toss away reload on failure
Refs #1880
2016-02-03 12:55:18 -05:00
Jose Diaz-Gonzalez
a6d79b20bd Add note that phases must be comma-separated sans spaces
Closes #1893

[ci skip]
2016-01-31 16:27:06 -05:00
Justin Clark
7031682d6a Merge pull request #1887 from u2mejc/u2mejc-issue1885
Fix <command>:help hangs for certs, enter, tags, tar
2016-01-29 11:21:05 -08:00
Jose Diaz-Gonzalez
0ddc4ba496 Merge pull request #1888 from u2mejc/u2mejc-issue1886
Remove brocken symlinks when using copyfiles
2016-01-27 14:44:16 -05:00
Justin Clark
05378f53db Remove brocken symlinks when using copyfiles 2016-01-26 18:59:20 -08:00
Justin Clark
c62e384b47 Fix <command>:help hangs for certs, enter, tags, tar 2016-01-26 18:44:24 -08:00
Jose Diaz-Gonzalez
d8a7450f6b Merge pull request #1883 from dokku/mh-plugn-list-version
show plugn version when listing plugins
2016-01-26 13:14:49 -05:00
Michael Hobbs
4cf87c50de [ci skip] show plugn version when listing plugins 2016-01-26 10:11:24 -08:00
Jose Diaz-Gonzalez
21d343b3ad Merge pull request #1882 from dokku/josegonzalez-patch-1
Add a note to warn users to peg to specific versions of buildpacks
2016-01-25 11:43:08 -05:00
Jose Diaz-Gonzalez
bfcf834b07 Add a note to warn users to peg to specific versions of buildpacks
This should avoid users blaming dokku for not realizing that multi-buildpacks by default will install latest if you don't peg to a version.

[ci skip]
2016-01-25 11:42:45 -05:00
Jose Diaz-Gonzalez
8a0b299af7 Release 0.4.13 v0.4.13 2016-01-20 22:59:29 -05:00
Michael Hobbs
543642eb5f Merge pull request #1872 from kenips/support/better_logs_for_checks
Update log to better reflect what's going on with CHECKS
2016-01-18 17:48:22 -08:00
Ken Ip
bf1e9ddaee Update log to better reflect what's going on with CHECKS 2016-01-18 19:35:47 -05:00