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

Display image & version in list

Browse Source
This commit is contained in:
Loïc Guitaut
2015-09-15 23:49:51 +02:00
parent 3a824c38ca
commit 21a5d29581
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
functions
View File

@@ -56,7 +56,7 @@ service_list() {
else else
dokku_log_info1_quiet "$PLUGIN_SERVICE services:" dokku_log_info1_quiet "$PLUGIN_SERVICE services:"
for SERVICE in $SERVICES; do for SERVICE in $SERVICES; do
dokku_log_verbose "$SERVICE $(service_status "$SERVICE")$(service_exposed_ports "$SERVICE")" dokku_log_verbose "$SERVICE, $(service_version "$SERVICE") $(service_status "$SERVICE")$(service_exposed_ports "$SERVICE")"
done done
fi fi
} }
@@ -270,3 +270,9 @@ get_service_name() {
local SERVICE="$1" local SERVICE="$1"
echo "dokku.${PLUGIN_COMMAND_PREFIX}.$SERVICE" echo "dokku.${PLUGIN_COMMAND_PREFIX}.$SERVICE"
} }
service_version() {
local SERVICE="$1"
local SERVICE_NAME="$(get_service_name "$SERVICE")"
docker inspect -f '{{.Config.Image}}' "$SERVICE_NAME"
}

5
tests/bin/docker
View File

@@ -51,6 +51,11 @@ case "$1" in
exit 0 exit 0
fi fi
if [[ $@ =~ \{\{.Config.Image\}\} ]]; then
echo "$PLUGIN_IMAGE:$PLUGIN_IMAGE_VERSION"
exit 0
fi
if [[ $@ =~ \{\{\.State\..*\}\} ]]; then if [[ $@ =~ \{\{\.State\..*\}\} ]]; then
if [[ $@ =~ \{\{\.State\.Running\}\} ]]; then if [[ $@ =~ \{\{\.State\.Running\}\} ]]; then
echo "true" echo "true"

4
tests/service_list.bats
View File

@@ -11,13 +11,13 @@ teardown() {
@test "($PLUGIN_COMMAND_PREFIX:list) with no exposed ports" { @test "($PLUGIN_COMMAND_PREFIX:list) with no exposed ports" {
run dokku "$PLUGIN_COMMAND_PREFIX:list" run dokku "$PLUGIN_COMMAND_PREFIX:list"
assert_contains "${lines[*]}" "l (running)" assert_contains "${lines[*]}" "l, mysql:5.6.26 (running)"
} }
@test "($PLUGIN_COMMAND_PREFIX:list) with exposed ports" { @test "($PLUGIN_COMMAND_PREFIX:list) with exposed ports" {
dokku "$PLUGIN_COMMAND_PREFIX:expose" l 4242 dokku "$PLUGIN_COMMAND_PREFIX:expose" l 4242
run dokku "$PLUGIN_COMMAND_PREFIX:list" run dokku "$PLUGIN_COMMAND_PREFIX:list"
assert_contains "${lines[*]}" "l (running), exposed port(s): 3306->4242" assert_contains "${lines[*]}" "l, mysql:5.6.26 (running), exposed port(s): 3306->4242"
} }
@test "($PLUGIN_COMMAND_PREFIX:list) when there are no services" { @test "($PLUGIN_COMMAND_PREFIX:list) when there are no services" {