fiddle with colima settings

hofstadter-io · Aug 25, 2023 · d4c1600 · d4c1600
1 parent e5acba7
commit d4c1600
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/.github/workflows/dagger.yml b/.github/workflows/dagger.yml
@@ -42,10 +42,10 @@ jobs:
       - name: Set up Docker
         uses: crazy-max/ghaction-setup-docker@v1
         with:
-          version: v24.0.1
+          version: v24.0.5
         if: ${{ startsWith( runner.os, 'macos') }}
       - name: Setup MacOS docker socket
-        run: echo "DOCKER_HOST="unix://$HOME/.colima/default/docker.sock"" >> $GITHUB_ENV
+        run: echo "DOCKER_HOST="unix://$HOME/.colima/gha/docker.sock"" >> $GITHUB_ENV
         if: ${{ startsWith( runner.os, 'macos') }}
       - name: Test Compatibility
         run: |-
@@ -97,10 +97,10 @@ jobs:
       - name: Set up Docker
         uses: crazy-max/ghaction-setup-docker@v1
         with:
-          version: v24.0.1
+          version: v24.0.5
         if: ${{ startsWith( runner.os, 'macos') }}
       - name: Setup MacOS docker socket
-        run: echo "DOCKER_HOST="unix://$HOME/.colima/default/docker.sock"" >> $GITHUB_ENV
+        run: echo "DOCKER_HOST="unix://$HOME/.colima/gha/docker.sock"" >> $GITHUB_ENV
         if: ${{ startsWith( runner.os, 'macos') }}
       - name: Test Compatibility
         run: |-

diff --git a/.github/workflows/hof.yml b/.github/workflows/hof.yml
@@ -48,13 +48,15 @@ jobs:
           echo "HOF_TAG=${TAG}" >> $GITHUB_ENV
       - name: Setup Docker on MacOS
         run: |-
+          brew list
           brew reinstall -f --force-bottle qemu lima colima docker
           limactl info
+          colima stop --force
           colima delete
-          colima start debug --cpu 3 --memory 10 --disk 12
+          colima start gha --cpu 3 --memory 10 --disk 12
         if: ${{ startsWith( runner.os, 'macos') }}
       - name: Setup MacOS docker socket
-        run: echo "DOCKER_HOST="unix://$HOME/.colima/default/docker.sock"" >> $GITHUB_ENV
+        run: echo "DOCKER_HOST="unix://$HOME/.colima/gha/docker.sock"" >> $GITHUB_ENV
         if: ${{ startsWith( runner.os, 'macos') }}
       - name: Test Compatibility
         run: |-

diff --git a/ci/gha/common/steps.cue b/ci/gha/common/steps.cue
@@ -144,18 +144,20 @@ Steps: {
 		machack: {
 			name: "Setup Docker on MacOS"
 			run: """
+				brew list
 				brew reinstall -f --force-bottle qemu lima colima docker
 				limactl info
+				colima stop --force
 				colima delete
-				colima start debug --cpu 3 --memory 10 --disk 12
+				colima start gha --cpu 3 --memory 10 --disk 12
 				"""
 			"if": "${{ startsWith( runner.os, 'macos') }}"
 		}
 
 		macos: {
 			name: "Setup MacOS docker socket"
 			run: """
-				echo "DOCKER_HOST=\"unix://$HOME/.colima/default/docker.sock\"" >> $GITHUB_ENV
+				echo "DOCKER_HOST=\"unix://$HOME/.colima/gha/docker.sock\"" >> $GITHUB_ENV
 				"""
 			"if": "${{ startsWith( runner.os, 'macos') }}"
 		}

diff --git a/ci/gha/common/vars.cue b/ci/gha/common/vars.cue
@@ -7,7 +7,7 @@ Formatters: [
 ]
 
 Versions: {
-	docker: "24.0.1"
+	docker: "24.0.5"
 	go:     "1.21.x" | ["1.20.x", "1.21.x"]
 	os:     "ubuntu-latest" | ["ubuntu-latest", "macos-latest"]
 }