tests/5_container_runtime.sh

@@ -617,29 +617,27 @@ check_5_15() {
       for s in $(docker service ls --format '{{.Name}}'); do
         if echo $container_name | grep -q "$s"; then
           task_id=$(docker inspect "$c" --format '{{.Name}}' | awk -F '.' '{print $NF}')
-          # a container name could arbitrary include a service one: it belongs to a service (created by Docker
+          # a container name could arbitrary include a service one: it belongs to a service (created by Docker 
           # as part of the service), if the container task ID matches one of the task IDs of the service.
           if docker service ps --no-trunc "$s" --format '{{.ID}}' | grep -q "$task_id"; then
-            restart_policy=$(docker inspect --format '{{ .Spec.TaskTemplate.RestartPolicy.MaxAttempts }}' "$s")
+            spolicy=$(docker inspect --format MaxAttempts='{{ .Spec.TaskTemplate.RestartPolicy.MaxAttempts }}' "$s")
             break
           fi
         fi
       done
     fi
-    if docker inspect --format '{{ .HostConfig.RestartPolicy.MaximumRetryCount }}' "$c" &>/dev/null; then
-      restart_policy=$(docker inspect --format '{{ .HostConfig.RestartPolicy.MaximumRetryCount }}' "$c")
-    fi
+    cpolicy=$(docker inspect --format MaximumRetryCount='{{ .HostConfig.RestartPolicy.MaximumRetryCount }}' "$c")
 
-    if [ "$restart_policy" -gt "5" ]; then
+    if [ "$cpolicy" != "MaximumRetryCount=5" ] && [ "$spolicy" != "MaxAttempts=5" ]; then
       # If it's the first container, fail the test
       if [ $fail -eq 0 ]; then
         warn -s "$check"
-        warn "      * MaximumRetryCount is not set to 5 or less: $c"
+        warn "      * MaximumRetryCount is not set to 5: $c"
         maxretry_unset_containers="$maxretry_unset_containers $c"
         fail=1
         continue
       fi
-      warn "      * MaximumRetryCount is not set to 5 or less: $c"
+      warn "      * MaximumRetryCount is not set to 5: $c"
       maxretry_unset_containers="$maxretry_unset_containers $c"
     fi
   done
@@ -649,7 +647,7 @@ check_5_15() {
     logcheckresult "PASS"
     return
   fi
-  logcheckresult "WARN" "Containers with MaximumRetryCount not set to 5 or less" "$maxretry_unset_containers"
+  logcheckresult "WARN" "Containers with MaximumRetryCount not set to 5" "$maxretry_unset_containers"
 }
 
 check_5_16() {