From a297e9d79d9c4f7c8783df77a74fd3ca6ac1482d Mon Sep 17 00:00:00 2001
From: Wassim Chegham <github@wassim.dev>
Date: Wed, 20 Mar 2024 14:02:24 +0100
Subject: [PATCH] ci: upgrade docker-in-docker to v2

---
 .devcontainer/devcontainer.json    | 3 ++-
 .github/workflows/codespaces-ci.sh | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index c8a7f21c..13dd1080 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -13,9 +13,10 @@
       "version": "18.15.0"
     },
     "ghcr.io/devcontainers-contrib/features/postgres-asdf:1": {},
-    "ghcr.io/devcontainers/features/docker-in-docker:1": {
+    "ghcr.io/devcontainers/features/docker-in-docker:2": {
       "version": "20.10.23",
       "moby": "false",
+      "azureDnsAutoDetection": "false",
       "dockerDashComposeVersion": "v2"
     },
     "ghcr.io/devcontainers/features/azure-cli:1": {
diff --git a/.github/workflows/codespaces-ci.sh b/.github/workflows/codespaces-ci.sh
index 88d779d4..a6bd23cf 100755
--- a/.github/workflows/codespaces-ci.sh
+++ b/.github/workflows/codespaces-ci.sh
@@ -114,8 +114,8 @@ function gh_codespace_check_services_status() {
 
 # Wait for the services to start
 function wait_for_services() {
-    echo -ne "Waiting 30s for all services to start"
-    for i in {1..30}; do
+    echo -ne "Waiting 6 mintues for all dependencies to be installed and starting all services..."
+    for i in {1..360}; do
         echo -ne "."
         sleep 1
     done
@@ -147,7 +147,7 @@ gh_login;
 # gh_create_codespace;
 api_create_codespace;
 # gh_fetch_codespace_id;
-wait_for_services;
+# wait_for_services;
 # gh_codespace_start_services;
 wait_for_services;
 gh_codespace_check_services_status;