Commit Graph

1601 Commits

Author SHA1 Message Date
Jose Diaz-Gonzalez
12f97ee18e Use config:get --globalto instead of grep to check for global curl config 2015-08-30 01:23:56 -04:00
Jose Diaz-Gonzalez
14f228b1b5 fix global config:set calls 2015-08-30 01:23:56 -04:00
Jose Diaz-Gonzalez
60c0f56724 Fix lint errors 2015-08-30 01:23:56 -04:00
Jose Diaz-Gonzalez
afe65a86fb eval the output of "dokku config --export" to get env config
This should theoretically be safe, as "--export" forces the `dokku config` command to return 0 in all cases, and it should only output lines that are "valid" environment variables
2015-08-30 01:23:56 -04:00
Jose Diaz-Gonzalez
6566be04e5 Do not exit 1 when there is no env file and the --export flag is in use 2015-08-30 01:23:56 -04:00
Jose Diaz-Gonzalez
2de2151f58 Use config:set to set curl options 2015-08-30 01:23:56 -04:00
Jose Diaz-Gonzalez
c2626bf934 Add --export flag for producing export-compatible config output 2015-08-30 01:23:56 -04:00
Jose Diaz-Gonzalez
770139d2ca Merge pull request #1420 from progrium/1332-enter-plugin
Add `dokku enter` for connecting to an app container
2015-08-29 20:57:42 -04:00
Jose Diaz-Gonzalez
2bcb9caaf7 Merge pull request #1431 from progrium/josegonzalez-patch-2
Add helper function for inspecting the state of a container
2015-08-29 20:45:53 -04:00
Jose Diaz-Gonzalez
9055f90dcc Add helper function for inspecting the state of a container
This function - `is_container_status` - can be used to inspect whether a container is any of the following:

- Dead
- OOMKilled
- Paused
- Restarting
- Running

It can be useful for deeper inspection as to plugin state
2015-08-29 02:31:03 -04:00
Jose Diaz-Gonzalez
3a3550e667 Merge pull request #1430 from lubert/master
Changed BOX_NAME to bento/ubuntu-14.04 [ci skip]
2015-08-29 00:19:12 -04:00
lubert
28288f70ed Changed BOX_NAME to bento/ubuntu-14.04 [ci skip] 2015-08-28 21:10:28 -07:00
Jose Diaz-Gonzalez
7d28f751b7 Merge pull request #1428 from jimeh/use-plugin-path-env-var
Use `$PLUGIN_PATH` instead of `$(dirname $0)/..`
2015-08-28 10:35:06 -04:00
Jim Myhrberg
9637884861 Update docs with $PLUGIN_PATH instead of $(dirname $0)/.. 2015-08-28 14:27:48 +01: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
Jose Diaz-Gonzalez
32a8c0307f Merge pull request #1426 from henrik/patch-1
plugins.md: replace memcached link
2015-08-27 14:49:43 -04:00
Henrik Nyh
1372c426ef plugins.md: replace memcached link
With a better-maintained fork.
2015-08-27 20:01:48 +02: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
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
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
Jose Diaz-Gonzalez
09ee1def8f Merge pull request #1418 from progrium/cgroupfs-mount
Use cgroupfs-mount as alternative package to cgroup-lite
2015-08-25 12:33:59 -04:00
Jose Diaz-Gonzalez
4f25392d9b Use cgroupfs-mount as alternative package to cgroup-lite
This should allow installation of the dokku packages on debian jessie. Upstream docker created this package in response to an issue where `cgroup-bin` could not be installed at the same time as lxc.

Closes #1236
Refs #1076

[ci skip]
2015-08-25 12:33:47 -04:00
Jose Diaz-Gonzalez
4c05fbc020 Merge pull request #1417 from progrium/vagrant-expose-build
Expose host and port for build vm
2015-08-25 12:24:48 -04:00
Jose Diaz-Gonzalez
4021b19dfc Expose host and port for build vm
[ci skip]
2015-08-25 12:24:25 -04:00
Michael Hobbs
1622fc3673 Merge pull request #1407 from ertrzyiks/ertrzyiks-patch-1
Update variable name in docs
2015-08-25 08:22:31 -07:00
Michael Hobbs
461e79386a Merge pull request #1415 from tilgovi/remove-norestart-uses
Remove uses of (un)set-norestart
2015-08-24 16:31:46 -07:00
Randall Leeds
183edc9839 Remove uses of (un)set-norestart 2015-08-24 15:57:34 -07:00
Jose Diaz-Gonzalez
5676dbc4c6 Release 0.3.26 v0.3.26 2015-08-24 16:01:28 -04: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
Jose Diaz-Gonzalez
f20d24463f Merge pull request #1413 from progrium/mh-dokku-scale-with-comments
support comments in DOKKU_SCALE and print contents on deploy
2015-08-24 14:26:34 -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
Michael Hobbs
d0623ea37b [ci skip] fix make count on OS X 2015-08-24 09:05:32 -07:00
Jose Diaz-Gonzalez
5717e3afef Merge pull request #1411 from progrium/josegonzalez-patch-2
Clarify `ps:scale` example
2015-08-23 20:52:32 -04:00
Jose Diaz-Gonzalez
268c8763b2 Clarify ps:scale example
[ci skip]
2015-08-23 20:52:26 -04:00
Jose Diaz-Gonzalez
cb0565eb56 Merge pull request #1410 from progrium/josegonzalez-patch-2
Clarify DOKKU_SCALE usage
2015-08-23 20:50:40 -04:00
Jose Diaz-Gonzalez
4cd40aef03 Clarify DOKKU_SCALE usage
refs #1409

[ci skip]
2015-08-23 20:50:35 -04:00
Mateusz Derks
1a8ac56673 Update variable name in docs 2015-08-23 20:23:29 +02:00
Jose Diaz-Gonzalez
198fe14b7b Merge pull request #1401 from progrium/1219-apt-transport-https
Install apt-transport-https before adding https-backed apt sources
2015-08-20 20:22:13 -04:00
Jose Diaz-Gonzalez
9409fc2ef0 Install apt-transport-https before adding https-backed apt sources
Refs #1219

[ci skip]
2015-08-20 20:21:06 -04:00
Jose Diaz-Gonzalez
ab6f49cebe Merge pull request #1400 from progrium/history-fix
Fix history formatting
2015-08-20 20:16:15 -04:00
Jose Diaz-Gonzalez
5492b0e4e0 Fix history formatting [ci skip] 2015-08-20 20:16:00 -04:00
Jose Diaz-Gonzalez
acd28f4647 Release 0.3.25 v0.3.25 2015-08-19 22:01:26 -04:00
Jose Diaz-Gonzalez
e5976e62c7 Merge pull request #1398 from progrium/revert-1394
Revert "Remove `dokku plugins-install` from postinst hook"
2015-08-19 21:48:26 -04:00