|
53 | 53 | PSCOMMAND="ps -fu $1"
|
54 | 54 | fi
|
55 | 55 |
|
56 |
| - if $PSCOMMAND | egrep "${match_str}" | egrep -v "${ignore_str}"; then |
| 56 | + LINUX_DOCKER_FILTER="" |
| 57 | + if [ `uname` = "Linux" ]; then |
| 58 | + if egrep "\/docker\/" /proc/1/cgroup >nul; then |
| 59 | + echo Running in a Linux docker container |
| 60 | + else |
| 61 | + echo Running on a Linux host |
| 62 | + # Filter any possible docker container processes by cgroup containing "/docker" |
| 63 | + PSCOMMAND="ps -o cgroup,pid,state,tname,time,command -u $1" |
| 64 | + LINUX_DOCKER_FILTER="| egrep -v '^[^[:space:]]+\/docker'" |
| 65 | + fi |
| 66 | + fi |
| 67 | + |
| 68 | + if eval "$PSCOMMAND | egrep '${match_str}' | egrep -v '${ignore_str}' ${LINUX_DOCKER_FILTER}"; then |
57 | 69 | echo Boooo - there are rogue processes kicking about
|
58 | 70 | echo Issuing a kill to all processes shown above
|
59 |
| - $PSCOMMAND | egrep "${match_str}" | egrep -v "${ignore_str}" | awk '{print $2}' | xargs -n1 kill |
| 71 | + eval "$PSCOMMAND | egrep '${match_str}' | egrep -v '${ignore_str}' ${LINUX_DOCKER_FILTER} | awk '{print \$2}' | xargs -n1 kill" |
60 | 72 | echo Sleeping for 10 seconds...
|
61 | 73 | sleep 10
|
62 |
| - if $PSCOMMAND | egrep "${match_str}" | egrep -v "${ignore_str}"; then |
| 74 | + if eval "$PSCOMMAND | egrep '${match_str}' | egrep -v '${ignore_str}' ${LINUX_DOCKER_FILTER}"; then |
63 | 75 | echo Still processes left going to remove those with kill -KILL ...
|
64 |
| - $PSCOMMAND | egrep "${match_str}" | egrep -v "${ignore_str}" | awk '{print $2}' | xargs -n1 kill -KILL |
| 76 | + eval "$PSCOMMAND | egrep '${match_str}' | egrep -v '${ignore_str}' ${LINUX_DOCKER_FILTER} | awk '{print \$2}' | xargs -n1 kill -KILL" |
65 | 77 | echo DONE - One final check ...
|
66 |
| - if $PSCOMMAND | egrep "${match_str}" | egrep -v "${ignore_str}"; then |
| 78 | + if eval "$PSCOMMAND | egrep '${match_str}' | egrep -v '${ignore_str}' ${LINUX_DOCKER_FILTER}"; then |
67 | 79 | echo "Cleanup failed, processes still remain..."
|
68 | 80 | exit 127
|
69 | 81 | fi
|
|
0 commit comments