try to fix flaky mac testcontainer stuff

grpc · Feb 26, 2024 · 855397e · 855397e
1 parent 679cb52
commit 855397e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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" }
+testcontainers = { group = "org.testcontainers", name = "testcontainers", version = "1.19.6" }