Merge pull request #1340 from chainguard-dev/revert-1298-docker-non-z…

…ero-uid

Revert "Use current user's ID when building via Docker"

pkg/container/docker/docker_runner.go

@@ -19,7 +19,6 @@ import (
 	"fmt"
 	"io"
 	"os"
-	"os/user"
 
 	"go.opentelemetry.io/otel"
 	"golang.org/x/sync/errgroup"
@@ -226,20 +225,8 @@ func (dk *docker) Run(ctx context.Context, cfg *mcontainer.Config, args ...strin
 		environ = append(environ, fmt.Sprintf("%s=%s", k, v))
 	}
 
-	// Default to the current user's UID
-	// Use a configured UID if it's not empty
-	currentUser, err := user.Current()
-	if err != nil {
-		return fmt.Errorf("failed to get current user: %w", err)
-	}
-
-	uid := currentUser.Uid
-	if cfg.RunAs != "" {
-		uid = cfg.RunAs
-	}
-
 	taskIDResp, err := dk.cli.ContainerExecCreate(ctx, cfg.PodID, container.ExecOptions{
-		User:         uid,
+		User:         cfg.RunAs,
 		Cmd:          args,
 		WorkingDir:   runnerWorkdir,
 		Env:          environ,