Display image & version in list

This commit is contained in:
Loïc Guitaut
2015-09-15 23:49:51 +02:00
parent 8a116cec97
commit 8949686410
3 changed files with 14 additions and 3 deletions

View File

@@ -56,7 +56,7 @@ service_list() {
else
dokku_log_info1_quiet "$PLUGIN_SERVICE services:"
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
fi
}
@@ -269,3 +269,9 @@ get_service_name() {
local SERVICE="$1"
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"
}

View File

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

View File

@@ -11,13 +11,13 @@ teardown() {
@test "($PLUGIN_COMMAND_PREFIX:list) with no exposed ports" {
run dokku "$PLUGIN_COMMAND_PREFIX:list"
assert_contains "${lines[*]}" "l (running)"
assert_contains "${lines[*]}" "l, mongo:3.0.6 (running)"
}
@test "($PLUGIN_COMMAND_PREFIX:list) with exposed ports" {
dokku "$PLUGIN_COMMAND_PREFIX:expose" l 4242 4243 4244 4245
run dokku "$PLUGIN_COMMAND_PREFIX:list"
assert_contains "${lines[*]}" "l (running), exposed port(s): 27017->4242 27018->4243 27019->4244 28017->4245"
assert_contains "${lines[*]}" "l, mongo:3.0.6 (running), exposed port(s): 27017->4242 27018->4243 27019->4244 28017->4245"
}
@test "($PLUGIN_COMMAND_PREFIX:list) when there are no services" {