Add GPU support for podman

.obs/workflows.yml

@@ -24,6 +24,9 @@ rebuild:
     - trigger_services:
         project: home:pjbgf:devel:languages:go:unstable
         package: qubesome
+    - rebuild_package:
+        project: home:pjbgf:devel:languages:go:unstable
+        package: qubesome
   filters:
     event: push
     branches:

go.mod

@@ -35,6 +35,5 @@ require (
 	golang.org/x/net v0.31.0 // indirect
 	golang.org/x/text v0.20.0 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
-	google.golang.org/grpc/security/advancedtls v1.0.0 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 )

go.sum

@@ -100,8 +100,6 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 h1:
 google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU=
 google.golang.org/grpc v1.68.0 h1:aHQeeJbo8zAkAa3pRzrVjZlbz6uSfeOXlJNQM0RAbz0=
 google.golang.org/grpc v1.68.0/go.mod h1:fmSPC5AsjSBCK54MyHRx48kpOti1/jRfOlwEWywNjWA=
-google.golang.org/grpc/security/advancedtls v1.0.0 h1:/KQ7VP/1bs53/aopk9QhuPyFAp9Dm9Ejix3lzYkCrDA=
-google.golang.org/grpc/security/advancedtls v1.0.0/go.mod h1:o+s4go+e1PJ2AjuQMY5hU82W7lDlefjJA6FqEHRVHWk=
 google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io=
 google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

internal/profiles/profiles.go

@@ -16,13 +16,13 @@ import (
 	"github.com/go-git/go-git/v5/plumbing/transport/ssh"
 	"github.com/google/uuid"
 	"github.com/qubesome/cli/internal/command"
-	"github.com/qubesome/cli/internal/drive"
-	"github.com/qubesome/cli/internal/env"
 	"github.com/qubesome/cli/internal/files"
 	"github.com/qubesome/cli/internal/images"
 	"github.com/qubesome/cli/internal/runners/util/container"
 	"github.com/qubesome/cli/internal/types"
 	"github.com/qubesome/cli/internal/util/dbus"
+	"github.com/qubesome/cli/internal/util/drive"
+	"github.com/qubesome/cli/internal/util/env"
 	"github.com/qubesome/cli/internal/util/gpu"
 	"github.com/qubesome/cli/internal/util/mtls"
 	"github.com/qubesome/cli/internal/util/resolution"
@@ -168,10 +168,6 @@ func StartFromGit(runner, name, gitURL, path, local string) error {
 		return fmt.Errorf("cannot file profile %q in config %q", name, cfgPath)
 	}
 
-	if p.Runner != "" {
-		runner = p.Runner
-	}
-
 	// When sourcing from git, ensure profile path is relative to the git repository.
 	pp, err := securejoin.SecureJoin(filepath.Dir(cfgPath), p.Path)
 	if err != nil {
@@ -198,6 +194,12 @@ func Start(runner string, profile *types.Profile, cfg *types.Config) (err error)
 		return err
 	}
 
+	// If runner is not being overwritten (via -runner), use the runner
+	// set at profile level in the config.
+	if runner == "" && profile.Runner != "" {
+		runner = profile.Runner
+	}
+
 	binary := files.ContainerRunnerBinary(runner)
 	fi, err := os.Lstat(binary)
 	if err != nil || !fi.Mode().IsRegular() {
@@ -502,9 +504,10 @@ func createNewDisplay(bin string, ca, cert, key []byte, profile *types.Profile,
 	}
 	if profile.HostAccess.Gpus != "" {
 		if strings.HasSuffix(bin, "podman") {
-			dockerArgs = append(dockerArgs, "--runtime=nvidia.com/gpu=all")
+			dockerArgs = append(dockerArgs, "--device=nvidia.com/gpu=all")
+		} else {
+			dockerArgs = append(dockerArgs, "--gpus", profile.HostAccess.Gpus)
 		}
-		dockerArgs = append(dockerArgs, "--gpus", profile.HostAccess.Gpus)
 	}
 
 	if profile.DNS != "" {

internal/qubesome/run.go

@@ -12,8 +12,6 @@ import (
 
 	securejoin "github.com/cyphar/filepath-securejoin"
 	"github.com/qubesome/cli/internal/command"
-	"github.com/qubesome/cli/internal/drive"
-	"github.com/qubesome/cli/internal/env"
 	"github.com/qubesome/cli/internal/files"
 	"github.com/qubesome/cli/internal/images"
 	"github.com/qubesome/cli/internal/inception"
@@ -22,6 +20,8 @@ import (
 	"github.com/qubesome/cli/internal/runners/podman"
 	"github.com/qubesome/cli/internal/types"
 	"github.com/qubesome/cli/internal/util/dbus"
+	"github.com/qubesome/cli/internal/util/drive"
+	"github.com/qubesome/cli/internal/util/env"
 	"gopkg.in/yaml.v3"
 )
 

internal/runners/docker/run.go

@@ -9,13 +9,13 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/qubesome/cli/internal/env"
 	"github.com/qubesome/cli/internal/files"
 	"github.com/qubesome/cli/internal/runners/util/container"
 	"github.com/qubesome/cli/internal/runners/util/mime"
 	"github.com/qubesome/cli/internal/runners/util/usb"
 	"github.com/qubesome/cli/internal/types"
 	"github.com/qubesome/cli/internal/util/dbus"
+	"github.com/qubesome/cli/internal/util/env"
 	"github.com/qubesome/cli/internal/util/gpu"
 	"golang.org/x/sys/execabs"
 )

internal/runners/podman/run.go

@@ -9,13 +9,13 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/qubesome/cli/internal/env"
 	"github.com/qubesome/cli/internal/files"
 	"github.com/qubesome/cli/internal/runners/util/container"
 	"github.com/qubesome/cli/internal/runners/util/mime"
 	"github.com/qubesome/cli/internal/runners/util/usb"
 	"github.com/qubesome/cli/internal/types"
 	"github.com/qubesome/cli/internal/util/dbus"
+	"github.com/qubesome/cli/internal/util/env"
 	"github.com/qubesome/cli/internal/util/gpu"
 	"golang.org/x/sys/execabs"
 )
@@ -82,7 +82,7 @@ func Run(ew types.EffectiveWorkload) error {
 	}
 
 	if wl.HostAccess.Gpus != "" {
-		args = append(args, "--gpus", wl.HostAccess.Gpus)
+		args = append(args, "--device=nvidia.com/gpu=all")
 	}
 
 	for _, cap := range wl.HostAccess.CapsAdd {

internal/types/workload.go

@@ -6,7 +6,7 @@ import (
 	"slices"
 	"strings"
 
-	"github.com/qubesome/cli/internal/env"
+	"github.com/qubesome/cli/internal/util/env"
 )
 
 type Workload struct {