Address comment: modify the code to generic to handle teamd also

files/build_templates/docker_image_ctl.j2

@@ -726,23 +726,20 @@ stop() {
     if [[ "$DEV" && $DATABASE_TYPE != "dpudb" ]]; then
         ip netns delete "$NET_NS"
     fi
-    {%- elif docker_container_name == "teamd" %}
-    # Longer timeout of 60 sec to wait for Portchannels to be cleaned.
-    /usr/local/bin/container stop -t 60 $DOCKERNAME
-    {%- elif docker_container_name in ["swss", "syncd"] and enable_asan == "y" %}
-    /usr/local/bin/container stop -t 60 $DOCKERNAME
-    {%- elif docker_container_name in ["swss", "syncd"] %}
-    if [[ -f /etc/sonic/chassisdb.conf ]]; then
-        asic_key=$(sonic-db-cli CHASSIS_STATE_DB keys "CHASSIS_FABRIC_ASIC_TABLE|asic$DEV")
-        container_id=$(docker ps -a -q -f name="$DOCKERNAME")
-        if [[ ! -z "$container_id" ]] || [[ ! -z "$asic_key" ]]; then
-            /usr/local/bin/container stop $DOCKERNAME
-        fi
+    {%- else %}
+    container_id=$(docker ps --filter "name=$DOCKERNAME" --quiet)
+    if [ -z "$container_id" ]; then
+        echo "container stop $DOCKERNAME - No such container: $DOCKERNAME"
     else
+    {%- if docker_container_name == "teamd" %}
+        # Longer timeout of 60 sec to wait for Portchannels to be cleaned.
+        /usr/local/bin/container stop -t 60 $DOCKERNAME
+    {%- elif docker_container_name in ["swss", "syncd"] and enable_asan == "y" %}
+        /usr/local/bin/container stop -t 60 $DOCKERNAME
+    {%- else %}
         /usr/local/bin/container stop $DOCKERNAME
+    {%- endif %}
     fi
-    {%- else %}
-    /usr/local/bin/container stop $DOCKERNAME
     {%- endif %}
 }