Commit Graph
5079 Commits
Author SHA1 Message Date
Rob Blanckaert b687e3297d Cygwin tar can sometimes make tarballs with permissions where the owner doesnt have read rights on the files. Thats obviously no good. 2015-08-29 00:34:37 -04:00
Jim Myhrberg d5df6a4190 Use $PLUGIN_PATH instead of $(dirname $0)/..
As briefly discussed in #1425, source the `common/functions` file via an
absolute path, rather than determining the relative path by using
`dirname`. 3rd-party plugins should follow suit and use the new
`$PLUGIN_PATH` convention too.
2015-08-28 14:14:28 +01:00
Michael Hobbs 84fff1c2e2 Merge pull request #1419 from u2mejc/dokku-help-tty
Fix dokku ps <app> over ssh
2015-08-27 10:36:37 -07:00
Rob Blanckaert 5a51246007 - Strip prefix directories from tarball 2015-08-26 20:08:20 -04:00
Rob Blanckaert 712e1cada7 - Fixed shellcheck error
- Made test pass
2015-08-26 02:37:52 -04:00
Jose Diaz-Gonzalez ebfcece620 Merge pull request #1422 from progrium/guard-domains-plugin
Guard against missing VHOST files
2015-08-26 00:48:46 -04:00
Jose Diaz-Gonzalez bd0803cf29 Merge pull request #1344 from AdamVig/master
Add better error checking on nginx:import-ssl
2015-08-26 00:26:07 -04:00
Jose Diaz-Gonzalez a1e747f4ad Guard against missing VHOST files
This can occur if the app isn't using vhosts but the user runs the command.
2015-08-26 00:15:09 -04:00
Rob Blanckaert f3e0c63f68 First pass at tar plugin. 2015-08-26 00:08:42 -04:00
Jose Diaz-Gonzalez 771eaa33ee Fix SC2125 violation 2015-08-25 23:31:53 -04:00
Jose Diaz-Gonzalez eccdc04268 Add dokku enter for connecting to an app container
This command can be used to enter a running container. The following variations of the command exist:

    dokku enter api web
    dokku enter api web.1
    dokku enter api --container-id ID

By default, it runs a `/bin/bash`, but can also be used to run a custom command:

    # just echo hi
    dokku enter api web echo hi

    # run a long-running command, as one might for a cron task
    dokku enter api web python script/background-worker.py

Closes #1332
2015-08-25 23:23:26 -04:00
Jose Diaz-Gonzalez 606352b6ed Add the ability to retrieve container ids by container type
You can now use the following to narrow down the search for a container id:

    get_app_container_ids app web
    get_app_container_ids app worker

You can also specify a specific type "id" like so:

    get_app_container_ids app web.1
    get_app_container_ids app worker.3

Specifying an invalid type or id will result in an empty response
2015-08-25 23:00:49 -04:00
Justin Clark e349d38581 Fix dokku ps <app> over ssh
Resolved the TTY error when connecting over ssh.
Updated ps to use has_tty function.
2015-08-25 17:35:28 -07:00
Randall Leeds 183edc9839 Remove uses of (un)set-norestart 2015-08-24 15:57:34 -07:00
Michael Hobbs 6d71c164f0 Merge pull request #1128 from progrium/1091_mh-switch-to-herokuish
switching to herokuish. closes #1091
2015-08-24 12:11:05 -07:00
Jose Diaz-Gonzalez 3f43a64430 Merge pull request #1399 from basicer/fix-multi-receive-app
Make dokku play nice when we have multiple receive-app hooks
2015-08-24 14:54:13 -04:00
Rob Blanckaert 98990b6885 Make dokku play nice when we have multiple receive-app hooks in various plugins. 2015-08-24 14:20:36 -04:00
Michael Hobbs 42905c345b support comments in DOKKU_SCALE and print contents on deploy 2015-08-24 09:22:07 -07:00
Jakob Krigovsky c589e8e267 Disable emitting nginx’s version 2015-08-21 19:12:16 +02:00
Jakob Krigovsky 66c7f8f056 Remove ssl_prefer_server_ciphers directive from dokku.conf
The default nginx.conf of nginx 1.8.0 already includes this directive.
2015-08-21 19:12:16 +02:00
Jakob Krigovsky 2980731db5 Remove ssl_protocols directive from dokku.conf
The default nginx.conf of nginx 1.8.0 already includes this directive.
2015-08-21 19:12:16 +02:00
Jakob Krigovsky ef6f58a96c Revert "Force install a default nginx.conf. Closes #799"
This reverts commit 129a5fd33d.
2015-08-21 19:12:16 +02: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
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
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 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
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
alexkruegger 9910fb03da fix bug in nginx.conf.template getting from /app directory 2015-07-20 14:02:44 +03:00
Michael Hobbs d2f2bc9ac1 update docs to reflect default checks. rename DOKKU_DEFAULT_WAIT to DOKKU_DEFAULT_CHECKS_WAIT. refs #1323 2015-07-17 07:25:35 -07:00
Matt Walker d457ffe7ee Spelling fix: 'comma seperated'=>'comma-separated' 2015-07-14 15:46:32 -07:00
Michael Hobbs c7cb014580 convenience functions for app container state 2015-07-13 09:27:42 -07:00
Michael Hobbs 633c595311 use docker inspect instead of docker ps grep pattern. closes #1281 2015-07-13 09:09:38 -07:00
Kilian Ciuffolo 0424d5a744 fixes #1270 faulty default container check 2015-07-13 09:09:38 -07:00
Jose Diaz-Gonzalez 0a4c22dfea Merge pull request #1278 from progrium/nginx-template-from-app
Nginx template from app
2015-07-13 10:35:42 -04:00
Jose Diaz-Gonzalez 68b12ab46f Merge pull request #1298 from SonicHedgehog/fix-check-root
Fix check-deploy skipping the root path
2015-07-13 10:31:21 -04:00
Jose Diaz-Gonzalez ca1b17ea8d Use nginx.conf.template as the template name 2015-07-12 20:06:21 -04:00
Jose Diaz-Gonzalez 007946f52a Use simplified method for retrieving a container id 2015-07-12 20:02:29 -04:00
Michael Hobbs 3e58824377 Merge branch 'master' into kilianc_hotfix-#1259 2015-07-12 16:27:10 -07:00
Michael Hobbs ee4fca572e mv dockerfile port logic to common function + tests. closes #1280 2015-07-12 15:57:12 -07:00
Jose Diaz-Gonzalez 43b179735b Merge pull request #1261 from Flink/bypass-checks-on-demand
Allows to skip checks (all or default)
2015-07-11 16:31:21 -04:00
Jose Diaz-Gonzalez 6895dd9936 Use get_container_ids method to retrieve container for nginx conf 2015-07-11 16:29:25 -04:00
Assaf Arkin 71b79da262 CHANGED extract nginx.conf.template from project 2015-07-11 15:05:06 -04:00
Jakob Krigovsky 5f03518ec8 Fix check-deploy skipping the root path
The root path, `/`, was treated as an invalid URL because it didn’t
contain any characters after the slash.
2015-07-11 13:46:17 +02:00
Michael Hobbs 4629a9909b Merge pull request #1291 from progrium/1261_mh-config-args-refactor
initial pass at config plugin arguments refactor
2015-07-10 07:55:18 -07:00
Michael Hobbs fd187ec837 [ci skip] remove unnecessary comments and update docs 2015-07-09 13:22:12 -07:00
Michael Hobbs eebcfd85ab fix deprecated comments and include *-buildstep pluginhooks for point release 2015-07-09 13:15:57 -07:00