[docker-in-docker] Reverts the retry logic (#659)feature_docker-in-docker_2.3.1

* Update install.sh

* [docker-in-docker] Update retry logic

* revert the retry logic!

5 files changed, 7 insertions, 89 deletions

diff --git a/src/docker-in-docker/devcontainer-feature.json b/src/docker-in-docker/devcontainer-feature.json
index b5e0aee..2afdd11 100644
--- a/src/docker-in-docker/devcontainer-feature.json
+++ b/src/docker-in-docker/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "docker-in-docker",
-    "version": "2.3.0",
+    "version": "2.3.1",
     "name": "Docker (Docker-in-Docker)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-in-docker",
     "description": "Create child containers *inside* a container, independent from the host's docker instance. Installs Docker extension in the container along with needed CLIs.",
diff --git a/src/docker-in-docker/install.sh b/src/docker-in-docker/install.sh
index f7e5a7d..bdef126 100755
--- a/src/docker-in-docker/install.sh
+++ b/src/docker-in-docker/install.sh
@@ -423,30 +423,12 @@ dockerd_start="AZURE_DNS_AUTO_DETECTION=${AZURE_DNS_AUTO_DETECTION} DOCKER_DEFAU
 INNEREOF
 )"
 
-retry_count=0
-docker_ok="false"
-
-until [ "${docker_ok}" = "true"  ] || [ "${retry_count}" -eq "5" ];
-do 
-    # Start using sudo if not invoked as root
-    if [ "$(id -u)" -ne 0 ]; then
-        sudo /bin/sh -c "${dockerd_start}"
-    else
-        eval "${dockerd_start}"
-    fi
-
-    set +e
-        docker info > /dev/null 2>&1 && docker_ok="true"
-
-        if [ "${docker_ok}" != "true" ]; then
-            echo "(*) Failed to start docker, retrying in 5s..."
-            retry_count=`expr $retry_count + 1`
-            sleep 5s
-        fi
-    set -e
-done
-
-set +e
+# Start using sudo if not invoked as root
+if [ "$(id -u)" -ne 0 ]; then
+    sudo /bin/sh -c "${dockerd_start}"
+else
+    eval "${dockerd_start}"
+fi
 
 # Execute whatever commands were passed in (if any). This allows us
 # to set this script to ENTRYPOINT while still executing the default CMD.
diff --git a/test/docker-in-docker/docker_retry.sh b/test/docker-in-docker/docker_retry.sh
deleted file mode 100644
index cc35fbb..0000000
--- a/test/docker-in-docker/docker_retry.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Optional: Import test library
-source dev-container-features-test-lib
-
-# Definition specific tests
-check "docker-buildx" docker buildx version
-check "docker-ps" docker ps
-
-sleep 5s
-
-# Stop docker
-pkill dockerd
-pkill containerd
-
-sleep 5s
-
-set +e
-    docker_ok_code="$(docker info > /dev/null 2>&1; echo $?)"
-set -e
-
-check "docker-not-running" bash -c "[[ ${docker_ok_code} == 1 ]]"
-
-#  Testing retry logic
-./test-scripts/docker-test-init.sh
-
-check "docker-started-after-retries" docker ps
-
-# Report result
-reportResults
diff --git a/test/docker-in-docker/scenarios.json b/test/docker-in-docker/scenarios.json
index 525ce69..de4e7d6 100644
--- a/test/docker-in-docker/scenarios.json
+++ b/test/docker-in-docker/scenarios.json
@@ -67,11 +67,5 @@
             }
         },
         "remoteUser": "node"
-    },
-    "docker_retry": {
-        "image": "ubuntu:focal",
-        "features": {
-            "docker-in-docker": {}
-        }
     }
 }
diff --git a/test/docker-in-docker/test-scripts/docker-test-init.sh b/test/docker-in-docker/test-scripts/docker-test-init.sh
deleted file mode 100644
index b213fb4..0000000
--- a/test/docker-in-docker/test-scripts/docker-test-init.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-#-------------------------------------------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
-#-------------------------------------------------------------------------------------------------------------
-
-retry_count=0
-docker_ok="false"
-
-until [ "${docker_ok}" = "true"  ] || [ "${retry_count}" -eq "5" ];
-do
-    if [ "${retry_count}" -eq "3" ]; then
-        echo "Starting docker after 3 retries..."
-        /usr/local/share/docker-init.sh
-    fi
-
-    set +e
-        docker info > /dev/null 2>&1 && docker_ok="true"
-
-        if [ "${docker_ok}" != "true" ]; then
-            echo "(*) Failed to start docker, retrying in 5s... Retry count: ${retry_count}"
-            retry_count=`expr $retry_count + 1`
-            sleep 1s
-        fi
-    set -e
-done
\ No newline at end of file