From d6da54c7eeb64e02b297e8e1d9c3de378da3d990 Mon Sep 17 00:00:00 2001 From: Bruno Tavares Date: Sat, 26 Sep 2015 00:35:09 -0300 Subject: [PATCH] Fixes container lookup not being able to find a container running for specific image. docker ps does not receive any more arguments and we have to filter by image ourselves --- lib/kickstart-docker-create | 2 +- lib/kickstart-docker-ssh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/kickstart-docker-create b/lib/kickstart-docker-create index b43fdfd..f1dd36c 100755 --- a/lib/kickstart-docker-create +++ b/lib/kickstart-docker-create @@ -8,7 +8,7 @@ pull_sshd_image() { } remove_running_sshd() { - runnig_sshd=$(docker ps -q "$image_name") + runnig_sshd=$(docker ps --format='{{.ID}}\t{{.Image}}' | grep "$image_name" | cut -f 1) [ "$runnig_sshd" ] && docker kill "$runnig_sshd" && docker rm "$runnig_sshd" true } diff --git a/lib/kickstart-docker-ssh b/lib/kickstart-docker-ssh index c0d4af9..9bdb188 100755 --- a/lib/kickstart-docker-ssh +++ b/lib/kickstart-docker-ssh @@ -3,7 +3,7 @@ image_name=${1:-$KICKSTART_DOCKER_IMAGE} image_name=${image_name:-moul/sshd} -runnig_sshd=$(docker ps -q "$image_name") +runnig_sshd=$(docker ps --format='{{.ID}}\t{{.Image}}' | grep "$image_name" | cut -f 1) [ -z "$runnig_sshd" ] && echo "Docker container not created. Run \`kickstart docker-create\` to get one" && exit 1 port=$(docker port "$runnig_sshd" 22 | cut -f 2 -d :)