Integrate CLIPV2 build pipeline

.gitignore

@@ -26,7 +26,6 @@ test
 **/nvidia-device-plugin.yaml.skip
 manifests/**/charts/**
 build.sh
-oci*
 .coverage
 .htmlcov
 okteto.yaml

go.mod

@@ -14,10 +14,10 @@ require (
 	github.com/aws/aws-sdk-go-v2/credentials v1.17.24
 	github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.16.9
 	github.com/aws/aws-sdk-go-v2/service/ec2 v1.144.0
-	github.com/aws/aws-sdk-go-v2/service/ecr v1.24.4
+	github.com/aws/aws-sdk-go-v2/service/ecr v1.27.0
 	github.com/aws/aws-sdk-go-v2/service/s3 v1.58.0
 	github.com/beam-cloud/blobcache-v2 v0.0.0-20250503151236-e2403183f563
-	github.com/beam-cloud/clip v0.0.0-20250815141247-71e2dd6c441d
+	github.com/beam-cloud/clip v0.0.0-20251103022546-c75714e105c1
 	github.com/beam-cloud/go-runc v0.0.0-20250911154456-bb45084abfe1
 	github.com/beam-cloud/goproc v0.1.5
 	github.com/beam-cloud/redislock v0.0.0-20250201162619-1b534b3be324
@@ -29,6 +29,7 @@ require (
 	github.com/go-playground/validator/v10 v10.26.0
 	github.com/go-viper/mapstructure/v2 v2.2.1
 	github.com/gofrs/uuid v4.4.0+incompatible
+	github.com/google/go-containerregistry v0.19.1
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
 	github.com/google/uuid v1.6.0
 	github.com/gorilla/websocket v1.5.3
@@ -112,7 +113,11 @@ require (
 	github.com/Azure/go-autorest/tracing v0.6.0 // indirect
 	github.com/aws/aws-sdk-go v1.55.6 // indirect
 	github.com/beam-cloud/rendezvous v0.0.0-20250415141250-2a0f81633db8 // indirect
+	github.com/containerd/stargz-snapshotter/estargz v0.16.3 // indirect
 	github.com/dimchansky/utfbom v1.1.1 // indirect
+	github.com/docker/cli v27.5.0+incompatible // indirect
+	github.com/docker/distribution v2.8.3+incompatible // indirect
+	github.com/docker/docker-credential-helpers v0.8.2 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.8 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
@@ -127,6 +132,7 @@ require (
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b // indirect
 	github.com/stretchr/objx v0.5.2 // indirect
+	github.com/vbatts/tar-split v0.11.6 // indirect
 	github.com/winfsp/cgofuse v1.5.0 // indirect
 	go.opencensus.io v0.24.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
@@ -167,7 +173,7 @@ require (
 	github.com/cenkalti/backoff/v4 v4.3.0
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/coder/websocket v1.8.12 // indirect
-	github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
 	github.com/cyphar/filepath-securejoin v0.3.5 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/dblohm7/wingoes v0.0.0-20240119213807-a09d6be7affa // indirect
@@ -298,7 +304,7 @@ require (
 	github.com/tklauser/numcpus v0.7.0 // indirect
 	github.com/u-root/uio v0.0.0-20240118234441-a3c409a6018e // indirect
 	github.com/ulikunitz/xz v0.5.12 // indirect
-	github.com/urfave/cli v1.22.14 // indirect
+	github.com/urfave/cli v1.22.15 // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
 	github.com/valyala/fastrand v1.1.0 // indirect
 	github.com/valyala/fasttemplate v1.2.2 // indirect

go.sum

@@ -111,8 +111,8 @@ github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.13 h1:THZJJ6TU/FOiM7DZFnisYV9d49o
 github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.13/go.mod h1:VISUTg6n+uBaYIWPBaIG0jk7mbBxm7DUqBtU2cUDDWI=
 github.com/aws/aws-sdk-go-v2/service/ec2 v1.144.0 h1:1KE7EgE5xiPZ6H19hdF27B/p/CGhB2UNO5wcpOHe0JM=
 github.com/aws/aws-sdk-go-v2/service/ec2 v1.144.0/go.mod h1:hIsHE0PaWAQakLCshKS7VKWMGXaqrAFp4m95s2W9E6c=
-github.com/aws/aws-sdk-go-v2/service/ecr v1.24.4 h1:pwSMMRVj2myoqRpPMDWBEjLqQlIgJ4ujMaMdc/sFd0U=
-github.com/aws/aws-sdk-go-v2/service/ecr v1.24.4/go.mod h1:AOHmGMoPtSY9Zm2zBuwUJQBisIvYAZeA1n7b6f4e880=
+github.com/aws/aws-sdk-go-v2/service/ecr v1.27.0 h1:e9RAM6FgxAN3ca3LKaCr20+YnMqg8vhX/k6WDA8BpT8=
+github.com/aws/aws-sdk-go-v2/service/ecr v1.27.0/go.mod h1:Fa36Bp93PNtMtKHoyIvQnJY8EGTR0UQqRo3NfjW0hT0=
 github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3 h1:eAh2A4b5IzM/lum78bZ590jy36+d/aFLgKF/4Vd1xPE=
 github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3/go.mod h1:0yKJC/kb8sAnmlYa6Zs3QVYqaC8ug2AbnNChv5Ox3uA=
 github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.15 h1:2jyRZ9rVIMisyQRnhSS/SqlckveoxXneIumECVFP91Y=
@@ -136,8 +136,8 @@ github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxY
 github.com/aybabtme/rgbterm v0.0.0-20170906152045-cc83f3b3ce59/go.mod h1:q/89r3U2H7sSsE2t6Kca0lfwTK8JdoNGS/yzM/4iH5I=
 github.com/beam-cloud/blobcache-v2 v0.0.0-20250503151236-e2403183f563 h1:kn8/lBy5kRSLpFAX/xV5GDg31R38Kv8Tp6qcuhpJAfQ=
 github.com/beam-cloud/blobcache-v2 v0.0.0-20250503151236-e2403183f563/go.mod h1:RrA2ruMma4/dN9Sa6wwhyAO1uI6di+tlLB5wuM7TuvQ=
-github.com/beam-cloud/clip v0.0.0-20250815141247-71e2dd6c441d h1:M6RtY4ANRr+NbbCCkL9l8Vksl5mW0F5hWCctaLAD4I8=
-github.com/beam-cloud/clip v0.0.0-20250815141247-71e2dd6c441d/go.mod h1:JqYuoB5waiXZrLmBO0rKM+Kl4iRWqfWb+pI+lk3BX+Q=
+github.com/beam-cloud/clip v0.0.0-20251103022546-c75714e105c1 h1:ZMtCArgCE4prVx28dkzjOw5FAw+0/ljoeKnHIuczSxE=
+github.com/beam-cloud/clip v0.0.0-20251103022546-c75714e105c1/go.mod h1:Tt5HW/Mp3twQHzal5RE3FYACcxaMaT+QyTBo8aGbsyI=
 github.com/beam-cloud/geesefs v0.0.0-20250921162405-f983757f032a h1:JQVvP0qKA39xp5ckKGcwkvgMO6BxatnzvgnMz97tt1g=
 github.com/beam-cloud/geesefs v0.0.0-20250921162405-f983757f032a/go.mod h1:utihEuMyzBOeZ6oU2ozzZkJmyzbYBuYrxsLUo1DfZXs=
 github.com/beam-cloud/geesefs/s3ext v0.0.0-20250606164905-2f3593d03f4f h1:XzHOu+erxeBO6D3fKVbd5DAlipl+PYZ3u+Ywb8m7Ovk=
@@ -200,9 +200,9 @@ github.com/cpuguy83/dockercfg v0.3.2 h1:DlJTyZGBDlXqUZ2Dk2Q3xHs/FtnooJJVaad2S9GK
 github.com/cpuguy83/dockercfg v0.3.2/go.mod h1:sugsbF4//dDlL/i+S+rtpIWp+5h0BHJHfjj5/jFyUJc=
 github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
-github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
-github.com/cpuguy83/go-md2man/v2 v2.0.4 h1:wfIWP927BUkWJb2NmU/kNDYIBTh/ziUX91+lVfRxZq4=
 github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
+github.com/cpuguy83/go-md2man/v2 v2.0.5 h1:ZtcqGrnekaHpVLArFSe4HK5DoKx1T0rq2DwVB0alcyc=
+github.com/cpuguy83/go-md2man/v2 v2.0.5/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/creack/pty v1.1.23 h1:4M6+isWdcStXEf15G/RbrMPOQj1dZ7HPZCGwE4kOeP0=
 github.com/creack/pty v1.1.23/go.mod h1:08sCNb52WyoAwi2QDyzUCTgcvVFhUzewun7wtTfvcwE=
@@ -793,8 +793,8 @@ github.com/ulikunitz/xz v0.5.9/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oW
 github.com/ulikunitz/xz v0.5.12 h1:37Nm15o69RwBkXM0J6A5OlE67RZTfzUxTj8fB3dfcsc=
 github.com/ulikunitz/xz v0.5.12/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
 github.com/urfave/cli v1.22.4/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
-github.com/urfave/cli v1.22.14 h1:ebbhrRiGK2i4naQJr+1Xj92HXZCrK7MsyTS/ob3HnAk=
-github.com/urfave/cli v1.22.14/go.mod h1:X0eDS6pD6Exaclxm99NJ3FiCDRED7vIHpx2mDOHLvkA=
+github.com/urfave/cli v1.22.15 h1:nuqt+pdC/KqswQKhETJjo7pvn/k4xMUxgW6liI7XpnM=
+github.com/urfave/cli v1.22.15/go.mod h1:wSan1hmo5zeyLGBjRJbzRTNk8gwoYa2B9n4q9dmRIc0=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
 github.com/valyala/fastrand v1.1.0 h1:f+5HkLW4rsgzdNoleUOB69hyT9IlD2ZQh9GyDMfb5G8=
@@ -1069,6 +1069,8 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
 gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
+gotest.tools/v3 v3.4.0 h1:ZazjZUfuVeZGLAmlKKuyv3IKP5orXcwtOwDQH6YVr6o=
+gotest.tools/v3 v3.4.0/go.mod h1:CtbdzLSsqVhDgMtKsx03ird5YTGB3ar27v0u/yKBW5g=
 gvisor.dev/gvisor v0.0.0-20240722211153-64c016c92987 h1:TU8z2Lh3Bbq77w0t1eG8yRlLcNHzZu3x6mhoH2Mk0c8=
 gvisor.dev/gvisor v0.0.0-20240722211153-64c016c92987/go.mod h1:sxc3Uvk/vHcd3tj7/DHVBoR5wvWT/MmRq2pj7HRJnwU=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

pkg/abstractions/image/build.go

@@ -276,37 +276,31 @@ func (b *Build) getContainerStatus() (*pb.RunCStatusResponse, error) {
 
 // generateContainerRequest generates a container request for the build container
 func (b *Build) generateContainerRequest() (*types.ContainerRequest, error) {
-	baseImageID, err := getImageID(&BuildOpts{
-		BaseImageRegistry: b.opts.BaseImageRegistry,
-		BaseImageName:     b.opts.BaseImageName,
-		BaseImageTag:      b.opts.BaseImageTag,
-		BaseImageDigest:   b.opts.BaseImageDigest,
-		ExistingImageUri:  b.opts.ExistingImageUri,
-		EnvVars:           b.opts.EnvVars,
-		Dockerfile:        b.opts.Dockerfile,
-		BuildCtxObject:    b.opts.BuildCtxObject,
-	})
+	containerImageID, err := b.getContainerImageID()
 	if err != nil {
 		return nil, err
 	}
 
-	sourceImage := getSourceImage(b.opts)
-
-	// Allow config to override default build container settings
-	cpu := defaultBuildContainerCpu
-	memory := defaultBuildContainerMemory
-
-	if b.config.ImageService.BuildContainerCpu > 0 {
-		cpu = b.config.ImageService.BuildContainerCpu
+	cpu := b.config.ImageService.BuildContainerCpu
+	if cpu <= 0 {
+		cpu = defaultBuildContainerCpu
+	}
+	memory := b.config.ImageService.BuildContainerMemory
+	if memory <= 0 {
+		memory = defaultBuildContainerMemory
 	}
 
-	if b.config.ImageService.BuildContainerMemory > 0 {
-		memory = b.config.ImageService.BuildContainerMemory
+	// Only set SourceImage if base image fields are populated
+	// For custom Dockerfiles, the FROM instruction specifies the base image
+	var sourceImagePtr *string
+	if b.opts.BaseImageName != "" && b.opts.BaseImageRegistry != "" {
+		sourceImage := getSourceImage(b.opts)
+		sourceImagePtr = &sourceImage
 	}
 
-	containerRequest := &types.ContainerRequest{
+	req := &types.ContainerRequest{
 		BuildOptions: types.BuildOptions{
-			SourceImage:      &sourceImage,
+			SourceImage:      sourceImagePtr,
 			SourceImageCreds: b.opts.BaseImageCreds,
 			Dockerfile:       &b.opts.Dockerfile,
 			BuildCtxObject:   &b.opts.BuildCtxObject,
@@ -316,29 +310,55 @@ func (b *Build) generateContainerRequest() (*types.ContainerRequest, error) {
 		Env:         b.opts.EnvVars,
 		Cpu:         cpu,
 		Memory:      memory,
-		ImageId:     baseImageID,
+		ImageId:     containerImageID,
 		WorkspaceId: b.authInfo.Workspace.ExternalId,
 		Workspace:   *b.authInfo.Workspace,
 		EntryPoint:  []string{"tail", "-f", "/dev/null"},
 		Mounts:      b.mounts,
 	}
 
 	if b.opts.BuildCtxObject != "" {
-		containerRequest.Stub.Object.ExternalId = b.opts.BuildCtxObject
-		containerRequest.Mounts = append(containerRequest.Mounts, types.Mount{
+		req.Stub.Object.ExternalId = b.opts.BuildCtxObject
+		req.Mounts = append(req.Mounts, types.Mount{
 			MountPath: types.WorkerUserCodeVolume,
 			ReadOnly:  false,
 		})
 	}
 
 	if b.opts.Gpu != "" {
-		containerRequest.GpuRequest = []string{b.opts.Gpu}
-		containerRequest.GpuCount = 1
+		req.GpuRequest = []string{b.opts.Gpu}
+		req.GpuCount = 1
 	} else {
-		containerRequest.PoolSelector = b.config.ImageService.BuildContainerPoolSelector
+		req.PoolSelector = b.config.ImageService.BuildContainerPoolSelector
+	}
+
+	return req, nil
+}
+
+// getContainerImageID returns the image ID to use for the build container
+// V2: final image ID (buildah builds complete image)
+// V1: base image ID (container starts with base, then commands are executed inside)
+// For custom Dockerfiles: use the final image ID since we're building from scratch
+func (b *Build) getContainerImageID() (string, error) {
+	isV2 := b.config.ImageService.ClipVersion == 2
+	hasCustomDockerfile := b.opts.Dockerfile != "" && b.opts.BaseImageName == ""
+
+	// For v2 builds OR custom Dockerfiles, use the final image ID
+	if isV2 || hasCustomDockerfile {
+		return b.imageID, nil
 	}
 
-	return containerRequest, nil
+	// For v1 builds with beta9 base images, calculate base image ID without build steps/commands
+	return getImageID(&BuildOpts{
+		BaseImageRegistry: b.opts.BaseImageRegistry,
+		BaseImageName:     b.opts.BaseImageName,
+		BaseImageTag:      b.opts.BaseImageTag,
+		BaseImageDigest:   b.opts.BaseImageDigest,
+		ExistingImageUri:  b.opts.ExistingImageUri,
+		EnvVars:           b.opts.EnvVars,
+		Dockerfile:        b.opts.Dockerfile,
+		BuildCtxObject:    b.opts.BuildCtxObject,
+	})
 }
 
 func genContainerId() string {
@@ -363,6 +383,27 @@ func generatePipInstallCommand(pythonPackages []string, pythonVersion string, vi
 	return command
 }
 
+// generateStandardPipInstallCommand generates a pip install command for v2 dockerfile builds
+// using standard Python/pip (not uv-b9 which is only available in v1 mounted environments).
+func generateStandardPipInstallCommand(pythonPackages []string, pythonVersion string, virtualEnv bool) string {
+	flagLines, packages := parseFlagLinesAndPackages(pythonPackages)
+
+	// Use standard pip with the specified python version
+	command := fmt.Sprintf("%s -m pip install", pythonVersion)
+	if !virtualEnv {
+		command += " --break-system-packages"
+	}
+
+	if len(flagLines) > 0 {
+		command += " " + strings.Join(flagLines, " ")
+	}
+	if len(packages) > 0 {
+		command += " " + strings.Join(packages, " ")
+	}
+
+	return command
+}
+
 func generateMicromambaInstallCommand(pythonPackages []string) string {
 	flagLines, packages := parseFlagLinesAndPackages(pythonPackages)
 
@@ -401,8 +442,71 @@ func parseFlagLinesAndPackages(pythonPackages []string) ([]string, []string) {
 	return flagLines, packages
 }
 
+// parseBuildStepsForDockerfile generates RUN commands for v2 dockerfile builds using standard pip.
+// This function coalesces pip and mamba commands into single RUN statements where possible.
+func parseBuildStepsForDockerfile(buildSteps []BuildStep, pythonVersion string, virtualEnv bool) []string {
+	commands := []string{}
+	var (
+		mambaStart int = -1
+		mambaGroup []string
+		pipStart   int = -1
+		pipGroup   []string
+	)
+
+	for _, step := range buildSteps {
+		if step.Type == shellCommandType {
+			commands = append(commands, step.Command)
+		}
+
+		flagCmd := containsFlag(step.Command)
+
+		// Flush any pending pip or mamba groups
+		if pipStart != -1 && (step.Type != pipCommandType || flagCmd) {
+			pipStart, pipGroup = flushStandardPipCommand(commands, pipStart, pipGroup, pythonVersion, virtualEnv)
+		}
+
+		if mambaStart != -1 && (step.Type != micromambaCommandType || flagCmd) {
+			mambaStart, mambaGroup = flushMambaCommand(commands, mambaStart, mambaGroup)
+		}
+
+		if step.Type == pipCommandType {
+			if pipStart == -1 {
+				pipStart = len(commands)
+				commands = append(commands, "")
+			}
+			pipGroup = append(pipGroup, step.Command)
+
+			if flagCmd {
+				pipStart, pipGroup = flushStandardPipCommand(commands, pipStart, pipGroup, pythonVersion, virtualEnv)
+			}
+		}
+
+		if step.Type == micromambaCommandType {
+			if mambaStart == -1 {
+				mambaStart = len(commands)
+				commands = append(commands, "")
+			}
+			mambaGroup = append(mambaGroup, step.Command)
+
+			if flagCmd {
+				mambaStart, mambaGroup = flushMambaCommand(commands, mambaStart, mambaGroup)
+			}
+		}
+	}
+
+	if mambaStart != -1 {
+		commands[mambaStart] = generateMicromambaInstallCommand(mambaGroup)
+	}
+
+	if pipStart != -1 {
+		commands[pipStart] = generateStandardPipInstallCommand(pipGroup, pythonVersion, virtualEnv)
+	}
+
+	return commands
+}
+
 // Generate the commands to run in the container. This function will coalesce pip and mamba commands
-// into a single command if they are adjacent to each other.
+// into a single command if they are adjacent to each other. Uses uv-b9 for v1 builds.
 func parseBuildSteps(buildSteps []BuildStep, pythonVersion string, virtualEnv bool) []string {
 	commands := []string{}
 	var (
@@ -474,6 +578,11 @@ func flushPipCommand(commands []string, pipStart int, pipGroup []string, pythonV
 	return -1, nil
 }
 
+func flushStandardPipCommand(commands []string, pipStart int, pipGroup []string, pythonVersion string, virtualEnv bool) (int, []string) {
+	commands[pipStart] = generateStandardPipInstallCommand(pipGroup, pythonVersion, virtualEnv)
+	return -1, nil
+}
+
 func containsFlag(s string) bool {
 	flags := []string{
 		"--no-deps",

pkg/abstractions/image/build_options.go

@@ -5,6 +5,7 @@ import (
 	"strings"
 
 	"github.com/beam-cloud/beta9/pkg/common"
+	reg "github.com/beam-cloud/beta9/pkg/registry"
 	"github.com/beam-cloud/beta9/pkg/types"
 )
 
@@ -61,19 +62,20 @@ func (o *BuildOpts) setCustomImageBuildOptions() error {
 		return err
 	}
 
-	if len(o.ExistingImageCreds) > 0 && o.ExistingImageUri != "" {
-		token, err := GetRegistryToken(o)
-		if err != nil {
-			return err
-		}
-		o.BaseImageCreds = token
-	}
-
+	// Set base image details
 	o.BaseImageRegistry = baseImage.Registry
 	o.BaseImageName = baseImage.Repo
 	o.BaseImageTag = baseImage.Tag
 	o.BaseImageDigest = baseImage.Digest
 
+	// Convert credentials to skopeo format if provided
+	if len(o.ExistingImageCreds) > 0 {
+		o.BaseImageCreds, err = reg.GetRegistryTokenForImage(o.ExistingImageUri, o.ExistingImageCreds)
+		if err != nil {
+			return err
+		}
+	}
+
 	return nil
 }