lint

pkg/fleet/installer/packages/docker.go

@@ -168,9 +168,8 @@ func (a *apmInjectorInstaller) verifyDockerRuntime(ctx context.Context) (err err
 			span.SetTag("retries", i)
 			span.SetTag("docker_runtime", "dd-shim")
 			return nil
-		} else {
-			currentRuntime = strings.TrimSpace(outb.String())
 		}
+		currentRuntime = strings.TrimSpace(outb.String())
 	}
 	span.SetTag("retries", 5)
 	span.SetTag("docker_runtime", currentRuntime)

test/new-e2e/tests/installer/host/host.go

@@ -80,8 +80,11 @@ func (h *Host) setSystemdVersion() {
 // InstallDocker installs Docker on the host if it is not already installed.
 func (h *Host) InstallDocker() {
 	defer func() {
-		h.remote.MustExecute("sudo systemctl reset-failed docker")
-		_, err := h.remote.Execute("sudo systemctl start docker")
+		_, err := h.remote.Execute("sudo systemctl reset-failed docker")
+		if err != nil {
+			h.t.Logf("warn: failed to reset-failed for docker.d: %v", err)
+		}
+		_, err = h.remote.Execute("sudo systemctl start docker")
 		require.NoErrorf(h.t, err, "failed to start Docker, logs: %s", h.remote.MustExecute("sudo journalctl -xeu docker"))
 	}()
 	if _, err := h.remote.Execute("command -v docker"); err == nil {