From 855397e981608df032df1c60e93bb300ca3d4ee0 Mon Sep 17 00:00:00 2001
From: James Ward <james@jamesward.com>
Date: Mon, 26 Feb 2024 11:02:43 -0700
Subject: [PATCH] try to fix flaky mac testcontainer stuff

---
 .github/workflows/gradle.yml | 6 ++++--
 gradle/libs.versions.toml    | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 0a37bad2..4c9fc64a 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -26,8 +26,10 @@ jobs:
       if: matrix.os == 'macos-latest'
       run: |
         brew install docker
-        colima start
-        sudo ln -sf $HOME/.colima/default/docker.sock /var/run/docker.sock
+        colima start --network-address
+        export TESTCONTAINERS_DOCKER_SOCKET_OVERRIDE=/var/run/docker.sock
+        export TESTCONTAINERS_HOST_OVERRIDE=$(colima ls -j | jq -r '.address')
+        export DOCKER_HOST="unix://${HOME}/.colima/default/docker.sock"
 
     - name: Test
       run: |
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 6f8446cd..6ec1c605 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -35,4 +35,4 @@ truth = { group = "com.google.truth", name = "truth", version = "1.4.1" }
 truth-proto-extension = { group = "com.google.truth.extensions", name = "truth-proto-extension", version = "1.4.1" }
 okhttp = { group = "com.squareup.okhttp", name = "okhttp", version = "2.7.5" }
 javax-annotation-api = { group = "javax.annotation", name = "javax.annotation-api", version = "1.3.2" }
-testcontainers = { group = "org.testcontainers", name = "testcontainers", version = "1.19.3" }
\ No newline at end of file
+testcontainers = { group = "org.testcontainers", name = "testcontainers", version = "1.19.6" }