Skip to content

better regex, more quotes #335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
und1sk0 merged 1 commit into from
Mar 4, 2016
Merged

better regex, more quotes #335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ansible/roles/container_kill_start/files/findTagRunning.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ if [ "" = "${CONTAINERS}" ] ; then
exit 0
else
for container in ${CONTAINERS} ; do
docker inspect ${container} | grep -q ${IMAGE_NAME}
docker inspect "${container}" | grep -q '"Image": "'"${IMAGE_NAME}":
if [ ${?} -eq 0 ] ; then
if [ -z ${RUNNING_CONTAINERS} ] ; then
if [ -z "${RUNNING_CONTAINERS}" ] ; then
RUNNING_CONTAINERS="${container}"
else
RUNNING_CONTAINERS="${RUNNING_CONTAINERS} ${container}"
Expand All @@ -18,6 +18,6 @@ else
done
fi

if [ ! -z ${RUNNING_CONTAINERS} ] ; then
if [ ! -z "${RUNNING_CONTAINERS}" ] ; then
echo "${RUNNING_CONTAINERS}"
fi
6 changes: 3 additions & 3 deletions ansible/roles/container_start/files/findTagRunning.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ if [ "" = "${CONTAINERS}" ] ; then
exit 0
else
for container in ${CONTAINERS} ; do
docker inspect ${container} | grep -q ${IMAGE_NAME}
docker inspect "${container}" | grep -q '"Image": "'"${IMAGE_NAME}":
if [ ${?} -eq 0 ] ; then
if [ -z ${RUNNING_CONTAINERS} ] ; then
if [ -z "${RUNNING_CONTAINERS}" ] ; then
RUNNING_CONTAINERS="${container}"
else
RUNNING_CONTAINERS="${RUNNING_CONTAINERS} ${container}"
Expand All @@ -18,6 +18,6 @@ else
done
fi

if [ ! -z ${RUNNING_CONTAINERS} ] ; then
if [ ! -z "${RUNNING_CONTAINERS}" ] ; then
echo "${RUNNING_CONTAINERS}"
fi