github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into separate-data-root-for-docker-binds

Browse Source
This commit is contained in:
Jody McIntyre
2018-04-16 18:54:58 -04:00
committed by GitHub
parent 1ad89bf53b 94a1f895d0
commit beea394822
41 changed files with 141 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/00_dokku-standard/commands
View File

@@ -1,14 +1,13 @@
#!/usr/bin/env bash
[[ " help help:help ls:help run:help trace:help url:help urls:help version:help " == *" $1 "* ]] || exit "$DOKKU_NOT_IMPLEMENTED_EXIT"
[[ " help help:help run:help trace:help url:help urls:help version:help " == *" $1 "* ]] || exit "$DOKKU_NOT_IMPLEMENTED_EXIT"
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
case "$1" in
help|ls:help|run:help|trace:help|url:help|urls:help|version:help)
help|run:help|trace:help|url:help|urls:help|version:help)
[[ $(echo "$1" | sed '/.*:help/!d') ]] && help_topic="${1%\:help}"
help_content_func () {
declare desc="return standard plugin help content"
cat<<help_content
ls , Pretty listing of deployed applications and containers
run <app> <cmd>, Run a command in a new container using the current application image
trace [on/off], Enable dokku tracing
url <app>, Show the first URL for an application (compatibility)

2
plugins/00_dokku-standard/plugin.toml
View File

@@ -1,4 +1,4 @@
[plugin]
description = "dokku core standard plugin"
version = "0.12.1"
version = "0.12.2"
[plugin.config]

2
plugins/20_events/plugin.toml
View File

@@ -1,4 +1,4 @@
[plugin]
description = "dokku core events logging plugin"
version = "0.12.1"
version = "0.12.2"
[plugin.config]

2
plugins/apps/plugin.toml
View File

@@ -1,4 +1,4 @@
[plugin]
description = "dokku core apps plugin"
version = "0.12.1"
version = "0.12.2"
[plugin.config]

2
plugins/build-env/plugin.toml
View File

@@ -1,4 +1,4 @@
[plugin]
description = "dokku core build-env plugin"
version = "0.12.1"
version = "0.12.2"
[plugin.config]

2
plugins/certs/plugin.toml
View File

@@ -1,4 +1,4 @@
[plugin]
description = "dokku core certificate management plugin"
version = "0.12.1"
version = "0.12.2"
[plugin.config]

2
plugins/checks/plugin.toml
View File

@@ -1,4 +1,4 @@
[plugin]
description = "dokku core checks plugin"
version = "0.12.1"
version = "0.12.2"
[plugin.config]

13
plugins/common/functions
View File

@@ -398,6 +398,19 @@ is_deployed() {
fi
}
is_container_running() {
declare desc="return 0 if given docker container id is in running state"
declare deprecated=true
local CID=$1
local CONTAINER_STATUS=$(docker inspect -f '{{.State.Running}}' "$CID" || true)
if [[ "$CONTAINER_STATUS" == "true" ]]; then
return 0
else
return 1
fi
}
is_container_status() {
declare desc="return 0 if given docker container id is in given state"
local CID=$1

2
plugins/common/plugin.toml
View File

@@ -1,4 +1,4 @@
[plugin]
description = "dokku core common plugin"
version = "0.12.1"
version = "0.12.2"
[plugin.config]

2
plugins/config/plugin.toml
View File

@@ -1,4 +1,4 @@
[plugin]
description = "dokku core config plugin"
version = "0.12.1"
version = "0.12.2"
[plugin.config]

2
plugins/docker-options/plugin.toml
View File

@@ -1,4 +1,4 @@
[plugin]
description = "dokku core docker-options plugin"
version = "0.12.1"
version = "0.12.2"
[plugin.config]

2
plugins/domains/plugin.toml
View File

@@ -1,4 +1,4 @@
[plugin]
description = "dokku core domains plugin"
version = "0.12.1"
version = "0.12.2"
[plugin.config]

2
plugins/enter/plugin.toml
View File

@@ -1,4 +1,4 @@
[plugin]
description = "dokku core enter plugin"
version = "0.12.1"
version = "0.12.2"
[plugin.config]

2
plugins/git/plugin.toml
View File

@@ -1,4 +1,4 @@
[plugin]
description = "dokku core git plugin"
version = "0.12.1"
version = "0.12.2"
[plugin.config]

2
plugins/logs/plugin.toml
View File

@@ -1,4 +1,4 @@
[plugin]
description = "dokku core logs plugin"
version = "0.12.1"
version = "0.12.2"
[plugin.config]

2
plugins/network/plugin.toml
View File

@@ -1,4 +1,4 @@
[plugin]
description = "dokku core network plugin"
version = "0.12.1"
version = "0.12.2"
[plugin.config]

2
plugins/nginx-vhosts/plugin.toml
View File

@@ -1,4 +1,4 @@
[plugin]
description = "dokku core nginx-vhosts plugin"
version = "0.12.1"
version = "0.12.2"
[plugin.config]

2
plugins/plugin/plugin.toml
View File

@@ -1,4 +1,4 @@
[plugin]
description = "dokku core plugin plugin"
version = "0.12.1"
version = "0.12.2"
[plugin.config]

2
plugins/proxy/plugin.toml
View File

@@ -1,4 +1,4 @@
[plugin]
description = "dokku core proxy plugin"
version = "0.12.1"
version = "0.12.2"
[plugin.config]

2
plugins/ps/plugin.toml
View File

@@ -1,4 +1,4 @@
[plugin]
description = "dokku core ps plugin"
version = "0.12.1"
version = "0.12.2"
[plugin.config]

2
plugins/repo/plugin.toml
View File

@@ -1,4 +1,4 @@
[plugin]
description = "dokku core repo plugin"
version = "0.12.1"
version = "0.12.2"
[plugin.config]

2
plugins/scheduler-docker-local/plugin.toml
View File

@@ -1,4 +1,4 @@
[plugin]
description = "dokku core scheduler-docker-local plugin"
version = "0.12.1"
version = "0.12.2"
[plugin.config]

2
plugins/shell/plugin.toml
View File

@@ -1,4 +1,4 @@
[plugin]
description = "dokku core shell plugin"
version = "0.12.1"
version = "0.12.2"
[plugin.config]

2
plugins/ssh-keys/plugin.toml
View File

@@ -1,4 +1,4 @@
[plugin]
description = "dokku core ssh-keys plugin"
version = "0.12.1"
version = "0.12.2"
[plugin.config]

2
plugins/storage/plugin.toml
View File

@@ -1,4 +1,4 @@
[plugin]
description = "dokku core storage plugin"
version = "0.12.1"
version = "0.12.2"
[plugin.config]

2
plugins/tags/plugin.toml
View File

@@ -1,4 +1,4 @@
[plugin]
description = "dokku core tags plugin"
version = "0.12.1"
version = "0.12.2"
[plugin.config]

2
plugins/tar/plugin.toml
View File

@@ -1,4 +1,4 @@
[plugin]
description = "dokku core tar plugin"
version = "0.12.1"
version = "0.12.2"
[plugin.config]