[docker-up] Cleanup lints and fix build issues

Tool: gitpod/catfood.gitpod.cloud

components/docker-up/BUILD.yaml

@@ -5,6 +5,7 @@ packages:
       - go.mod
       - go.sum
       - "docker-up/**"
+      - "dockerd/**"
       - dependencies.sh
     deps:
       - components/common-go:lib

components/docker-up/docker-up/main.go

@@ -234,11 +234,11 @@ func tryAuthenticateForAllHosts(imageAuth string) {
 	splitCredentials := func(host, s string) (string, string, error) {
 		credentials, err := base64.StdEncoding.DecodeString(s)
 		if err != nil {
-			return "", "", fmt.Errorf("Cannot decode docker credentials for host %s: %w", host, err)
+			return "", "", fmt.Errorf("cannot decode docker credentials for host %s: %w", host, err)
 		}
 		parts := strings.SplitN(string(credentials), ":", 2)
 		if len(parts) < 2 {
-			return "", "", fmt.Errorf("Credentials in wrong format")
+			return "", "", fmt.Errorf("credentials in wrong format")
 		}
 		return parts[0], parts[1], nil
 	}
@@ -263,7 +263,7 @@ func tryAuthenticateForAllHosts(imageAuth string) {
 		loginCmd.Stdin = bytes.NewBufferString(password)
 		loginErr := loginCmd.Run()
 		if loginErr != nil {
-			log.WithError(loginErr).Warnf("Unable to authenticate with host %s, skipping.%s", host)
+			log.WithError(loginErr).Warnf("Unable to authenticate with host %s, skipping.", host)
 			continue
 		}
 		log.Infof("Authenticated with host %s", host)
@@ -339,7 +339,8 @@ func installDocker() error {
 		}
 
 		switch hdr.Typeflag {
-		case tar.TypeReg, tar.TypeRegA:
+
+		case tar.TypeReg, tar.TypeRegA: //lint:ignore SA1019 backwards compatibility
 			file, err := os.OpenFile(dstpath, os.O_CREATE|os.O_TRUNC|os.O_WRONLY, mode)
 			if err != nil {
 				return xerrors.Errorf("unable to create file: %v", err)
@@ -466,12 +467,12 @@ func detectRuncVersion(output string) (major, minor int, err error) {
 
 		major, err = strconv.Atoi(n[0])
 		if err != nil {
-			return 0, 0, xerrors.Errorf("could not parse major %s: %w", n[0])
+			return 0, 0, xerrors.Errorf("could not parse major %s: %w", n[0], err)
 		}
 
 		minor, err = strconv.Atoi(n[1])
 		if err != nil {
-			return 0, 0, xerrors.Errorf("could not parse minor %s: %w", n[1])
+			return 0, 0, xerrors.Errorf("could not parse minor %s: %w", n[1], err)
 		}
 
 		return major, minor, nil

components/docker-up/dockerd/args.go

@@ -1,3 +1,7 @@
+// Copyright (c) 2025 Gitpod GmbH. All rights reserved.
+// Licensed under the GNU Affero General Public License (AGPL).
+// See License.AGPL.txt in the project root for license information.
+
 package dockerd
 
 import (

components/docker-up/dockerd/args_test.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2020 Gitpod GmbH. All rights reserved.
+// Copyright (c) 2025 Gitpod GmbH. All rights reserved.
 // Licensed under the GNU Affero General Public License (AGPL).
 // See License.AGPL.txt in the project root for license information.
 

components/docker-up/go.mod

@@ -1,20 +1,19 @@
 module github.com/gitpod-io/gitpod/docker-up
 
-go 1.22
+go 1.22.0
+
+toolchain go1.23.3
 
 require (
-	github.com/opencontainers/runtime-spec v1.1.0
-	github.com/rootless-containers/rootlesskit v1.1.0
+	github.com/opencontainers/runtime-spec v1.2.0
+	github.com/rootless-containers/rootlesskit v1.1.1
 	github.com/sirupsen/logrus v1.9.3
-	github.com/spf13/pflag v1.0.5
-	github.com/vishvananda/netlink v1.1.0
-	golang.org/x/sys v0.11.0
-	golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f
+	github.com/spf13/pflag v1.0.6
+	github.com/vishvananda/netlink v1.3.0
+	golang.org/x/sys v0.30.0
+	golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da
 )
 
-require (
-	github.com/stretchr/testify v1.8.1 // indirect
-	github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df // indirect
-)
+require github.com/vishvananda/netns v0.0.4 // indirect
 
 replace github.com/gitpod-io/gitpod/common-go => ../common-go // leeway