From 0f3dfe70fe09525ad972a4dd567917ff80c3b1dc Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Fri, 2 Oct 2020 16:24:14 +0200
Subject: [PATCH] Deprecate rule 2.16 for Docker > 19.03

The upcoming 20.x docker release will always have experimental features
enabled, which will stop this test from working.

More details can be found in docker/cli##2774

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 tests/2_docker_daemon_configuration.sh | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/tests/2_docker_daemon_configuration.sh b/tests/2_docker_daemon_configuration.sh
index e86cd52..83cc8eb 100644
--- a/tests/2_docker_daemon_configuration.sh
+++ b/tests/2_docker_daemon_configuration.sh
@@ -387,20 +387,30 @@ check_2_15() {
 
 # 2.16
 check_2_16() {
+  docker_version=$(docker version | grep -i -A2 '^server' | grep ' Version:' \
+    | awk '{print $NF; exit}' | tr -d '[:alpha:]-,.' | cut -c 1-4)
+
   id_2_16="2.16"
   desc_2_16="Ensure that experimental features are not implemented in production (Scored)"
   check_2_16="$id_2_16  - $desc_2_16"
   starttestjson "$id_2_16" "$desc_2_16"
 
   totalChecks=$((totalChecks + 1))
-  if docker version -f '{{.Server.Experimental}}' | grep false 2>/dev/null 1>&2; then
-    pass "$check_2_16"
-    resulttestjson "PASS"
-    currentScore=$((currentScore + 1))
+  if [ "$docker_version" -le 1903 ]; then
+    if docker version -f '{{.Server.Experimental}}' | grep false 2>/dev/null 1>&2; then
+      pass "$check_2_16"
+      resulttestjson "PASS"
+      currentScore=$((currentScore + 1))
+    else
+      warn "$check_2_16"
+      resulttestjson "WARN"
+      currentScore=$((currentScore - 1))
+    fi
   else
-    warn "$check_2_16"
-    resulttestjson "WARN"
-    currentScore=$((currentScore - 1))
+    desc_2_16="$desc_2_16 (Deprecated)"
+    check_2_16="$id_2_16  - $desc_2_16"
+    info "$desc_2_16"
+    resulttestjson "INFO"
   fi
 }