Pre release cleanup

.github/workflows/go.yml

@@ -25,7 +25,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
         with:
-          go-version: "1.24.5"
+          go-version: "1.25.1"
 
       - name: Build
         run: go build -v ./...
@@ -41,7 +41,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
         with:
-          go-version: "1.24.5"
+          go-version: "1.25.1"
 
       - name: Build
         run: go build -v ./...
@@ -59,7 +59,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
         with:
-          go-version: "1.24.5"
+          go-version: "1.25.1"
 
       - name: install gcc-aarch64-linux-gnu
         run: |
@@ -87,7 +87,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
         with:
-          go-version: "1.24.5"
+          go-version: "1.25.1"
 
       - name: generate binaries
         run: |

.github/workflows/integration.yml

@@ -30,7 +30,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
         with:
-          go-version: "1.24.5"
+          go-version: "1.25.1"
 
       - name: Install CLI deps
         run: brew install kubectl docker coreutils lima
@@ -65,7 +65,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
         with:
-          go-version: "1.24.5"
+          go-version: "1.25.1"
 
       - name: Install CLI deps
         run: brew install kubectl docker coreutils lima
@@ -100,7 +100,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
         with:
-          go-version: "1.24.5"
+          go-version: "1.25.1"
 
       - name: Install CLI deps
         run: brew install kubectl docker coreutils lima
@@ -139,9 +139,21 @@ jobs:
       - name: Stop
         run: colima stop
 
-      - name: Teardown
+      - name: Temp Delete
         run: colima delete -f
 
+      - name: Restart
+        run: colima start --runtime docker
+
+      - name: Assert runtime disk arm64
+        run: docker run --pull=never --rm --platform=linux/arm64 ghcr.io/linuxcontainers/alpine:latest uname -a
+
+      - name: Assert runtime disk amd64
+        run: docker run --pull=never --rm --platform=linux/amd64 ghcr.io/linuxcontainers/alpine:latest uname -a
+
+      - name: Teardown
+        run: colima delete --data -f
+
   containerd:
     runs-on: macos-13
     steps:
@@ -150,7 +162,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
         with:
-          go-version: "1.24.5"
+          go-version: "1.25.1"
 
       - name: Install CLI deps
         run: brew install kubectl docker coreutils lima
@@ -189,9 +201,21 @@ jobs:
       - name: Stop
         run: colima stop
 
-      - name: Teardown
+      - name: Temp Delete
         run: colima delete -f
 
+      - name: Restart
+        run: colima start --runtime containerd
+
+      - name: Assert runtime disk arm64
+        run: colima nerdctl -- run --pull=never --rm --platform=linux/arm64 ghcr.io/linuxcontainers/alpine:latest uname -a
+
+      - name: Assert runtime disk amd64
+        run: colima nerdctl -- run --pull=never --rm --platform=linux/amd64 ghcr.io/linuxcontainers/alpine:latest uname -a
+
+      - name: Teardown
+        run: colima delete --data -f
+
   incus:
     runs-on: macos-13
     steps:
@@ -200,7 +224,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
         with:
-          go-version: "1.24.5"
+          go-version: "1.25.1"
 
       - name: Install CLI deps
         run: brew install kubectl docker coreutils lima incus

environment/container/containerd/containerd.go

@@ -137,8 +137,8 @@ func DataDisk() environment.DataDisk {
 		Dirs:   diskDirs,
 		FSType: "ext4",
 		PreMount: []string{
-			"systemctl stop containerd",
-			"systemctl stop buildkit",
+			"systemctl stop containerd.service",
+			"systemctl stop buildkit.service",
 		},
 	}
 }

environment/container/docker/docker.go

@@ -76,10 +76,8 @@ func (d dockerRuntime) Provision(ctx context.Context) error {
 func (d dockerRuntime) Start(ctx context.Context) error {
 	a := d.Init(ctx)
 
-	// TODO: interval is high due to 0.6.3->0.6.4 docker-ce package transition
-	//       to ensure startup is successful
-	a.Retry("", time.Second, 120, func(int) error {
-		return d.guest.RunQuiet("sudo", "service", "docker", "start")
+	a.Retry("", time.Second, 60, func(int) error {
+		return d.guest.RunQuiet("sudo", "systemctl", "start", "docker.service")
 	})
 
 	// service startup takes few seconds, retry for a minute before giving up.
@@ -111,7 +109,7 @@ func (d dockerRuntime) Stop(ctx context.Context) error {
 		if !d.Running(ctx) {
 			return nil
 		}
-		return d.guest.Run("sudo", "service", "docker", "stop")
+		return d.guest.Run("sudo", "systemctl", "stop", "docker.service")
 	})
 
 	// clear docker context settings
@@ -156,7 +154,8 @@ func DataDisk() environment.DataDisk {
 		Dirs:   diskDirs,
 		FSType: "ext4",
 		PreMount: []string{
-			"systemctl stop docker",
+			"systemctl stop docker.service",
+			"systemctl stop containerd.service",
 		},
 	}
 }