Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
refactor: extract build logic into go module go.getarcane.app/builds (#3040)
Kyle Mendell45b22d2b2520
diff --git a/backend/api/handlers/images.go b/backend/api/handlers/images.goindex 51cb6c881..d86a9e08f 100644--- a/backend/api/handlers/images.go+++ b/backend/api/handlers/images.go@@ -23,6 +23,7 @@ import ("github.com/getarcaneapp/arcane/types/v2/base""github.com/getarcaneapp/arcane/types/v2/image""github.com/getarcaneapp/arcane/types/v2/system"+ buildtypes "go.getarcane.app/builds/types""gorm.io/gorm")@@ -132,7 +133,7 @@ type PullImageInput struct {type BuildImageInput struct {EnvironmentID string `path:"id" doc:"Environment ID"`- Body image.BuildRequest+ Body buildtypes.BuildRequest}type ImageBuildPaginatedResponse struct {diff --git a/backend/go.mod b/backend/go.modindex c60c17cd5..25f8d9686 100644--- a/backend/go.mod+++ b/backend/go.mod@@ -19,13 +19,12 @@ require (github.com/containerd/platforms v1.0.0-rc.4github.com/coreos/go-oidc/v3 v3.19.0github.com/danielgtaylor/huma/v2 v2.38.0- github.com/depot/depot-go v0.5.2github.com/distribution/reference v0.6.0github.com/docker/cli v29.6.1+incompatiblegithub.com/docker/compose/v5 v5.2.0github.com/docker/go-units v0.5.0github.com/fsnotify/fsnotify v1.10.1- github.com/getarcaneapp/arcane/cli/v2 v2.0.1+ github.com/getarcaneapp/arcane/cli/v2 v2.1.0github.com/getarcaneapp/arcane/types/v2 v2.1.0github.com/glebarez/sqlite v1.11.0github.com/go-git/go-git/v5 v5.19.1@@ -41,11 +40,9 @@ require (github.com/klauspost/compress v1.18.6github.com/labstack/echo/v4 v4.15.4github.com/lmittmann/tint v1.1.3- github.com/moby/buildkit v0.31.0- github.com/moby/go-archive v0.2.0+ github.com/moby/buildkit v0.31.1github.com/moby/moby/api v1.55.0github.com/moby/moby/client v0.5.0- github.com/moby/patternmatcher v0.6.1github.com/nicholas-fedor/shoutrrr v0.16.1github.com/opencontainers/go-digest v1.0.0github.com/opencontainers/image-spec v1.1.1@@ -56,8 +53,8 @@ require (github.com/shirou/gopsutil/v4 v4.26.5github.com/spf13/cobra v1.10.2github.com/stretchr/testify v1.11.1- github.com/tonistiigi/fsutil v0.0.0-20260609174605-b61e79c0c046github.com/wneessen/go-mail v0.7.3+ go.getarcane.app/builds v0.1.0go.getarcane.app/updater v0.4.0golang.org/x/crypto v0.53.0golang.org/x/mod v0.37.0@@ -106,6 +103,7 @@ require (github.com/containerd/typeurl/v2 v2.3.0 // indirectgithub.com/cyphar/filepath-securejoin v0.6.1 // indirectgithub.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect+ github.com/depot/depot-go v0.5.2 // indirectgithub.com/docker/buildx v0.35.0 // indirectgithub.com/docker/docker v28.5.2+incompatible // indirectgithub.com/docker/docker-credential-helpers v0.9.8 // indirect@@ -158,7 +156,9 @@ require (github.com/mfridman/interpolate v0.0.2 // indirectgithub.com/mitchellh/hashstructure/v2 v2.0.2 // indirectgithub.com/moby/docker-image-spec v1.3.1 // indirect+ github.com/moby/go-archive v0.2.0 // indirectgithub.com/moby/locker v1.0.1 // indirect+ github.com/moby/patternmatcher v0.6.1 // indirectgithub.com/moby/sys/atomicwriter v0.1.0 // indirectgithub.com/moby/sys/capability v0.4.0 // indirectgithub.com/moby/sys/sequential v0.7.0 // indirect@@ -192,6 +192,7 @@ require (github.com/tklauser/go-sysconf v0.4.0 // indirectgithub.com/tklauser/numcpus v0.12.0 // indirectgithub.com/tonistiigi/dchapes-mode v0.0.0-20250318174251-73d941a28323 // indirect+ github.com/tonistiigi/fsutil v0.0.0-20260609174605-b61e79c0c046 // indirectgithub.com/tonistiigi/go-csvvalue v0.0.0-20240814133006-030d3b2625d0 // indirectgithub.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea // indirectgithub.com/tonistiigi/vt100 v0.0.0-20240514184818-90bafcd6abab // indirectdiff --git a/backend/go.sum b/backend/go.sumindex c5eaacf4c..a6efd012d 100644--- a/backend/go.sum+++ b/backend/go.sum@@ -349,8 +349,8 @@ github.com/mfridman/interpolate v0.0.2 h1:pnuTK7MQIxxFz1Gr+rjSIx9u7qVjf5VOoM/u6Bgithub.com/mfridman/interpolate v0.0.2/go.mod h1:p+7uk6oE07mpE/Ik1b8EckO0O4ZXiGAfshKBWLUM9Xg=github.com/mitchellh/hashstructure/v2 v2.0.2 h1:vGKWl0YJqUNxE8d+h8f6NJLcCJrgbhC4NcD46KavDd4=github.com/mitchellh/hashstructure/v2 v2.0.2/go.mod h1:MG3aRVU/N29oo/V/IhBX8GR/zz4kQkprJgF2EVszyDE=-github.com/moby/buildkit v0.31.0 h1:hMUAbQGgjtzJDDOZ6o7MQk5XBZkBTyzLWEvnjguHHQI=-github.com/moby/buildkit v0.31.0/go.mod h1:YM5iNEbNCc6L1Zt3YWFB/aXNLufvf4Rcu0DPlc9HwQg=+github.com/moby/buildkit v0.31.1 h1:j3p55abBl4kiXXPZgYX+6zWgB2aefqHXoPown12fIzU=+github.com/moby/buildkit v0.31.1/go.mod h1:YM5iNEbNCc6L1Zt3YWFB/aXNLufvf4Rcu0DPlc9HwQg=github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=github.com/moby/go-archive v0.2.0 h1:zg5QDUM2mi0JIM9fdQZWC7U8+2ZfixfTYoHL7rWUcP8=@@ -535,6 +535,8 @@ github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 h1:ilQV1hzziu+LLM3zUgithub.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78/go.mod h1:aL8wCCfTfSfmXjznFBSZNN13rSJjlIOI1fUNAtF7rmI=github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=+go.getarcane.app/builds v0.1.0 h1:BOEFFFI35nQq/jowWs7+Uhi1XNoKIEKmNd7xnassCVg=+go.getarcane.app/builds v0.1.0/go.mod h1:3g7+969+qWH33EXnA+nu5MKhs72JYDPf9Q/OtYO6CIA=go.getarcane.app/updater v0.4.0 h1:ZVXZ8N/sXDZq7/0VvB8JMwtbwNpGqrswLDjESimL8mw=go.getarcane.app/updater v0.4.0/go.mod h1:Pqz4cI9nePA6abdZzfESZPxQC5jWVoiWKqcgX+pDkAk=go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=diff --git a/backend/internal/common/errors.go b/backend/internal/common/errors.goindex 8ef80094b..91392c8fb 100644--- a/backend/internal/common/errors.go+++ b/backend/internal/common/errors.go@@ -1801,118 +1801,6 @@ func (e *SwarmInspectError) Error() string {return fmt.Sprintf("Failed to inspect swarm: %v", e.Err)}-type BuildKitImageExporterError struct {- ProviderName string- Err error-}--func (e *BuildKitImageExporterError) Error() string {- return fmt.Sprintf("depot and remote BuildKit providers require the image exporter for provider %s: %v", e.ProviderName, e.Err)-}--func (e *BuildKitImageExporterError) Unwrap() error { return e.Err }--type BuildKitDockerExporterError struct {- ProviderName string- Err error-}--func (e *BuildKitDockerExporterError) Error() string {- return fmt.Sprintf("the Docker Engine embedded BuildKit requires the docker image-store exporter (used for load) for provider %s: %v", e.ProviderName, e.Err)-}--func (e *BuildKitDockerExporterError) Unwrap() error { return e.Err }--type BuildSettingsProviderUnavailableError struct{}--func (e *BuildSettingsProviderUnavailableError) Error() string {- return "settings provider not available"-}--type BuildContextDirRequiredError struct{}--func (e *BuildContextDirRequiredError) Error() string {- return "contextDir is required"-}--type BuildProviderUnavailableError struct{}--func (e *BuildProviderUnavailableError) Error() string {- return "build provider not available"-}--type BuildSessionUnavailableError struct{}--func (e *BuildSessionUnavailableError) Error() string {- return "build session not available"-}--type BuildDockerServiceUnavailableError struct{}--func (e *BuildDockerServiceUnavailableError) Error() string {- return "docker service not available"-}--type DepotProjectCredentialsRequiredError struct{}--func (e *DepotProjectCredentialsRequiredError) Error() string {- return "depot project ID and token are required"-}--type GitBuildContextFragmentRequiredError struct{}--func (e *GitBuildContextFragmentRequiredError) Error() string {- return "git build context fragment cannot be empty"-}--type GitBuildContextRefRequiredError struct{}--func (e *GitBuildContextRefRequiredError) Error() string {- return "git build context ref cannot be empty"-}--type GitBuildContextSubdirRequiredError struct{}--func (e *GitBuildContextSubdirRequiredError) Error() string {- return "git build context subdir cannot be empty"-}--type GitBuildContextSubdirRelativeError struct{}--func (e *GitBuildContextSubdirRelativeError) Error() string {- return "git build context subdir must be relative"-}--type GitBuildContextSubdirEscapesRepositoryError struct{}--func (e *GitBuildContextSubdirEscapesRepositoryError) Error() string {- return "git build context subdir must stay within the repository"-}--type DockerfileAndInlineMutuallyExclusiveError struct{}--func (e *DockerfileAndInlineMutuallyExclusiveError) Error() string {- return "dockerfile and dockerfileInline are mutually exclusive"-}--type DepotBuildPushRequiredError struct{}--func (e *DepotBuildPushRequiredError) Error() string {- return "depot builds must push images to a registry"-}--type BuildTagsRequiredError struct{}--func (e *BuildTagsRequiredError) Error() string {- return "at least one tag is required when push/load is enabled"-}--type DockerBuildMultiPlatformUnsupportedError struct{}--func (e *DockerBuildMultiPlatformUnsupportedError) Error() string {- return "docker build fallback does not support multi-platform builds"-}-// ----- RBAC / role service errors -----type RoleNotFoundError struct{}diff --git a/backend/internal/services/build_service.go b/backend/internal/services/build_service.goindex 7e3c707fd..e9deba656 100644--- a/backend/internal/services/build_service.go+++ b/backend/internal/services/build_service.go@@ -16,10 +16,11 @@ import ("github.com/getarcaneapp/arcane/backend/v2/internal/database""github.com/getarcaneapp/arcane/backend/v2/internal/models"buildgit "github.com/getarcaneapp/arcane/backend/v2/pkg/gitutil"- "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/libbuild""github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"- buildtypes "github.com/getarcaneapp/arcane/types/v2/builds"imagetypes "github.com/getarcaneapp/arcane/types/v2/image"+ buildapi "go.getarcane.app/builds/api"+ contextsource "go.getarcane.app/builds/pkg/utils/contextsource"+ buildtypes "go.getarcane.app/builds/types""gorm.io/gorm")@@ -54,11 +55,18 @@ func NewBuildService(gitRepository: gitRepository,eventService: eventService,}- // ContainerRegistryService already implements buildtypes.RegistryAuthProvider, so the- // builder consumes it directly instead of through forwarding methods on BuildService.- // Its auth methods are nil-receiver safe, so a nil registryService (which satisfies the- // interface as a typed-nil pointer) returns empty auth instead of panicking.- svc.builder = libbuild.NewBuilder(svc, dockerService, registryService)+ var registryAuthProvider buildtypes.RegistryAuthProvider+ if registryService != nil {+ registryAuthProvider = registryService+ }++ // ContainerRegistryService already implements buildtypes.RegistryAuthProvider,+ // so the builder consumes it directly instead of through forwarding methods on BuildService.+ svc.builder = buildapi.NewService(buildapi.Config{+ SettingsProvider: svc,+ DockerClientProvider: dockerService,+ RegistryAuthProvider: registryAuthProvider,+ })return svc}@@ -76,12 +84,12 @@ func (s *BuildService) BuildSettings() buildtypes.BuildSettings {}}-func (s *BuildService) BuildImage(ctx context.Context, environmentID string, req imagetypes.BuildRequest, progressWriter io.Writer, serviceName string, user *models.User) (*imagetypes.BuildResult, error) {+func (s *BuildService) BuildImage(ctx context.Context, environmentID string, req buildtypes.BuildRequest, progressWriter io.Writer, serviceName string, user *models.User) (*buildtypes.BuildResult, error) {if s.builder == nil {return nil, errors.New("build service not available")}- logCapture := libbuild.NewLogCapture(buildHistoryOutputLimitBytes)+ logCapture := buildapi.NewLogCapture(buildHistoryOutputLimitBytes)writer := io.Writer(logCapture)if progressWriter != nil {writer = io.MultiWriter(progressWriter, logCapture)@@ -99,7 +107,7 @@ func (s *BuildService) BuildImage(ctx context.Context, environmentID string, reqstartedAt := time.Now()cleanupResolvedContext := func() error { return nil }var (- result *imagetypes.BuildResult+ result *buildtypes.BuildResulterr error)@@ -152,7 +160,7 @@ func (s *BuildService) BuildImage(ctx context.Context, environmentID string, reqreturn result, err}-func (s *BuildService) logBuildFailureEventInternal(ctx context.Context, environmentID string, req imagetypes.BuildRequest, serviceName, buildRecordID string, err error, user *models.User) {+func (s *BuildService) logBuildFailureEventInternal(ctx context.Context, environmentID string, req buildtypes.BuildRequest, serviceName, buildRecordID string, err error, user *models.User) {if s.eventService == nil || err == nil {return}@@ -240,17 +248,17 @@ func firstNonEmptyStringInternal(values ...string) string {func (s *BuildService) resolveBuildRequestInternal(ctx context.Context,- req imagetypes.BuildRequest,+ req buildtypes.BuildRequest,progressWriter io.Writer,serviceName string,-) (imagetypes.BuildRequest, func() error, error) {- source, ok, err := libbuild.ParseGitBuildContextSource(req.ContextDir)+) (buildtypes.BuildRequest, func() error, error) {+ source, ok, err := contextsource.ParseGitBuildContextSource(req.ContextDir)if err != nil {- return imagetypes.BuildRequest{}, func() error { return nil }, err+ return buildtypes.BuildRequest{}, func() error { return nil }, err}if !ok || source == nil {- if libbuild.IsPotentialRemoteBuildContextSource(req.ContextDir) {- return imagetypes.BuildRequest{}, func() error { return nil }, fmt.Errorf("unsupported remote build context source %q: only git repository URLs are supported", req.ContextDir)+ if contextsource.IsPotentialRemoteBuildContextSource(req.ContextDir) {+ return buildtypes.BuildRequest{}, func() error { return nil }, fmt.Errorf("unsupported remote build context source %q: only git repository URLs are supported", req.ContextDir)}return req, func() error { return nil }, nil}@@ -259,28 +267,28 @@ func (s *BuildService) resolveBuildRequestInternal(authConfig, matchedRepository, err := s.resolveGitBuildAuthInternal(ctx, source.RepositoryURL)if err != nil {- return imagetypes.BuildRequest{}, func() error { return nil }, err+ return buildtypes.BuildRequest{}, func() error { return nil }, err}if matchedRepository {writeBuildProgressStatusInternal(progressWriter, serviceName, "using saved git credentials for "+source.RepositoryURL)}- if libbuild.RequiresGitRemoteProbe(source.RepositoryURL) {+ if contextsource.RequiresGitRemoteProbe(source.RepositoryURL) {writeBuildProgressStatusInternal(progressWriter, serviceName, "verifying remote git repository "+source.RepositoryURL)if err := s.probeGitContextInternal(ctx, source.RepositoryURL, authConfig); err != nil {- return imagetypes.BuildRequest{}, func() error { return nil }, fmt.Errorf("failed to verify remote git repository %q: %w", source.RepositoryURL, err)+ return buildtypes.BuildRequest{}, func() error { return nil }, fmt.Errorf("failed to verify remote git repository %q: %w", source.RepositoryURL, err)}}repoPath, err := s.cloneGitContextInternal(ctx, source.RepositoryURL, source.Ref, authConfig)if err != nil {- return imagetypes.BuildRequest{}, func() error { return nil }, err+ return buildtypes.BuildRequest{}, func() error { return nil }, err}contextDir := repoPathif source.Subdir != "" {if err := buildgit.ValidatePath(repoPath, filepath.FromSlash(source.Subdir)); err != nil {_ = s.cleanupGitContextInternal(repoPath)- return imagetypes.BuildRequest{}, func() error { return nil }, fmt.Errorf("invalid git build context subdir: %w", err)+ return buildtypes.BuildRequest{}, func() error { return nil }, fmt.Errorf("invalid git build context subdir: %w", err)}contextDir = filepath.Join(repoPath, filepath.FromSlash(source.Subdir))}@@ -288,11 +296,11 @@ func (s *BuildService) resolveBuildRequestInternal(info, err := os.Stat(contextDir)if err != nil {_ = s.cleanupGitContextInternal(repoPath)- return imagetypes.BuildRequest{}, func() error { return nil }, fmt.Errorf("failed to stat resolved git build context: %w", err)+ return buildtypes.BuildRequest{}, func() error { return nil }, fmt.Errorf("failed to stat resolved git build context: %w", err)}if !info.IsDir() {_ = s.cleanupGitContextInternal(repoPath)- return imagetypes.BuildRequest{}, func() error { return nil }, errors.New("resolved git build context is not a directory")+ return buildtypes.BuildRequest{}, func() error { return nil }, errors.New("resolved git build context is not a directory")}writeBuildProgressStatusInternal(progressWriter, serviceName, "using remote build context "+source.Raw)@@ -366,7 +374,7 @@ func writeBuildProgressStatusInternal(progressWriter io.Writer, serviceName, stareturn}- if err := json.NewEncoder(progressWriter).Encode(imagetypes.ProgressEvent{+ if err := json.NewEncoder(progressWriter).Encode(buildtypes.ProgressEvent{Type: "build",Service: serviceName,Status: status,@@ -424,7 +432,7 @@ func (s *BuildService) GetImageBuildByID(ctx context.Context, environmentID, buireturn new(buildToRecord(build, true)), nil}-func (s *BuildService) createBuildRecord(ctx context.Context, environmentID string, req imagetypes.BuildRequest, user *models.User) (*models.ImageBuild, error) {+func (s *BuildService) createBuildRecord(ctx context.Context, environmentID string, req buildtypes.BuildRequest, user *models.User) (*models.ImageBuild, error) {buildArgs := mapToJSON(req.BuildArgs)labels := mapToJSON(req.Labels)ulimits := mapToJSON(req.Ulimits)diff --git a/backend/internal/services/build_service_test.go b/backend/internal/services/build_service_test.goindex d3a7e9904..8d780e608 100644--- a/backend/internal/services/build_service_test.go+++ b/backend/internal/services/build_service_test.go@@ -7,17 +7,17 @@ import ("io""os""path/filepath"+ "reflect""testing"- "github.com/getarcaneapp/arcane/backend/v2/internal/common""github.com/getarcaneapp/arcane/backend/v2/internal/database""github.com/getarcaneapp/arcane/backend/v2/internal/models"buildgit "github.com/getarcaneapp/arcane/backend/v2/pkg/gitutil""github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/crypto"- "github.com/getarcaneapp/arcane/types/v2/image"glsqlite "github.com/glebarez/sqlite""github.com/stretchr/testify/assert""github.com/stretchr/testify/require"+ buildtypes "go.getarcane.app/builds/types""gorm.io/gorm")@@ -30,7 +30,7 @@ func TestBuildService_ResolveBuildRequest_PassesThroughLocalContext(t *testing.T},}- req := image.BuildRequest{+ req := buildtypes.BuildRequest{ContextDir: contextDir,Dockerfile: "Dockerfile",}@@ -42,6 +42,18 @@ func TestBuildService_ResolveBuildRequest_PassesThroughLocalContext(t *testing.Trequire.NoError(t, cleanup())}+func TestNewBuildService_NilRegistryServiceKeepsNilBuildRegistryProvider(t *testing.T) {+ svc := NewBuildService(nil, nil, nil, nil, nil, nil)+ require.NotNil(t, svc.builder)++ builderValue := reflect.ValueOf(svc.builder)+ require.Equal(t, reflect.Pointer, builderValue.Kind())++ registryProvider := builderValue.Elem().FieldByName("registryAuthProvider")+ require.True(t, registryProvider.IsValid())+ require.True(t, registryProvider.IsNil())+}+func TestBuildService_ResolveBuildRequest_ClonesRemoteGitContext(t *testing.T) {repoPath := t.TempDir()require.NoError(t, os.MkdirAll(filepath.Join(repoPath, "docker", "app"), 0o755))@@ -65,7 +77,7 @@ func TestBuildService_ResolveBuildRequest_ClonesRemoteGitContext(t *testing.T) {},}- req := image.BuildRequest{+ req := buildtypes.BuildRequest{ContextDir: "https://github.com/getarcaneapp/arcane.git#main:docker/app",Dockerfile: "Dockerfile",}@@ -103,7 +115,7 @@ func TestBuildService_ResolveBuildRequest_ProbesAndClonesRemoteGitContextWithoutresolvedReq, cleanup, err := svc.resolveBuildRequestInternal(context.Background(),- image.BuildRequest{ContextDir: "https://git.sr.ht/~jordanreger/nws-alerts#main:docker/app"},+ buildtypes.BuildRequest{ContextDir: "https://git.sr.ht/~jordanreger/nws-alerts#main:docker/app"},nil,"",)@@ -119,7 +131,7 @@ func TestBuildService_ResolveBuildRequest_RequiresGitRepositoryServiceForRemoteC_, cleanup, err := svc.resolveBuildRequestInternal(context.Background(),- image.BuildRequest{ContextDir: "https://github.com/getarcaneapp/arcane.git#main"},+ buildtypes.BuildRequest{ContextDir: "https://github.com/getarcaneapp/arcane.git#main"},nil,"",)@@ -143,7 +155,7 @@ func TestBuildService_ResolveBuildRequest_RejectsNonGitHTTPContextViaProbeFailur_, cleanup, err := svc.resolveBuildRequestInternal(context.Background(),- image.BuildRequest{ContextDir: "https://example.com/archive.tar.gz"},+ buildtypes.BuildRequest{ContextDir: "https://example.com/archive.tar.gz"},nil,"",)@@ -199,7 +211,7 @@ func TestBuildService_ResolveBuildRequest_UsesSavedGitCredentials(t *testing.T)_, cleanup, err := svc.resolveBuildRequestInternal(context.Background(),- image.BuildRequest{ContextDir: "https://github.com/getarcaneapp/private-build#main"},+ buildtypes.BuildRequest{ContextDir: "https://github.com/getarcaneapp/private-build#main"},nil,"",)@@ -225,7 +237,7 @@ func TestBuildService_ResolveBuildRequest_UsesSavedGitCredentials(t *testing.T)_, cleanup, err := svc.resolveBuildRequestInternal(context.Background(),- image.BuildRequest{ContextDir: "[email protected]:getarcaneapp/private-ssh.git#main"},+ buildtypes.BuildRequest{ContextDir: "[email protected]:getarcaneapp/private-ssh.git#main"},nil,"",)@@ -241,11 +253,11 @@ func TestBuildService_BuildImage_PreservesRemoteSourceInHistory(t *testing.T) {repoPath := t.TempDir()require.NoError(t, os.WriteFile(filepath.Join(repoPath, "Dockerfile"), []byte("FROM alpine:3.20\n"), 0o644))- captured := image.BuildRequest{}+ captured := buildtypes.BuildRequest{}svc := &BuildService{db: db,builder: testBuildRecorder{- onBuild: func(req image.BuildRequest) {+ onBuild: func(req buildtypes.BuildRequest) {captured = req},},@@ -255,7 +267,7 @@ func TestBuildService_BuildImage_PreservesRemoteSourceInHistory(t *testing.T) {gitCleanupFn: func(string) error { return nil },}- req := image.BuildRequest{+ req := buildtypes.BuildRequest{ContextDir: "https://github.com/getarcaneapp/arcane.git#main",Dockerfile: "Dockerfile",Tags: []string{"ghcr.io/getarcaneapp/arcane:test"},@@ -288,7 +300,7 @@ func TestBuildService_BuildImage_FailureRecordsHistoryAndEvent(t *testing.T) {Username: "tester",}- req := image.BuildRequest{+ req := buildtypes.BuildRequest{ContextDir: "/builds/demo",Dockerfile: "Dockerfile",Tags: []string{"arcane.local/demo:test"},@@ -322,7 +334,7 @@ func TestBuildService_BuildImage_FailureExporterErrorsAppearInOutputHistoryAndEvdb, err := setupBuildHistoryTestDB()require.NoError(t, err)- buildErr := &common.BuildKitImageExporterError{+ buildErr := &buildtypes.BuildKitImageExporterError{ProviderName: "depot",Err: errors.New(`failed to solve: failed to solve: exporter "image" could not be found`),}@@ -333,7 +345,7 @@ func TestBuildService_BuildImage_FailureExporterErrorsAppearInOutputHistoryAndEveventService: NewEventService(db, nil, nil),builder: testBuildRecorder{err: buildErr,- onProgress: func(_ image.BuildRequest, w io.Writer) {+ onProgress: func(_ buildtypes.BuildRequest, w io.Writer) {_, _ = w.Write([]byte(buildErr.Error()))},},@@ -344,7 +356,7 @@ func TestBuildService_BuildImage_FailureExporterErrorsAppearInOutputHistoryAndEvUsername: "registry-test",}- req := image.BuildRequest{+ req := buildtypes.BuildRequest{ContextDir: "/builds/demo",Dockerfile: "Dockerfile",Tags: []string{"ghcr.io/getarcaneapp/arcane:test"},@@ -393,12 +405,12 @@ func TestSanitizeBuildContextForEventInternal_RedactsURLCredentials(t *testing.T}type testBuildRecorder struct {- onBuild func(image.BuildRequest)- onProgress func(image.BuildRequest, io.Writer)+ onBuild func(buildtypes.BuildRequest)+ onProgress func(buildtypes.BuildRequest, io.Writer)err error}-func (b testBuildRecorder) BuildImage(_ context.Context, req image.BuildRequest, writer io.Writer, _ string) (*image.BuildResult, error) {+func (b testBuildRecorder) BuildImage(_ context.Context, req buildtypes.BuildRequest, writer io.Writer, _ string) (*buildtypes.BuildResult, error) {if b.onBuild != nil {b.onBuild(req)}@@ -408,7 +420,7 @@ func (b testBuildRecorder) BuildImage(_ context.Context, req image.BuildRequest,}return nil, b.err}- return &image.BuildResult{Provider: "local"}, nil+ return &buildtypes.BuildResult{Provider: "local"}, nil}func setupBuildHistoryTestDB() (*database.DB, error) {diff --git a/backend/internal/services/git_repository_service.go b/backend/internal/services/git_repository_service.goindex a817108a0..fa9b28ce8 100644--- a/backend/internal/services/git_repository_service.go+++ b/backend/internal/services/git_repository_service.go@@ -10,11 +10,11 @@ import ("github.com/getarcaneapp/arcane/backend/v2/internal/models"git "github.com/getarcaneapp/arcane/backend/v2/pkg/gitutil""github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/crypto"- "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/libbuild""github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/timeouts""github.com/getarcaneapp/arcane/backend/v2/pkg/pagination""github.com/getarcaneapp/arcane/backend/v2/pkg/utils""github.com/getarcaneapp/arcane/types/v2/gitops"+ contextsource "go.getarcane.app/builds/pkg/utils/contextsource""gorm.io/gorm")@@ -78,7 +78,7 @@ func (s *GitRepositoryService) FindEnabledRepositoryByURL(ctx context.Context, rreturn nil, nil}- normalizedURL := libbuild.NormalizeGitBuildContextSourceForMatch(rawURL)+ normalizedURL := contextsource.NormalizeGitBuildContextSourceForMatch(rawURL)if normalizedURL == "" {return nil, nil}@@ -99,7 +99,7 @@ func (s *GitRepositoryService) FindEnabledRepositoryByURL(ctx context.Context, r}for i := range repositories {- if libbuild.NormalizeGitBuildContextSourceForMatch(repositories[i].URL) == normalizedURL {+ if contextsource.NormalizeGitBuildContextSourceForMatch(repositories[i].URL) == normalizedURL {return new(repositories[i]), nil}}diff --git a/backend/internal/services/project_service.go b/backend/internal/services/project_service.goindex d948daf6c..9be9baedd 100644--- a/backend/internal/services/project_service.go+++ b/backend/internal/services/project_service.go@@ -24,7 +24,6 @@ import ("github.com/getarcaneapp/arcane/backend/v2/internal/database""github.com/getarcaneapp/arcane/backend/v2/internal/models"dockerutil "github.com/getarcaneapp/arcane/backend/v2/pkg/dockerutil"- "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/libbuild""github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/timeouts""github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/volumes""github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"@@ -39,6 +38,8 @@ import ("github.com/getarcaneapp/arcane/types/v2/project""github.com/moby/moby/api/types/container""github.com/moby/moby/client"+ contextsource "go.getarcane.app/builds/pkg/utils/contextsource"+ buildtypes "go.getarcane.app/builds/types"libupdater "go.getarcane.app/updater/pkg/labels""gorm.io/gorm")@@ -2716,7 +2717,7 @@ func resolveBuildContextInternal(workingDir string, svc composetypes.ServiceConfcontextDir := strings.TrimSpace(svc.Build.Context)if contextDir == "" {contextDir = workingDir- } else if _, isGitContext, err := libbuild.ParseGitBuildContextSource(contextDir); err != nil {+ } else if _, isGitContext, err := contextsource.ParseGitBuildContextSource(contextDir); err != nil {return "", fmt.Errorf("invalid build context for service %s: %w", serviceName, err)} else if !isGitContext && !filepath.IsAbs(contextDir) {contextDir = filepath.Join(workingDir, contextDir)@@ -2762,16 +2763,16 @@ func (s *ProjectService) prepareServiceBuildRequest(serviceName string,svc composetypes.ServiceConfig,options ProjectBuildOptions,-) (imagetypes.BuildRequest, composetypes.ServiceConfig, bool, error) {+) (buildtypes.BuildRequest, composetypes.ServiceConfig, bool, error) {_ = ctximageName, updatedSvc, updated := ensureServiceImage(projectID, project.Name, serviceName, svc)effectiveProvider := s.resolveEffectiveBuildProvider(options.Provider)if updated && effectiveProvider == "depot" {- return imagetypes.BuildRequest{}, updatedSvc, updated, fmt.Errorf("service %s must define an image when using depot build provider", serviceName)+ return buildtypes.BuildRequest{}, updatedSvc, updated, fmt.Errorf("service %s must define an image when using depot build provider", serviceName)}if updated && options.Push != nil && *options.Push {- return imagetypes.BuildRequest{}, updatedSvc, updated, fmt.Errorf("service %s must define an image when push is enabled", serviceName)+ return buildtypes.BuildRequest{}, updatedSvc, updated, fmt.Errorf("service %s must define an image when push is enabled", serviceName)}// The build context (and any absolute Dockerfile path) is read locally by@@ -2784,12 +2785,12 @@ func (s *ProjectService) prepareServiceBuildRequest(// For that reason the build context dir is deliberately left untranslated.contextDir, err := resolveBuildContextInternal(project.WorkingDir, updatedSvc, serviceName)if err != nil {- return imagetypes.BuildRequest{}, updatedSvc, updated, err+ return buildtypes.BuildRequest{}, updatedSvc, updated, err}dockerfileInline := updatedSvc.Build.DockerfileInlineif strings.TrimSpace(updatedSvc.Build.Dockerfile) != "" && strings.TrimSpace(dockerfileInline) != "" {- return imagetypes.BuildRequest{}, updatedSvc, updated, fmt.Errorf("service %s cannot define both dockerfile and dockerfile_inline", serviceName)+ return buildtypes.BuildRequest{}, updatedSvc, updated, fmt.Errorf("service %s cannot define both dockerfile and dockerfile_inline", serviceName)}dockerfilePath := ""@@ -2797,7 +2798,7 @@ func (s *ProjectService) prepareServiceBuildRequest(dockerfilePath = resolveDockerfilePathInternal(updatedSvc)}- buildReq := imagetypes.BuildRequest{+ buildReq := buildtypes.BuildRequest{ContextDir: contextDir,Dockerfile: dockerfilePath,DockerfileInline: dockerfileInline,diff --git a/backend/internal/services/project_service_test.go b/backend/internal/services/project_service_test.goindex 2ea7dbc4a..e713af2f6 100644--- a/backend/internal/services/project_service_test.go+++ b/backend/internal/services/project_service_test.go@@ -27,7 +27,6 @@ import ("github.com/getarcaneapp/arcane/backend/v2/pkg/pagination""github.com/getarcaneapp/arcane/backend/v2/pkg/projects""github.com/getarcaneapp/arcane/backend/v2/pkg/utils/iconcatalog"- buildtypes "github.com/getarcaneapp/arcane/types/v2/builds""github.com/getarcaneapp/arcane/types/v2/containerregistry"imagetypes "github.com/getarcaneapp/arcane/types/v2/image"projecttypes "github.com/getarcaneapp/arcane/types/v2/project"@@ -38,6 +37,7 @@ import ("github.com/opencontainers/go-digest""github.com/stretchr/testify/assert""github.com/stretchr/testify/require"+ buildtypes "go.getarcane.app/builds/types"libupdater "go.getarcane.app/updater/pkg/labels""gorm.io/gorm"@@ -60,11 +60,11 @@ type testBuildBuilder struct {err error}-func (b testBuildBuilder) BuildImage(_ context.Context, _ imagetypes.BuildRequest, _ io.Writer, _ string) (*imagetypes.BuildResult, error) {+func (b testBuildBuilder) BuildImage(_ context.Context, _ buildtypes.BuildRequest, _ io.Writer, _ string) (*buildtypes.BuildResult, error) {if b.err != nil {return nil, b.err}- return &imagetypes.BuildResult{Provider: "local"}, nil+ return &buildtypes.BuildResult{Provider: "local"}, nil}var _ buildtypes.Builder = testBuildBuilder{}diff --git a/backend/pkg/dockerutil/buildkit.go b/backend/pkg/dockerutil/buildkit.godeleted file mode 100644index 9e2f5c121..000000000--- a/backend/pkg/dockerutil/buildkit.go+++ /dev/null@@ -1,37 +0,0 @@-package docker--import (- "context"- "net"-- bkclient "github.com/moby/buildkit/client"- "github.com/moby/moby/client"-)--/*-This code is adapted from:-https://github.com/moby/moby/blob/v28.5.2/client/buildkit/buildkit.go--Original source: moby/moby-License: Apache-2.0 (https://github.com/moby/moby/blob/v28.5.2/LICENSE)--Changes for Arcane: package name and client import path adjusted.-*/--// ClientOpts returns a list of buildkit client options which allows the-// caller to create a buildkit client which will connect to the buildkit-// API provided by the daemon. These options can be passed to [bkclient.New].-//-// Example:-//-// bkclient.New(ctx, "", ClientOpts(c)...)-func ClientOpts(c client.HijackDialer) []bkclient.ClientOpt {- return []bkclient.ClientOpt{- bkclient.WithSessionDialer(func(ctx context.Context, proto string, meta map[string][]string) (net.Conn, error) {- return c.DialHijack(ctx, "/session", proto, meta)- }),- bkclient.WithContextDialer(func(ctx context.Context, _ string) (net.Conn, error) {- return c.DialHijack(ctx, "/grpc", "h2c", nil)- }),- }-}diff --git a/backend/pkg/libarcane/libbuild/build_context.go b/backend/pkg/libarcane/libbuild/build_context.godeleted file mode 100644index 556b0c075..000000000--- a/backend/pkg/libarcane/libbuild/build_context.go+++ /dev/null@@ -1,155 +0,0 @@-package libbuild--import (- "net/url"- "path"- "strings"-- "github.com/getarcaneapp/arcane/backend/v2/internal/common"-)--type GitBuildContextSource struct {- Raw string- RepositoryURL string- Ref string- Subdir string-}--func ParseGitBuildContextSource(raw string) (*GitBuildContextSource, bool, error) {- trimmed := strings.TrimSpace(raw)- if trimmed == "" {- return nil, false, nil- }-- repositoryURL, fragment, hasFragment := strings.Cut(trimmed, "#")- repositoryURL = strings.TrimSpace(repositoryURL)- if !IsSupportedGitRepositoryURL(repositoryURL) {- return nil, false, nil- }-- source := &GitBuildContextSource{- Raw: trimmed,- RepositoryURL: strings.TrimRight(repositoryURL, "/"),- }-- if !hasFragment {- return source, true, nil- }-- fragment = strings.TrimSpace(fragment)- if fragment == "" {- return nil, true, &common.GitBuildContextFragmentRequiredError{}- }-- ref, subdir, hasSubdir := strings.Cut(fragment, ":")- ref = strings.TrimSpace(ref)- if ref == "" {- return nil, true, &common.GitBuildContextRefRequiredError{}- }- source.Ref = ref-- if !hasSubdir {- return source, true, nil- }-- subdir = strings.TrimSpace(subdir)- if subdir == "" {- return nil, true, &common.GitBuildContextSubdirRequiredError{}- }- if strings.HasPrefix(subdir, "/") {- return nil, true, &common.GitBuildContextSubdirRelativeError{}- }-- cleanSubdir := path.Clean(subdir)- if cleanSubdir == "." || cleanSubdir == ".." || strings.HasPrefix(cleanSubdir, "../") {- return nil, true, &common.GitBuildContextSubdirEscapesRepositoryError{}- }-- source.Subdir = cleanSubdir- return source, true, nil-}--func NormalizeGitBuildContextSourceForMatch(raw string) string {- source, ok, err := ParseGitBuildContextSource(raw)- if err != nil || !ok || source == nil {- return ""- }- return normalizeGitRepositoryURLForMatch(source.RepositoryURL)-}--func IsPotentialRemoteBuildContextSource(raw string) bool {- trimmed := strings.TrimSpace(raw)- if trimmed == "" {- return false- }-- return IsSupportedGitRepositoryURL(trimmed)-}--func IsSupportedGitRepositoryURL(raw string) bool {- trimmed := strings.TrimSpace(raw)- if trimmed == "" {- return false- }-- if strings.HasPrefix(trimmed, "git@") {- return true- }-- parsed, err := url.Parse(trimmed)- if err != nil {- return false- }-- switch strings.ToLower(parsed.Scheme) {- case "git", "ssh":- return parsed.Host != "" && hasRepositoryPath(parsed.Path)- case "http", "https":- return parsed.Host != "" && hasRepositoryPath(parsed.Path)- default:- return false- }-}--func RequiresGitRemoteProbe(raw string) bool {- trimmed := strings.TrimSpace(raw)- if trimmed == "" || strings.HasPrefix(trimmed, "git@") {- return false- }-- parsed, err := url.Parse(trimmed)- if err != nil {- return false- }-- switch strings.ToLower(parsed.Scheme) {- case "http", "https":- return parsed.Host != "" && hasRepositoryPath(parsed.Path) && !strings.HasSuffix(strings.ToLower(strings.TrimRight(parsed.Path, "/")), ".git")- default:- return false- }-}--func hasRepositoryPath(rawPath string) bool {- trimmedPath := strings.TrimSpace(rawPath)- return trimmedPath != "" && trimmedPath != "/"-}--func normalizeGitRepositoryURLForMatch(raw string) string {- trimmed := strings.TrimRight(strings.TrimSpace(raw), "/")- if trimmed == "" {- return ""- }-- if strings.HasPrefix(trimmed, "git@") {- return strings.TrimSuffix(trimmed, ".git")- }-- parsed, err := url.Parse(trimmed)- if err != nil {- return strings.TrimSuffix(trimmed, ".git")- }-- parsed.Path = strings.TrimSuffix(strings.TrimRight(parsed.Path, "/"), ".git")- return parsed.String()-}diff --git a/backend/pkg/libarcane/libbuild/build_context_test.go b/backend/pkg/libarcane/libbuild/build_context_test.godeleted file mode 100644index 8dc79e983..000000000--- a/backend/pkg/libarcane/libbuild/build_context_test.go+++ /dev/null@@ -1,99 +0,0 @@-package libbuild--import (- "errors"- "testing"-- "github.com/getarcaneapp/arcane/backend/v2/internal/common"- "github.com/stretchr/testify/assert"- "github.com/stretchr/testify/require"-)--func TestParseGitBuildContextSource(t *testing.T) {- t.Run("plain repository url", func(t *testing.T) {- source, ok, err := ParseGitBuildContextSource("https://github.com/getarcaneapp/arcane.git")- require.NoError(t, err)- require.True(t, ok)- require.NotNil(t, source)- assert.Equal(t, "https://github.com/getarcaneapp/arcane.git", source.RepositoryURL)- assert.Empty(t, source.Ref)- assert.Empty(t, source.Subdir)- })-- t.Run("ref and subdir", func(t *testing.T) {- source, ok, err := ParseGitBuildContextSource("https://github.com/getarcaneapp/arcane.git#main:docker/app")- require.NoError(t, err)- require.True(t, ok)- require.NotNil(t, source)- assert.Equal(t, "main", source.Ref)- assert.Equal(t, "docker/app", source.Subdir)- })-- t.Run("ssh url", func(t *testing.T) {- source, ok, err := ParseGitBuildContextSource("[email protected]:getarcaneapp/arcane.git#dev")- require.NoError(t, err)- require.True(t, ok)- require.NotNil(t, source)- assert.Equal(t, "[email protected]:getarcaneapp/arcane.git", source.RepositoryURL)- assert.Equal(t, "dev", source.Ref)- })-- t.Run("forge style http url without git suffix", func(t *testing.T) {- source, ok, err := ParseGitBuildContextSource("https://git.sr.ht/~jordanreger/nws-alerts#main:docker/app")- require.NoError(t, err)- require.True(t, ok)- require.NotNil(t, source)- assert.Equal(t, "https://git.sr.ht/~jordanreger/nws-alerts", source.RepositoryURL)- assert.Equal(t, "main", source.Ref)- assert.Equal(t, "docker/app", source.Subdir)- })-- t.Run("non remote path is ignored", func(t *testing.T) {- source, ok, err := ParseGitBuildContextSource("./docker/app")- require.NoError(t, err)- assert.False(t, ok)- assert.Nil(t, source)- })-- t.Run("invalid subdir traversal is rejected", func(t *testing.T) {- source, ok, err := ParseGitBuildContextSource("https://github.com/getarcaneapp/arcane.git#main:../secrets")- require.Error(t, err)- assert.True(t, ok)- assert.Nil(t, source)- })-- t.Run("invalid fragment returns common typed error", func(t *testing.T) {- source, ok, err := ParseGitBuildContextSource("https://github.com/getarcaneapp/arcane.git#")- require.Error(t, err)- assert.True(t, ok)- assert.Nil(t, source)-- var typedErr *common.GitBuildContextFragmentRequiredError- assert.True(t, errors.As(err, &typedErr))- })-}--func TestNormalizeGitBuildContextSourceForMatch(t *testing.T) {- assert.Equal(- t,- "https://github.com/getarcaneapp/arcane",- NormalizeGitBuildContextSourceForMatch("https://github.com/getarcaneapp/arcane.git#main"),- )- assert.Equal(- t,- "https://github.com/getarcaneapp/arcane",- NormalizeGitBuildContextSourceForMatch("https://github.com/getarcaneapp/arcane/"),- )- assert.Equal(- t,- "[email protected]:getarcaneapp/arcane",- NormalizeGitBuildContextSourceForMatch("[email protected]:getarcaneapp/arcane.git#dev"),- )-}--func TestRequiresGitRemoteProbe(t *testing.T) {- assert.True(t, RequiresGitRemoteProbe("https://git.sr.ht/~jordanreger/nws-alerts"))- assert.False(t, RequiresGitRemoteProbe("https://github.com/getarcaneapp/arcane.git"))- assert.False(t, RequiresGitRemoteProbe("[email protected]:getarcaneapp/arcane.git"))- assert.False(t, RequiresGitRemoteProbe("ssh://[email protected]/getarcaneapp/arcane.git"))-}diff --git a/backend/pkg/libarcane/libbuild/build_provider.go b/backend/pkg/libarcane/libbuild/build_provider.godeleted file mode 100644index cbd8688f5..000000000--- a/backend/pkg/libarcane/libbuild/build_provider.go+++ /dev/null@@ -1,103 +0,0 @@-package libbuild--import (- "context"- "errors"- "fmt"- "runtime"- "strings"- "time"-- depotbuild "github.com/depot/depot-go/build"- depotmachine "github.com/depot/depot-go/machine"- cliv1 "github.com/depot/depot-go/proto/depot/cli/v1"- "github.com/getarcaneapp/arcane/backend/v2/internal/common"- buildtypes "github.com/getarcaneapp/arcane/types/v2/builds"- "github.com/getarcaneapp/arcane/types/v2/image"- "github.com/moby/buildkit/client"-)--type buildSession struct {- Client *client.Client- Close func(buildErr error) error-}--type buildProvider interface {- Name() string- NewSession(ctx context.Context, req image.BuildRequest) (*buildSession, error)-}--type depotBuildKitProvider struct {- settings buildtypes.SettingsProvider-}--func newDepotBuildKitProviderInternal(settings buildtypes.SettingsProvider) *depotBuildKitProvider {- return &depotBuildKitProvider{settings: settings}-}--func (p *depotBuildKitProvider) Name() string {- return "depot"-}--func (p *depotBuildKitProvider) NewSession(ctx context.Context, req image.BuildRequest) (*buildSession, error) {- if p.settings == nil {- return nil, &common.BuildSettingsProviderUnavailableError{}- }-- settings := p.settings.BuildSettings()- projectID := strings.TrimSpace(settings.DepotProjectId)- token := strings.TrimSpace(settings.DepotToken)- if projectID == "" || token == "" {- return nil, &common.DepotProjectCredentialsRequiredError{}- }-- buildReq := &cliv1.CreateBuildRequest{ProjectId: projectID}- build, err := depotbuild.NewBuild(ctx, buildReq, token)- if err != nil {- return nil, fmt.Errorf("failed to initialize Depot build: %w", err)- }-- arch := selectDepotArchInternal(req.Platforms)- machine, err := depotmachine.Acquire(ctx, build.ID, build.Token, arch)- if err != nil {- build.Finish(err)- return nil, fmt.Errorf("failed to acquire Depot BuildKit machine: %w", err)- }-- connectCtx, cancel := context.WithTimeout(ctx, 5*time.Minute)- defer cancel()-- bk, err := machine.Connect(connectCtx)- if err != nil {- _ = machine.Release()- build.Finish(err)- return nil, fmt.Errorf("failed to connect to Depot BuildKit: %w", err)- }-- return &buildSession{- Client: bk,- Close: func(buildErr error) error {- build.Finish(buildErr)- releaseErr := machine.Release()- closeErr := bk.Close()- return errors.Join(releaseErr, closeErr)- },- }, nil-}--func selectDepotArchInternal(platforms []string) string {- for _, platform := range platforms {- p := strings.ToLower(strings.TrimSpace(platform))- switch {- case strings.Contains(p, "arm64"):- return "arm64"- case strings.Contains(p, "amd64"):- return "amd64"- }- }-- if runtime.GOARCH == "arm64" {- return "arm64"- }- return "amd64"-}diff --git a/backend/pkg/libarcane/libbuild/builder.go b/backend/pkg/libarcane/libbuild/builder.godeleted file mode 100644index 8d2af007f..000000000--- a/backend/pkg/libarcane/libbuild/builder.go+++ /dev/null@@ -1,3 +0,0 @@-package libbuild--// This file intentionally left minimal after splitting builder logic across multiple files.diff --git a/backend/pkg/libarcane/libbuild/builder_buildkit.go b/backend/pkg/libarcane/libbuild/builder_buildkit.godeleted file mode 100644index 7a24985ad..000000000--- a/backend/pkg/libarcane/libbuild/builder_buildkit.go+++ /dev/null@@ -1,274 +0,0 @@-package libbuild--import (- "context"- "fmt"- "io"- "path/filepath"- "strings"-- "github.com/getarcaneapp/arcane/backend/v2/internal/common"- dockerutils "github.com/getarcaneapp/arcane/backend/v2/pkg/dockerutil"- imagetypes "github.com/getarcaneapp/arcane/types/v2/image"- buildkit "github.com/moby/buildkit/client"- "github.com/tonistiigi/fsutil"-)--func parseBuildkitCacheEntriesInternal(values []string) []buildkit.CacheOptionsEntry {- entries := make([]buildkit.CacheOptionsEntry, 0, len(values))-- for _, raw := range values {- raw = strings.TrimSpace(raw)- if raw == "" {- continue- }-- if !strings.Contains(raw, "type=") {- entries = append(entries, buildkit.CacheOptionsEntry{- Type: "registry",- Attrs: map[string]string{"ref": raw},- })- continue- }-- entry := buildkit.CacheOptionsEntry{Attrs: map[string]string{}}- for segment := range strings.SplitSeq(raw, ",") {- segment = strings.TrimSpace(segment)- if segment == "" {- continue- }-- parts := strings.SplitN(segment, "=", 2)- if len(parts) != 2 {- continue- }-- key := strings.TrimSpace(parts[0])- value := strings.TrimSpace(parts[1])- if key == "" || value == "" {- continue- }-- if key == "type" {- entry.Type = value- continue- }-- entry.Attrs[key] = value- }-- if entry.Type == "" {- entry.Type = "registry"- }- entries = append(entries, entry)- }-- if len(entries) == 0 {- return nil- }-- return entries-}--func normalizeEntitlementsInternal(entitlements []string, privileged bool) []string {- seen := map[string]struct{}{}- out := make([]string, 0, len(entitlements)+1)-- appendEntitlement := func(value string) {- value = strings.TrimSpace(value)- if value == "" {- return- }- if _, ok := seen[value]; ok {- return- }- seen[value] = struct{}{}- out = append(out, value)- }-- for _, entitlement := range entitlements {- appendEntitlement(entitlement)- }- if privileged {- appendEntitlement("security.insecure")- }-- if len(out) == 0 {- return nil- }-- return out-}--func (b *builder) buildSolveOptInternal(ctx context.Context, req imagetypes.BuildRequest, providerName string) (buildkit.SolveOpt, <-chan error, func(), error) {- fsInput, err := prepareBuildFilesystemInputInternal(req)- if err != nil {- return buildkit.SolveOpt{}, nil, nil, err- }-- contextDir, dockerfilePath, cleanup, err := prepareBuildContextInternal(fsInput)- if err != nil {- return buildkit.SolveOpt{}, nil, nil, err- }-- dockerfileDir := contextDir- dockerfileFilename := dockerfilePath- if dockerfileRelDir := filepath.Dir(filepath.FromSlash(dockerfilePath)); dockerfileRelDir != "." {- dockerfileDir = filepath.Join(contextDir, dockerfileRelDir)- dockerfileFilename = filepath.Base(dockerfilePath)- }-- frontendAttrs := map[string]string{- "filename": dockerfileFilename,- }- if strings.TrimSpace(req.Target) != "" {- frontendAttrs["target"] = strings.TrimSpace(req.Target)- }- if req.NoCache {- frontendAttrs["no-cache"] = ""- }- if req.Pull {- frontendAttrs["image-resolve-mode"] = "pull"- }- if len(req.Platforms) > 0 {- frontendAttrs["platform"] = strings.Join(req.Platforms, ",")- }- for key, val := range req.BuildArgs {- frontendAttrs["build-arg:"+key] = val- }- for key, val := range req.Labels {- k := strings.TrimSpace(key)- if k == "" {- continue- }- frontendAttrs["label:"+k] = val- }-- contextMount, err := fsutil.NewFS(contextDir)- if err != nil {- cleanup()- return buildkit.SolveOpt{}, nil, nil, fmt.Errorf("failed to prepare build context mount: %w", err)- }- dockerfileMount, err := fsutil.NewFS(dockerfileDir)- if err != nil {- cleanup()- return buildkit.SolveOpt{}, nil, nil, fmt.Errorf("failed to prepare Dockerfile mount: %w", err)- }-- solveOpt := buildkit.SolveOpt{- Frontend: "dockerfile.v0",- FrontendAttrs: frontendAttrs,- LocalMounts: map[string]fsutil.FS{- "context": contextMount,- "dockerfile": dockerfileMount,- },- CacheImports: parseBuildkitCacheEntriesInternal(req.CacheFrom),- CacheExports: parseBuildkitCacheEntriesInternal(req.CacheTo),- AllowedEntitlements: normalizeEntitlementsInternal(req.Entitlements, req.Privileged),- }-- var loadErrCh chan error- exports := make([]buildkit.ExportEntry, 0, 2)- if req.Push && providerName != "local" {- exports = append(exports, buildkit.ExportEntry{- Type: "image",- Attrs: map[string]string{- "name": strings.Join(req.Tags, ","),- "push": "true",- "oci-mediatypes": "true",- },- })- }-- if providerName == "local" && (req.Load || req.Push) {- exports = append(exports, buildkit.ExportEntry{- Type: "moby",- Attrs: map[string]string{"name": strings.Join(req.Tags, ",")},- })- } else if req.Load {- exportEntry, errCh, err := b.buildLoadExportInternal(ctx, req.Tags)- if err != nil {- cleanup()- return buildkit.SolveOpt{}, nil, nil, err- }- loadErrCh = errCh- exports = append(exports, exportEntry)- }-- if len(exports) > 0 {- solveOpt.Exports = exports- }-- return solveOpt, loadErrCh, cleanup, nil-}--func (b *builder) buildLoadExportInternal(ctx context.Context, tags []string) (buildkit.ExportEntry, chan error, error) {- if b.dockerClientProvider == nil {- return buildkit.ExportEntry{}, nil, &common.BuildDockerServiceUnavailableError{}- }-- dockerClient, err := b.dockerClientProvider.GetClient(ctx)- if err != nil {- return buildkit.ExportEntry{}, nil, fmt.Errorf("failed to connect to Docker: %w", err)- }-- pr, pw := io.Pipe()- loadErrCh := make(chan error, 1)- go func() {- defer pr.Close()- loadResp, loadErr := dockerClient.ImageLoad(ctx, pr)- if loadErr != nil {- loadErrCh <- loadErr- return- }- defer func() { _ = loadResp.Close() }()- loadErrCh <- dockerutils.ConsumeJSONMessageStream(loadResp, nil)- }()-- exportAttrs := map[string]string{}- if len(tags) > 0 {- exportAttrs["name"] = strings.Join(tags, ",")- }-- return buildkit.ExportEntry{- Type: "docker",- Attrs: exportAttrs,- Output: func(_ map[string]string) (io.WriteCloser, error) {- return pw, nil- },- }, loadErrCh, nil-}--func streamSolveStatusInternal(ctx context.Context, ch <-chan *buildkit.SolveStatus, w io.Writer, serviceName string) error {- for {- select {- case <-ctx.Done():- return ctx.Err()- case status, ok := <-ch:- if !ok {- return nil- }- if status == nil {- continue- }- for _, s := range status.Statuses {- if s == nil {- continue- }- event := imagetypes.ProgressEvent{- Type: "build",- Service: serviceName,- ID: s.ID,- Status: s.Name,- }- if s.Current > 0 || s.Total > 0 {- event.ProgressDetail = &imagetypes.ProgressDetail{- Current: s.Current,- Total: s.Total,- }- }- writeProgressEventInternal(w, event)- }- }- }-}diff --git a/backend/pkg/libarcane/libbuild/builder_buildkit_local.go b/backend/pkg/libarcane/libbuild/builder_buildkit_local.godeleted file mode 100644index 18c30697b..000000000--- a/backend/pkg/libarcane/libbuild/builder_buildkit_local.go+++ /dev/null@@ -1,103 +0,0 @@-package libbuild--import (- "bufio"- "context"- "fmt"- "os"- "strings"- "time"-- "github.com/getarcaneapp/arcane/backend/v2/internal/common"- docker "github.com/getarcaneapp/arcane/backend/v2/pkg/dockerutil"- imagetypes "github.com/getarcaneapp/arcane/types/v2/image"- buildkitclient "github.com/moby/buildkit/client"-)--func (b *builder) newLocalBuildkitSessionInternal(ctx context.Context) (*buildSession, error) {- if b.dockerClientProvider == nil {- return nil, &common.BuildDockerServiceUnavailableError{}- }-- dockerClient, err := b.dockerClientProvider.GetClient(ctx)- if err != nil {- return nil, fmt.Errorf("failed to connect to Docker: %w", err)- }-- bk, err := buildkitclient.New(ctx, "", docker.ClientOpts(dockerClient)...)- if err != nil {- return nil, fmt.Errorf("failed to connect to Docker BuildKit: %w", err)- }-- waitCtx, cancel := context.WithTimeout(ctx, 30*time.Second)- defer cancel()- if err := bk.Wait(waitCtx); err != nil {- _ = bk.Close()- return nil, fmt.Errorf("failed to wait for Docker BuildKit: %w", err)- }-- return &buildSession{- Client: bk,- Close: func(_ error) error {- return bk.Close()- },- }, nil-}--func requiresLocalBuildkitInternal(req imagetypes.BuildRequest) (bool, error) {- fsInput, err := prepareBuildFilesystemInputInternal(req)- if err != nil {- return false, err- }-- contents, err := readDockerfileContentsInternal(fsInput)- if err != nil {- return false, err- }-- return dockerfileRequiresBuildkitInternal(contents), nil-}--func readDockerfileContentsInternal(input buildFilesystemInput) (string, error) {- if input.dockerfileInline != "" {- return input.dockerfileInline, nil- }-- raw, err := os.ReadFile(input.fullDockerfilePath)- if err != nil {- return "", fmt.Errorf("failed to read Dockerfile: %w", err)- }-- return string(raw), nil-}--func dockerfileRequiresBuildkitInternal(contents string) bool {- scanner := bufio.NewScanner(strings.NewReader(contents))- for scanner.Scan() {- line := strings.TrimSpace(scanner.Text())- if line == "" {- continue- }-- lower := strings.ToLower(line)- if strings.HasPrefix(lower, "# syntax=") {- return true- }-- if strings.HasPrefix(lower, "#") {- continue- }-- if strings.HasPrefix(lower, "run ") {- if strings.Contains(lower, "--mount=") || strings.Contains(lower, "--network=") || strings.Contains(lower, "--security=") {- return true- }- }-- if (strings.HasPrefix(lower, "copy ") || strings.HasPrefix(lower, "add ")) && strings.Contains(lower, "--link") {- return true- }- }-- return false-}diff --git a/backend/pkg/libarcane/libbuild/builder_buildkit_local_test.go b/backend/pkg/libarcane/libbuild/builder_buildkit_local_test.godeleted file mode 100644index 5d57c1cad..000000000--- a/backend/pkg/libarcane/libbuild/builder_buildkit_local_test.go+++ /dev/null@@ -1,46 +0,0 @@-package libbuild--import (- "os"- "path/filepath"- "testing"-- imagetypes "github.com/getarcaneapp/arcane/types/v2/image"- "github.com/stretchr/testify/assert"- "github.com/stretchr/testify/require"-)--func TestDockerfileRequiresBuildkitInternal(t *testing.T) {- t.Run("syntax directive enables buildkit", func(t *testing.T) {- assert.True(t, dockerfileRequiresBuildkitInternal("# syntax=docker/dockerfile:1.7\nFROM alpine:3.20\n"))- })-- t.Run("run mount enables buildkit", func(t *testing.T) {- assert.True(t, dockerfileRequiresBuildkitInternal("FROM oven/bun:alpine\nRUN --mount=type=cache,target=/root/.bun bun install\n"))- })-- t.Run("plain dockerfile stays on classic docker", func(t *testing.T) {- assert.False(t, dockerfileRequiresBuildkitInternal("FROM alpine:3.20\nRUN echo hello\n"))- })-}--func TestRequiresLocalBuildkitInternal_ReadsRequestedDockerfile(t *testing.T) {- contextDir := t.TempDir()- require.NoError(t, os.WriteFile(filepath.Join(contextDir, "Dockerfile.custom"), []byte("FROM alpine:3.20\nRUN --mount=type=cache,target=/tmp/cache echo hi\n"), 0o644))-- required, err := requiresLocalBuildkitInternal(imagetypes.BuildRequest{- ContextDir: contextDir,- Dockerfile: "Dockerfile.custom",- })- require.NoError(t, err)- assert.True(t, required)-}--func TestRequiresLocalBuildkitInternal_UsesInlineDockerfile(t *testing.T) {- required, err := requiresLocalBuildkitInternal(imagetypes.BuildRequest{- ContextDir: t.TempDir(),- DockerfileInline: "FROM alpine:3.20\nRUN --mount=type=cache,target=/tmp/cache echo hi\n",- })- require.NoError(t, err)- assert.True(t, required)-}diff --git a/backend/pkg/libarcane/libbuild/builder_buildkit_test.go b/backend/pkg/libarcane/libbuild/builder_buildkit_test.godeleted file mode 100644index b9e64dcd3..000000000--- a/backend/pkg/libarcane/libbuild/builder_buildkit_test.go+++ /dev/null@@ -1,149 +0,0 @@-package libbuild--import (- "context"- "io"- "net/http"- "net/http/httptest"- "os"- "path/filepath"- "testing"-- imagetypes "github.com/getarcaneapp/arcane/types/v2/image"- moby "github.com/moby/moby/client"- "github.com/stretchr/testify/assert"- "github.com/stretchr/testify/require"-)--func TestBuildSolveOptInternal_StagesInlineDockerfile(t *testing.T) {- contextDir := t.TempDir()- require.NoError(t, os.WriteFile(filepath.Join(contextDir, "app.txt"), []byte("hello\n"), 0o644))-- b := &builder{}- req := imagetypes.BuildRequest{- ContextDir: contextDir,- DockerfileInline: "FROM alpine:3.20\nCOPY app.txt /app.txt\n",- BuildArgs: map[string]string{- "FOO": "bar",- },- }-- solveOpt, loadErrCh, cleanup, err := b.buildSolveOptInternal(context.Background(), req, "local")- require.NoError(t, err)- defer cleanup()- assert.Nil(t, loadErrCh)- assert.Equal(t, ".arcane.inline.Dockerfile", solveOpt.FrontendAttrs["filename"])-- contextMount, ok := solveOpt.LocalMounts["context"]- require.True(t, ok)- dockerfileMount, ok := solveOpt.LocalMounts["dockerfile"]- require.True(t, ok)-- dockerfile, err := dockerfileMount.Open(solveOpt.FrontendAttrs["filename"])- require.NoError(t, err)- contents, err := io.ReadAll(dockerfile)- require.NoError(t, dockerfile.Close())- require.NoError(t, err)- assert.Equal(t, "FROM alpine:3.20\nCOPY app.txt /app.txt\n", string(contents))-- appFile, err := contextMount.Open("app.txt")- require.NoError(t, err)- appContents, err := io.ReadAll(appFile)- require.NoError(t, appFile.Close())- require.NoError(t, err)- assert.Equal(t, "hello\n", string(appContents))-}--func TestBuildSolveOptInternal_LocalLoadUsesMobyExporter(t *testing.T) {- contextDir := createBuildkitTestContext(t)- b := &builder{}-- solveOpt, loadErrCh, cleanup, err := b.buildSolveOptInternal(context.Background(), imagetypes.BuildRequest{- ContextDir: contextDir,- Dockerfile: "Dockerfile",- Tags: []string{"arcane.local/app:test"},- Load: true,- }, "local")- require.NoError(t, err)- defer cleanup()-- require.Nil(t, loadErrCh)- require.Len(t, solveOpt.Exports, 1)- assert.Equal(t, "moby", solveOpt.Exports[0].Type)- assert.Equal(t, "arcane.local/app:test", solveOpt.Exports[0].Attrs["name"])- assert.NotContains(t, solveOpt.Exports[0].Attrs, "push")- assert.Nil(t, solveOpt.Exports[0].Output)-}--func TestBuildSolveOptInternal_LocalPushAndLoadUsesSingleMobyExporter(t *testing.T) {- contextDir := createBuildkitTestContext(t)- b := &builder{}-- solveOpt, loadErrCh, cleanup, err := b.buildSolveOptInternal(context.Background(), imagetypes.BuildRequest{- ContextDir: contextDir,- Dockerfile: "Dockerfile",- Tags: []string{"registry.example.com/app:test"},- Push: true,- Load: true,- }, "local")- require.NoError(t, err)- defer cleanup()-- require.Nil(t, loadErrCh)- require.Len(t, solveOpt.Exports, 1)- assert.Equal(t, "moby", solveOpt.Exports[0].Type)- assert.Equal(t, "registry.example.com/app:test", solveOpt.Exports[0].Attrs["name"])- assert.NotContains(t, solveOpt.Exports[0].Attrs, "push")-}--func TestBuildSolveOptInternal_NonLocalLoadKeepsDockerExporter(t *testing.T) {- contextDir := createBuildkitTestContext(t)- server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {- if r.URL.Path != "/v1.54/images/load" {- http.NotFound(w, r)- return- }- _, _ = io.Copy(io.Discard, r.Body)- _ = r.Body.Close()- _, _ = w.Write([]byte("{}\n"))- }))- defer server.Close()-- client, err := moby.NewClientWithOpts(moby.WithHost(server.URL), moby.WithVersion("1.54"))- require.NoError(t, err)-- b := &builder{dockerClientProvider: testDockerClientProvider{client: client}}- solveOpt, loadErrCh, cleanup, err := b.buildSolveOptInternal(context.Background(), imagetypes.BuildRequest{- ContextDir: contextDir,- Dockerfile: "Dockerfile",- Tags: []string{"arcane.local/app:test"},- Load: true,- }, "depot")- require.NoError(t, err)- defer cleanup()-- require.NotNil(t, loadErrCh)- require.Len(t, solveOpt.Exports, 1)- assert.Equal(t, "docker", solveOpt.Exports[0].Type)- require.NotNil(t, solveOpt.Exports[0].Output)-- output, err := solveOpt.Exports[0].Output(nil)- require.NoError(t, err)- require.NoError(t, output.Close())- require.NoError(t, <-loadErrCh)-}--func createBuildkitTestContext(t *testing.T) string {- t.Helper()- contextDir := t.TempDir()- require.NoError(t, os.WriteFile(filepath.Join(contextDir, "Dockerfile"), []byte("FROM alpine:3.20\n"), 0o644))- return contextDir-}--type testDockerClientProvider struct {- client *moby.Client-}--func (p testDockerClientProvider) GetClient(context.Context) (*moby.Client, error) {- return p.client, nil-}diff --git a/backend/pkg/libarcane/libbuild/builder_core.go b/backend/pkg/libarcane/libbuild/builder_core.godeleted file mode 100644index ca09a0ab4..000000000--- a/backend/pkg/libarcane/libbuild/builder_core.go+++ /dev/null@@ -1,293 +0,0 @@-package libbuild--import (- "context"- "errors"- "fmt"- "io"- "log/slog"- "os"- "strings"-- "github.com/docker/cli/cli/config"- configtypes "github.com/docker/cli/cli/config/types"- "github.com/getarcaneapp/arcane/backend/v2/internal/common"- utilsregistry "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/registryauth"- "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/timeouts"- buildtypes "github.com/getarcaneapp/arcane/types/v2/builds"- imagetypes "github.com/getarcaneapp/arcane/types/v2/image"- buildkit "github.com/moby/buildkit/client"- "github.com/moby/buildkit/session/auth/authprovider"-)--type builder struct {- settings buildtypes.SettingsProvider- dockerClientProvider buildtypes.DockerClientProvider- registryAuthProvider buildtypes.RegistryAuthProvider- providers map[string]any-}--func NewBuilder(settings buildtypes.SettingsProvider, dockerClientProvider buildtypes.DockerClientProvider, registryAuthProvider buildtypes.RegistryAuthProvider) buildtypes.Builder {- providers := map[string]any{- "depot": newDepotBuildKitProviderInternal(settings),- }-- return &builder{- settings: settings,- dockerClientProvider: dockerClientProvider,- registryAuthProvider: registryAuthProvider,- providers: providers,- }-}--func (b *builder) BuildImage(ctx context.Context, req imagetypes.BuildRequest, progressWriter io.Writer, serviceName string) (*imagetypes.BuildResult, error) {- if b.settings == nil {- return nil, &common.BuildSettingsProviderUnavailableError{}- }-- if strings.TrimSpace(req.ContextDir) == "" {- return nil, &common.BuildContextDirRequiredError{}- }-- settings := b.settings.BuildSettings()- providerName, provider, err := b.resolveProviderInternal(req.Provider, settings.BuildProvider)- if err != nil {- return nil, err- }-- buildCtx, cancel := timeouts.WithTimeout(ctx, settings.BuildTimeoutSecs, timeouts.DefaultBuildTimeout)- defer cancel()-- req = normalizeBuildRequestInternal(req, providerName)- req.Tags = normalizeTagsInternal(req.Tags)-- if err := validateBuildRequestInternal(req, providerName); err != nil {- return nil, err- }-- if providerName == "local" {- requiresBuildkit, err := requiresLocalBuildkitInternal(req)- if err != nil {- return nil, err- }- if requiresBuildkit {- session, err := b.newLocalBuildkitSessionInternal(buildCtx)- if err != nil {- return nil, err- }- return b.buildWithBuildkitSessionInternal(buildCtx, req, progressWriter, serviceName, providerName, session)- }- return b.buildWithDockerInternal(buildCtx, req, progressWriter, serviceName)- }-- if provider == nil {- return nil, &common.BuildProviderUnavailableError{}- }-- session, err := provider.NewSession(buildCtx, req)- if err != nil {- return nil, err- }-- return b.buildWithBuildkitSessionInternal(buildCtx, req, progressWriter, serviceName, providerName, session)-}--func (b *builder) buildWithBuildkitSessionInternal(- ctx context.Context,- req imagetypes.BuildRequest,- progressWriter io.Writer,- serviceName string,- providerName string,- session *buildSession,-) (*imagetypes.BuildResult, error) {- if session == nil || session.Client == nil {- return nil, &common.BuildSessionUnavailableError{}- }-- var buildErr error- defer func() {- if cerr := session.Close(buildErr); cerr != nil {- slog.WarnContext(ctx, "build session close error", "provider", providerName, "error", cerr)- }- }()-- solveOpt, loadErrCh, cleanupSolveOpt, err := b.buildSolveOptInternal(ctx, req, providerName)- if err != nil {- buildErr = err- return nil, err- }- defer cleanupSolveOpt()-- authProvider := authprovider.NewDockerAuthProvider(authprovider.DockerAuthProviderConfig{- AuthConfigProvider: buildkitAuthConfigProviderInternal(authprovider.LoadAuthConfig(config.LoadDefaultConfigFile(os.Stderr)), b.registryAuthProvider),- })- solveOpt.Session = append(solveOpt.Session, authProvider)-- statusCh := make(chan *buildkit.SolveStatus, 16)- streamErrCh := make(chan error, 1)- go func() {- streamErrCh <- streamSolveStatusInternal(ctx, statusCh, progressWriter, serviceName)- }()-- writeProgressEventInternal(progressWriter, imagetypes.ProgressEvent{- Type: "build",- Phase: "begin",- Service: serviceName,- Status: "build started",- })-- resp, err := session.Client.Solve(ctx, nil, solveOpt, statusCh)-- if err != nil {- err = wrapBuildkitSolveErrorInternal(err, providerName)- buildErr = err- writeProgressEventInternal(progressWriter, imagetypes.ProgressEvent{- Type: "build",- Service: serviceName,- Error: err.Error(),- })- return nil, err- }-- if streamErr := <-streamErrCh; streamErr != nil && !errors.Is(streamErr, context.Canceled) {- slog.WarnContext(ctx, "build progress stream error", "provider", providerName, "error", streamErr)- }-- if loadErrCh != nil {- if loadErr := <-loadErrCh; loadErr != nil {- buildErr = loadErr- writeProgressEventInternal(progressWriter, imagetypes.ProgressEvent{- Type: "build",- Service: serviceName,- Error: loadErr.Error(),- })- return nil, loadErr- }- }-- if providerName == "local" && req.Push {- if b.dockerClientProvider == nil {- missingClientErr := &common.BuildDockerServiceUnavailableError{}- buildErr = missingClientErr- writeProgressEventInternal(progressWriter, imagetypes.ProgressEvent{- Type: "build",- Service: serviceName,- Error: missingClientErr.Error(),- })- return nil, missingClientErr- }-- dockerClient, dockerClientErr := b.dockerClientProvider.GetClient(ctx)- if dockerClientErr != nil {- buildErr = dockerClientErr- writeProgressEventInternal(progressWriter, imagetypes.ProgressEvent{- Type: "build",- Service: serviceName,- Error: dockerClientErr.Error(),- })- return nil, dockerClientErr- }- if pushErr := b.pushDockerImagesInternal(ctx, dockerClient, req.Tags, progressWriter, serviceName); pushErr != nil {- buildErr = pushErr- writeProgressEventInternal(progressWriter, imagetypes.ProgressEvent{- Type: "build",- Service: serviceName,- Error: pushErr.Error(),- })- return nil, pushErr- }- }-- writeProgressEventInternal(progressWriter, imagetypes.ProgressEvent{- Type: "build",- Phase: "complete",- Service: serviceName,- Status: "build complete",- })-- digest := ""- if resp != nil {- if v, ok := resp.ExporterResponse["containerimage.digest"]; ok {- digest = v- }- }-- return &imagetypes.BuildResult{- Provider: providerName,- Tags: req.Tags,- Digest: digest,- }, nil-}--func wrapBuildkitSolveErrorInternal(err error, providerName string) error {- if err == nil {- return nil- }-- if strings.Contains(err.Error(), `exporter "docker" could not be found`) {- return &common.BuildKitDockerExporterError{ProviderName: providerName, Err: err}- }-- if strings.Contains(err.Error(), `exporter "image" could not be found`) {- return &common.BuildKitImageExporterError{ProviderName: providerName, Err: err}- }-- return err-}--func buildkitAuthConfigProviderInternal(defaultProvider authprovider.AuthConfigProvider, registryAuthProvider buildtypes.RegistryAuthProvider) authprovider.AuthConfigProvider {- return func(ctx context.Context, host string, scope []string, cacheCheck authprovider.ExpireCachedAuthCheck) (configtypes.AuthConfig, error) {- if registryAuthProvider != nil {- authHeader, err := registryAuthProvider.GetRegistryAuthForHost(ctx, host)- if err != nil {- slog.WarnContext(ctx, "failed to resolve build registry auth from database, falling back to docker config", "registry", host, "error", err)- } else if strings.TrimSpace(authHeader) != "" {- decodedCfg, decodeErr := utilsregistry.DecodeAuthHeader(authHeader)- if decodeErr != nil {- slog.WarnContext(ctx, "failed to decode build registry auth header, falling back to docker config", "registry", host, "error", decodeErr)- } else {- authConfig := configtypes.AuthConfig{- Username: decodedCfg.Username,- Password: decodedCfg.Password,- Auth: decodedCfg.Auth,- ServerAddress: decodedCfg.ServerAddress,- IdentityToken: decodedCfg.IdentityToken,- RegistryToken: decodedCfg.RegistryToken,- }- if strings.TrimSpace(authConfig.ServerAddress) == "" {- authConfig.ServerAddress = host- }- return authConfig, nil- }- }- }-- if defaultProvider == nil {- return configtypes.AuthConfig{}, nil- }-- return defaultProvider(ctx, host, scope, cacheCheck)- }-}--func (b *builder) resolveProviderInternal(override string, defaultProvider string) (string, buildProvider, error) {- providerName := strings.ToLower(strings.TrimSpace(override))- if providerName == "" {- providerName = strings.ToLower(strings.TrimSpace(defaultProvider))- }- if providerName == "" {- providerName = "local"- }- if providerName == "local" {- return providerName, nil, nil- }- providerRaw, ok := b.providers[providerName]- if !ok {- return "", nil, fmt.Errorf("unknown build provider: %s", providerName)- }- provider, ok := providerRaw.(buildProvider)- if !ok || provider == nil {- return "", nil, fmt.Errorf("invalid build provider: %s", providerName)- }- return providerName, provider, nil-}diff --git a/backend/pkg/libarcane/libbuild/builder_core_test.go b/backend/pkg/libarcane/libbuild/builder_core_test.godeleted file mode 100644index c29ac10a1..000000000--- a/backend/pkg/libarcane/libbuild/builder_core_test.go+++ /dev/null@@ -1,127 +0,0 @@-package libbuild--import (- "context"- "errors"- "testing"-- configtypes "github.com/docker/cli/cli/config/types"- utilsregistry "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/registryauth"- "github.com/moby/buildkit/session/auth/authprovider"- dockerregistry "github.com/moby/moby/api/types/registry"- "github.com/stretchr/testify/assert"- "github.com/stretchr/testify/require"-)--type fakeRegistryAuthProvider struct {- hostAuth map[string]string- hostErr error-}--func (f fakeRegistryAuthProvider) GetRegistryAuthForImage(_ context.Context, _ string) (string, error) {- return "", nil-}--func (f fakeRegistryAuthProvider) GetRegistryAuthForHost(_ context.Context, host string) (string, error) {- if f.hostErr != nil {- return "", f.hostErr- }- return f.hostAuth[host], nil-}--func (f fakeRegistryAuthProvider) GetAllRegistryAuthConfigs(_ context.Context) (map[string]dockerregistry.AuthConfig, error) {- return nil, nil-}--func encodeAuthConfigInternal(t *testing.T, cfg configtypes.AuthConfig) string {- t.Helper()-- raw, err := utilsregistry.EncodeAuthHeader(cfg.Username, cfg.Password, cfg.ServerAddress)- require.NoError(t, err)- return raw-}--func TestBuildkitAuthConfigProvider_UsesRegistryAuthProviderForHost(t *testing.T) {- registryCfg := configtypes.AuthConfig{- Username: "db-user",- Password: "db-token",- ServerAddress: "ghcr.io",- }-- provider := buildkitAuthConfigProviderInternal(- func(_ context.Context, _ string, _ []string, _ authprovider.ExpireCachedAuthCheck) (configtypes.AuthConfig, error) {- return configtypes.AuthConfig{Username: "default"}, nil- },- fakeRegistryAuthProvider{hostAuth: map[string]string{"ghcr.io": encodeAuthConfigInternal(t, registryCfg)}},- )-- cfg, err := provider(context.Background(), "ghcr.io", nil, nil)- require.NoError(t, err)- assert.Equal(t, "db-user", cfg.Username)- assert.Equal(t, "db-token", cfg.Password)- assert.Equal(t, "ghcr.io", cfg.ServerAddress)-}--func TestBuildkitAuthConfigProvider_FallsBackToDefaultProvider(t *testing.T) {- defaultCalled := false- defaultCfg := configtypes.AuthConfig{Username: "default-user", Password: "default-token", ServerAddress: "docker.io"}-- t.Run("registry provider error", func(t *testing.T) {- defaultCalled = false- provider := buildkitAuthConfigProviderInternal(- func(_ context.Context, _ string, _ []string, _ authprovider.ExpireCachedAuthCheck) (configtypes.AuthConfig, error) {- defaultCalled = true- return defaultCfg, nil- },- fakeRegistryAuthProvider{hostErr: errors.New("db unavailable")},- )-- cfg, err := provider(context.Background(), "docker.io", nil, nil)- require.NoError(t, err)- assert.True(t, defaultCalled)- assert.Equal(t, defaultCfg, cfg)- })-- t.Run("registry provider invalid auth header", func(t *testing.T) {- defaultCalled = false- provider := buildkitAuthConfigProviderInternal(- func(_ context.Context, _ string, _ []string, _ authprovider.ExpireCachedAuthCheck) (configtypes.AuthConfig, error) {- defaultCalled = true- return defaultCfg, nil- },- fakeRegistryAuthProvider{hostAuth: map[string]string{"docker.io": "not-base64"}},- )-- cfg, err := provider(context.Background(), "docker.io", nil, nil)- require.NoError(t, err)- assert.True(t, defaultCalled)- assert.Equal(t, defaultCfg, cfg)- })-}--func TestWrapBuildkitSolveErrorInternal_LeavesGenericErrorsUnchanged(t *testing.T) {- err := errors.New("failed to solve: Dockerfile parse error on line 3")-- wrapped := wrapBuildkitSolveErrorInternal(err, "local")-- require.ErrorIs(t, wrapped, err)- assert.Equal(t, err.Error(), wrapped.Error())-}--func TestWrapBuildkitSolveErrorInternal_WrapsDockerAndImageExporterErrors(t *testing.T) {- t.Run("docker exporter", func(t *testing.T) {- rawErr := errors.New(`failed to solve: exporter "docker" could not be found`)- wrapped := wrapBuildkitSolveErrorInternal(rawErr, "local")-- require.ErrorIs(t, wrapped, rawErr)- assert.Contains(t, wrapped.Error(), "the Docker Engine embedded BuildKit requires the docker image-store exporter")- })-- t.Run("image exporter", func(t *testing.T) {- rawErr := errors.New(`failed to solve: exporter "image" could not be found`)- wrapped := wrapBuildkitSolveErrorInternal(rawErr, "depot")-- require.ErrorIs(t, wrapped, rawErr)- assert.Contains(t, wrapped.Error(), "depot and remote BuildKit providers require the image exporter")- })-}diff --git a/backend/pkg/libarcane/libbuild/builder_docker.go b/backend/pkg/libarcane/libbuild/builder_docker.godeleted file mode 100644index 029dcb209..000000000--- a/backend/pkg/libarcane/libbuild/builder_docker.go+++ /dev/null@@ -1,632 +0,0 @@-package libbuild--import (- "bufio"- "context"- "encoding/json"- "fmt"- "io"- "os"- "path/filepath"- "strconv"- "strings"-- "github.com/getarcaneapp/arcane/backend/v2/internal/common"- dockerutils "github.com/getarcaneapp/arcane/backend/v2/pkg/dockerutil"- imagetypes "github.com/getarcaneapp/arcane/types/v2/image"- "github.com/moby/go-archive"- dockercontainer "github.com/moby/moby/api/types/container"- "github.com/moby/moby/api/types/jsonstream"- dockerregistry "github.com/moby/moby/api/types/registry"- dockerclient "github.com/moby/moby/client"- "github.com/moby/patternmatcher"- ocispec "github.com/opencontainers/image-spec/specs-go/v1"-)--type dockerBuildInput struct {- buildFilesystemInput-- platform string- buildArgs map[string]*string- labels map[string]string- cacheFrom []string- noCache bool- pullParent bool- networkMode string- isolation string- shmSize int64- ulimits []*dockercontainer.Ulimit- extraHosts []string-}--type buildFilesystemInput struct {- contextDir string- fullDockerfilePath string- relDockerfile string- dockerfileOutsideCtx bool- dockerfileInline string-}--func parseUlimitsInternal(values map[string]string) []*dockercontainer.Ulimit {- if len(values) == 0 {- return nil- }-- out := make([]*dockercontainer.Ulimit, 0, len(values))- for name, raw := range values {- name = strings.TrimSpace(name)- raw = strings.TrimSpace(raw)- if name == "" || raw == "" {- continue- }-- parts := strings.Split(raw, ":")- if len(parts) == 1 {- single, err := strconv.ParseInt(strings.TrimSpace(parts[0]), 10, 64)- if err != nil {- continue- }- out = append(out, &dockercontainer.Ulimit{Name: name, Soft: single, Hard: single})- continue- }-- soft, softErr := strconv.ParseInt(strings.TrimSpace(parts[0]), 10, 64)- hard, hardErr := strconv.ParseInt(strings.TrimSpace(parts[1]), 10, 64)- if softErr != nil || hardErr != nil {- continue- }-- out = append(out, &dockercontainer.Ulimit{Name: name, Soft: soft, Hard: hard})- }-- if len(out) == 0 {- return nil- }-- return out-}--func prepareBuildFilesystemInputInternal(req imagetypes.BuildRequest) (buildFilesystemInput, error) {- contextDir := filepath.Clean(req.ContextDir)- if contextDir == "" {- return buildFilesystemInput{}, &common.BuildContextDirRequiredError{}- }-- if strings.TrimSpace(req.DockerfileInline) != "" {- return buildFilesystemInput{- contextDir: contextDir,- relDockerfile: ".arcane.inline.Dockerfile",- dockerfileOutsideCtx: true,- dockerfileInline: req.DockerfileInline,- }, nil- }-- dockerfilePath := strings.TrimSpace(req.Dockerfile)- if dockerfilePath == "" {- dockerfilePath = "Dockerfile"- }-- fullDockerfilePath := dockerfilePath- if !filepath.IsAbs(dockerfilePath) {- fullDockerfilePath = filepath.Join(contextDir, dockerfilePath)- }-- relDockerfile, relErr := filepath.Rel(contextDir, fullDockerfilePath)- dockerfileOutsideCtx := relErr != nil || strings.HasPrefix(relDockerfile, "..")- if !dockerfileOutsideCtx {- excluded, err := dockerfileExcludedByDockerignoreInternal(contextDir, relDockerfile)- if err != nil {- return buildFilesystemInput{}, err- }- dockerfileOutsideCtx = excluded- }- if dockerfileOutsideCtx {- relDockerfile = filepath.Base(fullDockerfilePath)- } else {- relDockerfile = filepath.ToSlash(relDockerfile)- }-- return buildFilesystemInput{- contextDir: contextDir,- fullDockerfilePath: fullDockerfilePath,- relDockerfile: relDockerfile,- dockerfileOutsideCtx: dockerfileOutsideCtx,- }, nil-}--func prepareDockerBuildInputInternal(req imagetypes.BuildRequest) (dockerBuildInput, bool, error) {- fsInput, err := prepareBuildFilesystemInputInternal(req)- if err != nil {- return dockerBuildInput{}, false, err- }-- if len(req.Platforms) > 1 {- return dockerBuildInput{}, true, &common.DockerBuildMultiPlatformUnsupportedError{}- }-- platform := ""- if len(req.Platforms) == 1 {- platform = strings.TrimSpace(req.Platforms[0])- }-- buildArgs := map[string]*string{}- for key, val := range req.BuildArgs {- buildArgs[key] = new(val)- }-- labels := map[string]string{}- for key, val := range req.Labels {- k := strings.TrimSpace(key)- if k == "" {- continue- }- labels[k] = val- }- if len(labels) == 0 {- labels = nil- }-- cacheFrom := make([]string, 0, len(req.CacheFrom))- for _, source := range req.CacheFrom {- source = strings.TrimSpace(source)- if source == "" {- continue- }- cacheFrom = append(cacheFrom, source)- }- if len(cacheFrom) == 0 {- cacheFrom = nil- }-- extraHosts := make([]string, 0, len(req.ExtraHosts))- for _, host := range req.ExtraHosts {- host = strings.TrimSpace(host)- if host == "" {- continue- }- extraHosts = append(extraHosts, host)- }- if len(extraHosts) == 0 {- extraHosts = nil- }-- return dockerBuildInput{- buildFilesystemInput: fsInput,- platform: platform,- buildArgs: buildArgs,- labels: labels,- cacheFrom: cacheFrom,- noCache: req.NoCache,- pullParent: req.Pull,- networkMode: strings.TrimSpace(req.Network),- isolation: strings.TrimSpace(req.Isolation),- shmSize: req.ShmSize,- ulimits: parseUlimitsInternal(req.Ulimits),- extraHosts: extraHosts,- }, false, nil-}--func createBuildContextInternal(contextDir string) (io.ReadCloser, error) {- excludes, err := readDockerignoreInternal(contextDir)- if err != nil {- return nil, err- }- return archive.TarWithOptions(contextDir, &archive.TarOptions{ExcludePatterns: excludes})-}--func copyFileWithModeInternal(src, dst string, mode os.FileMode) (copyErr error) {- in, err := os.Open(src)- if err != nil {- return err- }- defer in.Close()-- out, err := os.OpenFile(dst, os.O_CREATE|os.O_TRUNC|os.O_WRONLY, mode)- if err != nil {- return err- }- defer func() {- if err := out.Close(); copyErr == nil && err != nil {- copyErr = err- }- }()-- _, err = io.Copy(out, in)- if err != nil {- return err- }-- return nil-}--func copyContextTreeInternal(srcRoot, dstRoot string) error {- return filepath.WalkDir(srcRoot, func(path string, d os.DirEntry, walkErr error) error {- if walkErr != nil {- return walkErr- }-- relPath, err := filepath.Rel(srcRoot, path)- if err != nil {- return err- }- if relPath == "." {- return nil- }-- targetPath := filepath.Join(dstRoot, relPath)- info, err := d.Info()- if err != nil {- return err- }-- if d.IsDir() {- return os.MkdirAll(targetPath, info.Mode())- }-- if d.Type()&os.ModeSymlink != 0 {- linkTarget, err := os.Readlink(path)- if err != nil {- return err- }- return os.Symlink(linkTarget, targetPath) //nolint:gosec // build context staging intentionally preserves symlinks from the user-selected source tree.- }-- if err := os.MkdirAll(filepath.Dir(targetPath), 0o755); err != nil {- return err- }-- return copyFileWithModeInternal(path, targetPath, info.Mode())- })-}--func prepareBuildContextInternal(input buildFilesystemInput) (string, string, func(), error) {- if input.dockerfileInline == "" && !input.dockerfileOutsideCtx {- return input.contextDir, input.relDockerfile, func() {}, nil- }-- stagingDir, err := os.MkdirTemp("", "arcane-docker-build-*")- if err != nil {- return "", "", nil, fmt.Errorf("failed to create temporary build directory: %w", err)- }-- cleanup := func() {- _ = os.RemoveAll(stagingDir)- }-- if err := copyContextTreeInternal(input.contextDir, stagingDir); err != nil {- cleanup()- return "", "", nil, fmt.Errorf("failed to stage build context: %w", err)- }-- if input.dockerfileInline != "" {- stagedDockerfilePath := filepath.Join(stagingDir, filepath.FromSlash(input.relDockerfile))- if err := os.MkdirAll(filepath.Dir(stagedDockerfilePath), 0o755); err != nil {- cleanup()- return "", "", nil, fmt.Errorf("failed to create inline Dockerfile path: %w", err)- }- if err := os.WriteFile(stagedDockerfilePath, []byte(input.dockerfileInline), 0o600); err != nil {- cleanup()- return "", "", nil, fmt.Errorf("failed to stage inline Dockerfile: %w", err)- }-- return stagingDir, filepath.ToSlash(input.relDockerfile), cleanup, nil- }-- const stagedDockerfile = ".arcane.external.Dockerfile"- stagedDockerfilePath := filepath.Join(stagingDir, stagedDockerfile)- dockerfileInfo, err := os.Stat(input.fullDockerfilePath)- if err != nil {- cleanup()- return "", "", nil, fmt.Errorf("failed to stat Dockerfile: %w", err)- }-- if err := copyFileWithModeInternal(input.fullDockerfilePath, stagedDockerfilePath, dockerfileInfo.Mode()); err != nil {- cleanup()- return "", "", nil, fmt.Errorf("failed to stage Dockerfile: %w", err)- }-- return stagingDir, stagedDockerfile, cleanup, nil-}--func prepareDockerBuildContextInternal(input dockerBuildInput) (string, string, func(), error) {- return prepareBuildContextInternal(input.buildFilesystemInput)-}--func (b *builder) performDockerBuildInternal(- ctx context.Context,- dockerClient *dockerclient.Client,- buildContext io.Reader,- buildOpts dockerclient.ImageBuildOptions,- progressWriter io.Writer,- serviceName string,-) error {- resp, err := dockerClient.ImageBuild(ctx, buildContext, buildOpts)- if err != nil {- writeProgressEventInternal(progressWriter, imagetypes.ProgressEvent{Type: "build", Service: serviceName, Error: err.Error()})- return err- }- defer resp.Body.Close()-- return streamDockerMessagesInternal(ctx, resp.Body, progressWriter, serviceName)-}--func (b *builder) pushDockerImagesInternal(- ctx context.Context,- dockerClient *dockerclient.Client,- tags []string,- progressWriter io.Writer,- serviceName string,-) error {- for _, tag := range tags {- if strings.TrimSpace(tag) == "" {- continue- }- writeProgressEventInternal(progressWriter, imagetypes.ProgressEvent{- Type: "build",- Service: serviceName,- Status: "pushing " + tag,- })- pushOptions := dockerclient.ImagePushOptions{}- if b.registryAuthProvider != nil {- authHeader, authErr := b.registryAuthProvider.GetRegistryAuthForImage(ctx, tag)- if authErr != nil {- writeProgressEventInternal(progressWriter, imagetypes.ProgressEvent{- Type: "build",- Service: serviceName,- Status: "registry auth unavailable for " + tag,- })- } else if authHeader != "" {- pushOptions.RegistryAuth = authHeader- }- }- pushResp, pushErr := dockerClient.ImagePush(ctx, tag, pushOptions)- if pushErr != nil {- writeProgressEventInternal(progressWriter, imagetypes.ProgressEvent{Type: "build", Service: serviceName, Error: pushErr.Error()})- return pushErr- }- if pushResp != nil {- if err := streamDockerMessagesInternal(ctx, pushResp, progressWriter, serviceName); err != nil {- _ = pushResp.Close()- return err- }- _ = pushResp.Close()- }- }- return nil-}--func parseOCIPlatformInternal(value string) (ocispec.Platform, error) {- parts := strings.Split(strings.TrimSpace(value), "/")- if len(parts) < 2 {- return ocispec.Platform{}, fmt.Errorf("invalid platform: %q", value)- }-- platform := ocispec.Platform{- OS: strings.TrimSpace(parts[0]),- Architecture: strings.TrimSpace(parts[1]),- }- if len(parts) >= 3 {- platform.Variant = strings.TrimSpace(parts[2])- }-- if platform.OS == "" || platform.Architecture == "" {- return ocispec.Platform{}, fmt.Errorf("invalid platform: %q", value)- }-- return platform, nil-}--func buildDockerImageOptionsInternal(- req imagetypes.BuildRequest,- input dockerBuildInput,- dockerfileForBuild string,- authConfigs map[string]dockerregistry.AuthConfig,-) (dockerclient.ImageBuildOptions, error) {- buildOpts := dockerclient.ImageBuildOptions{- Tags: req.Tags,- Dockerfile: dockerfileForBuild,- Remove: true,- ForceRemove: true,- Target: strings.TrimSpace(req.Target),- BuildArgs: input.buildArgs,- Labels: input.labels,- CacheFrom: input.cacheFrom,- NoCache: input.noCache,- PullParent: input.pullParent,- NetworkMode: input.networkMode,- Isolation: dockercontainer.Isolation(input.isolation),- ShmSize: input.shmSize,- Ulimits: input.ulimits,- ExtraHosts: input.extraHosts,- AuthConfigs: authConfigs,- }- if len(buildOpts.AuthConfigs) == 0 {- buildOpts.AuthConfigs = nil- }-- if input.platform != "" {- platform, parseErr := parseOCIPlatformInternal(input.platform)- if parseErr != nil {- return dockerclient.ImageBuildOptions{}, parseErr- }- buildOpts.Platforms = []ocispec.Platform{platform}- }-- return buildOpts, nil-}--func (b *builder) buildWithDockerInternal(ctx context.Context, req imagetypes.BuildRequest, progressWriter io.Writer, serviceName string) (*imagetypes.BuildResult, error) {- if b.dockerClientProvider == nil {- return nil, &common.BuildDockerServiceUnavailableError{}- }-- dockerClient, err := b.dockerClientProvider.GetClient(ctx)- if err != nil {- return nil, fmt.Errorf("failed to connect to Docker: %w", err)- }-- input, reportProgress, err := prepareDockerBuildInputInternal(req)- if err != nil {- if reportProgress {- writeProgressEventInternal(progressWriter, imagetypes.ProgressEvent{Type: "build", Service: serviceName, Error: err.Error()})- }- return nil, err- }-- buildContextDir, dockerfileForBuild, cleanupBuildContext, err := prepareDockerBuildContextInternal(input)- if err != nil {- return nil, err- }- defer cleanupBuildContext()-- buildContext, err := createBuildContextInternal(buildContextDir)- if err != nil {- return nil, fmt.Errorf("failed to create build context: %w", err)- }- defer buildContext.Close()-- writeProgressEventInternal(progressWriter, imagetypes.ProgressEvent{- Type: "build",- Phase: "begin",- Service: serviceName,- Status: "build started",- })-- var authConfigs map[string]dockerregistry.AuthConfig- if b.registryAuthProvider != nil {- loadedAuthConfigs, authErr := b.registryAuthProvider.GetAllRegistryAuthConfigs(ctx)- if authErr != nil {- writeProgressEventInternal(progressWriter, imagetypes.ProgressEvent{- Type: "build",- Service: serviceName,- Status: "registry auth unavailable for build",- })- } else {- authConfigs = loadedAuthConfigs- }- }-- buildOpts, buildOptsErr := buildDockerImageOptionsInternal(req, input, dockerfileForBuild, authConfigs)- if buildOptsErr != nil {- writeProgressEventInternal(progressWriter, imagetypes.ProgressEvent{Type: "build", Service: serviceName, Error: buildOptsErr.Error()})- return nil, buildOptsErr- }-- if err := b.performDockerBuildInternal(ctx, dockerClient, buildContext, buildOpts, progressWriter, serviceName); err != nil {- return nil, err- }-- if req.Push {- if err := b.pushDockerImagesInternal(ctx, dockerClient, req.Tags, progressWriter, serviceName); err != nil {- return nil, err- }- }-- writeProgressEventInternal(progressWriter, imagetypes.ProgressEvent{- Type: "build",- Phase: "complete",- Service: serviceName,- Status: "build complete",- })-- return &imagetypes.BuildResult{- Provider: "local",- Tags: req.Tags,- }, nil-}--func streamDockerMessagesInternal(ctx context.Context, reader io.Reader, w io.Writer, serviceName string) error {- streamErr := dockerutils.ConsumeJSONMessageStream(reader, func(line []byte) error {- select {- case <-ctx.Done():- return ctx.Err()- default:- }- var msg jsonstream.Message- if unmarshalErr := json.Unmarshal(line, &msg); unmarshalErr != nil {- return unmarshalErr- }- status := strings.TrimSpace(msg.Status)- if status == "" {- status = strings.TrimSpace(msg.Stream)- }- if status == "" {- return nil- }-- event := imagetypes.ProgressEvent{- Type: "build",- Service: serviceName,- ID: strings.TrimSpace(msg.ID),- Status: status,- }- if msg.Progress != nil {- event.ProgressDetail = &imagetypes.ProgressDetail{- Current: msg.Progress.Current,- Total: msg.Progress.Total,- }- }- writeProgressEventInternal(w, event)- return nil- })- if streamErr != nil {- errMsg := strings.TrimSpace(streamErr.Error())- if errMsg == "" {- errMsg = "docker stream reported an unknown error"- }- writeProgressEventInternal(w, imagetypes.ProgressEvent{Type: "build", Service: serviceName, Error: errMsg})- return streamErr- }- return nil-}--func readDockerignoreInternal(contextDir string) ([]string, error) {- ignorePath := filepath.Join(contextDir, ".dockerignore")- file, err := os.Open(ignorePath)- if err != nil {- return nil, nil- }- defer file.Close()-- patterns := []string{}- scanner := bufio.NewScanner(file)- for scanner.Scan() {- line := strings.TrimSpace(scanner.Text())- if line == "" || strings.HasPrefix(line, "#") {- continue- }- patterns = append(patterns, line)- }- if err := scanner.Err(); err != nil {- return nil, fmt.Errorf("failed to read .dockerignore: %w", err)- }-- return patterns, nil-}--func dockerfileExcludedByDockerignoreInternal(contextDir, dockerfilePath string) (bool, error) {- patterns, err := readDockerignoreInternal(contextDir)- if err != nil {- return false, err- }- if len(patterns) == 0 {- return false, nil- }-- matcher, err := patternmatcher.New(patterns)- if err != nil {- return false, fmt.Errorf("invalid .dockerignore: %w", err)- }-- relDockerfile := filepath.ToSlash(filepath.Clean(dockerfilePath))- if relDockerfile == "." || relDockerfile == "" {- return false, nil- }-- excluded, err := matcher.MatchesOrParentMatches(relDockerfile)- if err != nil {- return false, fmt.Errorf("failed to evaluate .dockerignore for Dockerfile: %w", err)- }-- return excluded, nil-}diff --git a/backend/pkg/libarcane/libbuild/builder_docker_test.go b/backend/pkg/libarcane/libbuild/builder_docker_test.godeleted file mode 100644index 1deb36fb9..000000000--- a/backend/pkg/libarcane/libbuild/builder_docker_test.go+++ /dev/null@@ -1,140 +0,0 @@-package libbuild--import (- "bufio"- "os"- "path/filepath"- "strings"- "testing"-- imagetypes "github.com/getarcaneapp/arcane/types/v2/image"- dockerregistry "github.com/moby/moby/api/types/registry"- "github.com/stretchr/testify/assert"- "github.com/stretchr/testify/require"-)--func TestPrepareDockerBuildInputInternal_RejectsMultiPlatform(t *testing.T) {- contextDir := createBuildContextWithDockerfileInternal(t)- req := imagetypes.BuildRequest{- ContextDir: contextDir,- Dockerfile: "Dockerfile",- Platforms: []string{"linux/amd64", "linux/arm64"},- }-- _, reportProgress, err := prepareDockerBuildInputInternal(req)- require.Error(t, err)- assert.True(t, reportProgress)- assert.Contains(t, err.Error(), "does not support multi-platform builds")-}--func TestBuildDockerImageOptionsInternal_IncludesAuthConfigs(t *testing.T) {- contextDir := createBuildContextWithDockerfileInternal(t)- req := imagetypes.BuildRequest{- ContextDir: contextDir,- Dockerfile: "Dockerfile",- Tags: []string{"ghcr.io/getarcaneapp/arcane:test"},- Platforms: []string{"linux/amd64"},- }- input, _, err := prepareDockerBuildInputInternal(req)- require.NoError(t, err)-- authConfigs := map[string]dockerregistry.AuthConfig{- "ghcr.io": {- Username: "db-user",- Password: "db-token",- ServerAddress: "ghcr.io",- },- }-- buildOpts, err := buildDockerImageOptionsInternal(req, input, "Dockerfile", authConfigs)- require.NoError(t, err)- require.NotNil(t, buildOpts.AuthConfigs)- assert.Equal(t, authConfigs, buildOpts.AuthConfigs)- assert.Empty(t, buildOpts.Version)- require.Len(t, buildOpts.Platforms, 1)- assert.Equal(t, "linux", buildOpts.Platforms[0].OS)- assert.Equal(t, "amd64", buildOpts.Platforms[0].Architecture)-}--func TestBuildDockerImageOptionsInternal_EmptyAuthConfigsBecomesNil(t *testing.T) {- contextDir := createBuildContextWithDockerfileInternal(t)- req := imagetypes.BuildRequest{- ContextDir: contextDir,- Dockerfile: "Dockerfile",- Tags: []string{"ghcr.io/getarcaneapp/arcane:test"},- }- input, _, err := prepareDockerBuildInputInternal(req)- require.NoError(t, err)-- buildOpts, err := buildDockerImageOptionsInternal(req, input, "Dockerfile", map[string]dockerregistry.AuthConfig{})- require.NoError(t, err)- assert.Nil(t, buildOpts.AuthConfigs)-}--func TestPrepareDockerBuildContextInternal_StagesInlineDockerfile(t *testing.T) {- contextDir := t.TempDir()- require.NoError(t, os.WriteFile(filepath.Join(contextDir, "app.txt"), []byte("hello\n"), 0o644))-- req := imagetypes.BuildRequest{- ContextDir: contextDir,- DockerfileInline: "FROM alpine:3.20\nCOPY app.txt /app.txt\n",- }-- input, reportProgress, err := prepareDockerBuildInputInternal(req)- require.NoError(t, err)- assert.False(t, reportProgress)-- buildContextDir, dockerfileForBuild, cleanup, err := prepareDockerBuildContextInternal(input)- require.NoError(t, err)- defer cleanup()-- contents, err := os.ReadFile(filepath.Join(buildContextDir, filepath.FromSlash(dockerfileForBuild)))- require.NoError(t, err)- assert.Equal(t, "FROM alpine:3.20\nCOPY app.txt /app.txt\n", string(contents))-- appContents, err := os.ReadFile(filepath.Join(buildContextDir, "app.txt"))- require.NoError(t, err)- assert.Equal(t, "hello\n", string(appContents))-}--func TestPrepareDockerBuildContextInternal_StagesDockerfileExcludedByDockerignore(t *testing.T) {- contextDir := t.TempDir()- require.NoError(t, os.WriteFile(filepath.Join(contextDir, "Dockerfile"), []byte("FROM alpine:3.20\n"), 0o644))- require.NoError(t, os.WriteFile(filepath.Join(contextDir, ".dockerignore"), []byte("**/Dockerfile*\n"), 0o644))- require.NoError(t, os.WriteFile(filepath.Join(contextDir, "app.txt"), []byte("hello\n"), 0o644))-- req := imagetypes.BuildRequest{- ContextDir: contextDir,- Dockerfile: "Dockerfile",- }-- input, reportProgress, err := prepareDockerBuildInputInternal(req)- require.NoError(t, err)- assert.False(t, reportProgress)-- buildContextDir, dockerfileForBuild, cleanup, err := prepareDockerBuildContextInternal(input)- require.NoError(t, err)- defer cleanup()-- assert.NotEqual(t, contextDir, buildContextDir)- assert.Equal(t, ".arcane.external.Dockerfile", dockerfileForBuild)-- contents, err := os.ReadFile(filepath.Join(buildContextDir, dockerfileForBuild))- require.NoError(t, err)- assert.Equal(t, "FROM alpine:3.20\n", string(contents))-- appContents, err := os.ReadFile(filepath.Join(buildContextDir, "app.txt"))- require.NoError(t, err)- assert.Equal(t, "hello\n", string(appContents))-}--func TestDockerfileExcludedByDockerignoreInternal_ReturnsScannerError(t *testing.T) {- contextDir := t.TempDir()- tooLongPattern := strings.Repeat("a", bufio.MaxScanTokenSize+1)- require.NoError(t, os.WriteFile(filepath.Join(contextDir, ".dockerignore"), []byte(tooLongPattern), 0o644))-- excluded, err := dockerfileExcludedByDockerignoreInternal(contextDir, "Dockerfile")- require.Error(t, err)- assert.False(t, excluded)- assert.Contains(t, err.Error(), "failed to read .dockerignore")-}diff --git a/backend/pkg/libarcane/libbuild/builder_progress.go b/backend/pkg/libarcane/libbuild/builder_progress.godeleted file mode 100644index 816e18428..000000000--- a/backend/pkg/libarcane/libbuild/builder_progress.go+++ /dev/null@@ -1,24 +0,0 @@-package libbuild--import (- "encoding/json"- "io"-- imagetypes "github.com/getarcaneapp/arcane/types/v2/image"-)--type flusher interface{ Flush() }--func writeProgressEventInternal(w io.Writer, event imagetypes.ProgressEvent) {- if w == nil {- return- }- data, err := json.Marshal(event)- if err != nil {- return- }- _, _ = w.Write(append(data, '\n'))- if f, ok := w.(flusher); ok {- f.Flush()- }-}diff --git a/backend/pkg/libarcane/libbuild/builder_utils.go b/backend/pkg/libarcane/libbuild/builder_utils.godeleted file mode 100644index a701052fd..000000000--- a/backend/pkg/libarcane/libbuild/builder_utils.go+++ /dev/null@@ -1,138 +0,0 @@-package libbuild--import (- "fmt"- "os"- "path/filepath"- "sort"- "strings"-- "github.com/getarcaneapp/arcane/backend/v2/internal/common"- imagetypes "github.com/getarcaneapp/arcane/types/v2/image"-)--func normalizeBuildRequestInternal(req imagetypes.BuildRequest, providerName string) imagetypes.BuildRequest {- if !req.Push && !req.Load {- if providerName == "depot" {- req.Push = true- } else {- req.Load = true- }- }- return req-}--func validateBuildRequestInternal(req imagetypes.BuildRequest, providerName string) error {- if strings.TrimSpace(req.ContextDir) == "" {- return &common.BuildContextDirRequiredError{}- }-- contextDir := filepath.Clean(req.ContextDir)- if _, err := os.Stat(contextDir); err != nil {- return fmt.Errorf("build context not found: %w", err)- }-- if strings.TrimSpace(req.Dockerfile) != "" && strings.TrimSpace(req.DockerfileInline) != "" {- return &common.DockerfileAndInlineMutuallyExclusiveError{}- }-- if providerName == "depot" && !req.Push {- return &common.DepotBuildPushRequiredError{}- }-- if unsupported := unsupportedBuildOptionsInternal(req, providerName); len(unsupported) > 0 {- return fmt.Errorf("unsupported build options for provider %s: %s", providerName, strings.Join(unsupported, ", "))- }-- if len(req.Tags) == 0 && (req.Push || req.Load) {- return &common.BuildTagsRequiredError{}- }-- dockerfilePath := strings.TrimSpace(req.Dockerfile)- if strings.TrimSpace(req.DockerfileInline) != "" {- return nil- }- if dockerfilePath == "" {- dockerfilePath = "Dockerfile"- }- fullDockerfilePath := dockerfilePath- if !filepath.IsAbs(dockerfilePath) {- fullDockerfilePath = filepath.Join(contextDir, dockerfilePath)- }- if _, err := os.Stat(fullDockerfilePath); err != nil {- return fmt.Errorf("dockerfile not found: %w", err)- }-- return nil-}--func unsupportedBuildOptionsInternal(req imagetypes.BuildRequest, providerName string) []string {- unsupported := make([]string, 0, 5)-- switch providerName {- case "local":- if hasNonEmptyStringEntriesInternal(req.CacheTo) {- unsupported = append(unsupported, "cacheTo")- }- if hasNonEmptyStringEntriesInternal(req.Entitlements) {- unsupported = append(unsupported, "entitlements")- }- if req.Privileged {- unsupported = append(unsupported, "privileged")- }- if countNonEmptyStringEntriesInternal(req.Platforms) > 1 {- unsupported = append(unsupported, "platforms")- }- case "depot":- if strings.TrimSpace(req.Network) != "" {- unsupported = append(unsupported, "network")- }- if strings.TrimSpace(req.Isolation) != "" {- unsupported = append(unsupported, "isolation")- }- if req.ShmSize > 0 {- unsupported = append(unsupported, "shmSize")- }- if len(req.Ulimits) > 0 {- unsupported = append(unsupported, "ulimits")- }- if hasNonEmptyStringEntriesInternal(req.ExtraHosts) {- unsupported = append(unsupported, "extraHosts")- }- }-- sort.Strings(unsupported)- return unsupported-}--func hasNonEmptyStringEntriesInternal(values []string) bool {- return countNonEmptyStringEntriesInternal(values) > 0-}--func countNonEmptyStringEntriesInternal(values []string) int {- count := 0- for _, value := range values {- if strings.TrimSpace(value) != "" {- count++- }- }- return count-}--func normalizeTagsInternal(tags []string) []string {- seen := map[string]any{}- out := make([]string, 0, len(tags))- for _, tag := range tags {- t := strings.TrimSpace(tag)- if t == "" {- continue- }- if _, ok := seen[t]; ok {- continue- }- seen[t] = nil- out = append(out, t)- }- sort.Strings(out)- return out-}diff --git a/backend/pkg/libarcane/libbuild/builder_utils_test.go b/backend/pkg/libarcane/libbuild/builder_utils_test.godeleted file mode 100644index d18a8744f..000000000--- a/backend/pkg/libarcane/libbuild/builder_utils_test.go+++ /dev/null@@ -1,127 +0,0 @@-package libbuild--import (- "errors"- "os"- "path/filepath"- "testing"-- "github.com/getarcaneapp/arcane/backend/v2/internal/common"- imagetypes "github.com/getarcaneapp/arcane/types/v2/image"- "github.com/stretchr/testify/assert"- "github.com/stretchr/testify/require"-)--func createBuildContextWithDockerfileInternal(t *testing.T) string {- t.Helper()-- contextDir := t.TempDir()- dockerfilePath := filepath.Join(contextDir, "Dockerfile")- require.NoError(t, os.WriteFile(dockerfilePath, []byte("FROM alpine:3.20\n"), 0o644))- return contextDir-}--func TestValidateBuildRequestInternal_LocalProviderUnsupportedOptions(t *testing.T) {- contextDir := createBuildContextWithDockerfileInternal(t)- req := imagetypes.BuildRequest{- ContextDir: contextDir,- Dockerfile: "Dockerfile",- Tags: []string{"ghcr.io/getarcaneapp/arcane:test"},- Load: true,- CacheTo: []string{"type=registry,ref=ghcr.io/getarcaneapp/cache:latest"},- Entitlements: []string{"network.host"},- Privileged: true,- Platforms: []string{"linux/amd64", "linux/arm64"},- }-- err := validateBuildRequestInternal(req, "local")- require.EqualError(t, err, "unsupported build options for provider local: cacheTo, entitlements, platforms, privileged")-}--func TestValidateBuildRequestInternal_DepotProviderUnsupportedOptions(t *testing.T) {- contextDir := createBuildContextWithDockerfileInternal(t)- req := imagetypes.BuildRequest{- ContextDir: contextDir,- Dockerfile: "Dockerfile",- Tags: []string{"ghcr.io/getarcaneapp/arcane:test"},- Push: true,- Network: "host",- Isolation: "process",- ShmSize: 128 * 1024 * 1024,- Ulimits: map[string]string{- "nofile": "1024:2048",- },- ExtraHosts: []string{"registry.local:10.0.0.5"},- }-- err := validateBuildRequestInternal(req, "depot")- require.EqualError(t, err, "unsupported build options for provider depot: extraHosts, isolation, network, shmSize, ulimits")-}--func TestValidateBuildRequestInternal_RespectsTrimmedValues(t *testing.T) {- contextDir := createBuildContextWithDockerfileInternal(t)- req := imagetypes.BuildRequest{- ContextDir: contextDir,- Dockerfile: "Dockerfile",- Tags: []string{"ghcr.io/getarcaneapp/arcane:test"},- Load: true,- CacheTo: []string{" "},- Entitlements: []string{"\n\t"},- ExtraHosts: []string{" "},- Platforms: []string{"linux/amd64", " "},- }-- err := validateBuildRequestInternal(req, "local")- assert.NoError(t, err)-}--func TestValidateBuildRequestInternal_AllowsInlineDockerfile(t *testing.T) {- contextDir := t.TempDir()- req := imagetypes.BuildRequest{- ContextDir: contextDir,- DockerfileInline: "FROM alpine:3.20\nRUN echo inline\n",- Tags: []string{"ghcr.io/getarcaneapp/arcane:test"},- Load: true,- }-- err := validateBuildRequestInternal(req, "local")- assert.NoError(t, err)-}--func TestValidateBuildRequestInternal_RejectsDockerfileAndInlineTogether(t *testing.T) {- contextDir := createBuildContextWithDockerfileInternal(t)- req := imagetypes.BuildRequest{- ContextDir: contextDir,- Dockerfile: "Dockerfile",- DockerfileInline: "FROM alpine:3.20\n",- Tags: []string{"ghcr.io/getarcaneapp/arcane:test"},- Load: true,- }-- err := validateBuildRequestInternal(req, "local")- require.EqualError(t, err, "dockerfile and dockerfileInline are mutually exclusive")-}--func TestValidateBuildRequestInternal_ReturnsCommonTypedErrors(t *testing.T) {- err := validateBuildRequestInternal(imagetypes.BuildRequest{}, "local")- require.Error(t, err)-- var typedErr *common.BuildContextDirRequiredError- assert.True(t, errors.As(err, &typedErr))-}--func TestPrepareDockerBuildInputInternal_ReturnsCommonTypedErrors(t *testing.T) {- contextDir := createBuildContextWithDockerfileInternal(t)- req := imagetypes.BuildRequest{- ContextDir: contextDir,- Dockerfile: "Dockerfile",- Platforms: []string{"linux/amd64", "linux/arm64"},- }-- _, reportProgress, err := prepareDockerBuildInputInternal(req)- require.Error(t, err)- assert.True(t, reportProgress)-- var typedErr *common.DockerBuildMultiPlatformUnsupportedError- assert.True(t, errors.As(err, &typedErr))-}diff --git a/backend/pkg/libarcane/libbuild/log_capture.go b/backend/pkg/libarcane/libbuild/log_capture.godeleted file mode 100644index 37c3c548b..000000000--- a/backend/pkg/libarcane/libbuild/log_capture.go+++ /dev/null@@ -1,47 +0,0 @@-package libbuild--import (- "bytes"-- buildtypes "github.com/getarcaneapp/arcane/types/v2/builds"-)--// logCapture stores build output up to a max byte size.-// It implements io.Writer so it can be used with io.MultiWriter.-type logCapture struct {- buf bytes.Buffer- maxBytes int- truncated bool-}--func NewLogCapture(maxBytes int) buildtypes.LogCapture {- return &logCapture{maxBytes: maxBytes}-}--func (l *logCapture) Write(p []byte) (int, error) {- if l.maxBytes <= 0 {- return len(p), nil- }-- remaining := l.maxBytes - l.buf.Len()- if remaining > 0 {- if len(p) <= remaining {- _, _ = l.buf.Write(p)- } else {- _, _ = l.buf.Write(p[:remaining])- l.truncated = true- }- } else {- l.truncated = true- }-- return len(p), nil-}--func (l *logCapture) String() string {- return l.buf.String()-}--func (l *logCapture) Truncated() bool {- return l.truncated-}diff --git a/go.work.sum b/go.work.sumindex 3fd9d01a7..a23d68c7a 100644--- a/go.work.sum+++ b/go.work.sum@@ -1,5 +1,7 @@bitbucket.org/creachadair/shell v0.0.8 h1:3yM6JcAfaGWzjzcCamTblzSIWXm/YSs0PFGIzBm2HTo=bitbucket.org/creachadair/shell v0.0.8/go.mod h1:vINzudofoUXZSJ5tREgpy+Etyjsag3ait5WOWImEVZ0=+buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.31.0-20230802163732-1c33ebd9ecfa.1 h1:tdpHgTbmbvEIARu+bixzmleMi14+3imnpoFXz+Qzjp4=+buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.31.0-20230802163732-1c33ebd9ecfa.1/go.mod h1:xafc+XIsTxTy76GJQ1TKgvJWsSugFBqMaN27WhUblew=buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.6-20250425153114-8976f5be98c1.1 h1:YhMSc48s25kr7kv31Z8vf7sPUIq5YJva9z1mn/hAt0M=buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.6-20250425153114-8976f5be98c1.1/go.mod h1:avRlCjnFzl98VPaeCtJ24RrV/wwHFzB8sWXhj26+n/U=buf.build/go/protovalidate v0.12.0 h1:4GKJotbspQjRCcqZMGVSuC8SjwZ/FmgtSuKDpKUTZew=@@ -8,6 +10,7 @@ cel.dev/expr v0.24.0 h1:56OvJKSH3hDGL0ml5uSxZmz3/3Pq4tJ+fb1unVLAFcY=cel.dev/expr v0.24.0/go.mod h1:hLPLo1W4QUmuYdA72RBX06QTs6MXw941piREPl3Yfiw=cel.dev/expr v0.25.1 h1:1KrZg61W6TWSxuNZ37Xy49ps13NUovb66QLprthtwi4=cel.dev/expr v0.25.1/go.mod h1:hrXvqGP6G6gyx8UAHSHJ5RGk//1Oj5nXQ2NI02Nrsg4=+cloud.google.com/go v0.26.0 h1:e0WKqKTd5BnrG8aKH3J3h+QvEIQtSUcf2n5UZ5ZgLtQ=cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=cloud.google.com/go v0.121.6 h1:waZiuajrI28iAf40cWgycWNgaXPO06dupuS+sgibK6c=cloud.google.com/go v0.121.6/go.mod h1:coChdst4Ea5vUpiALcYKXEpR1S9ZgXbhEzzMcMR66vI=@@ -70,6 +73,8 @@ cloud.google.com/go/clouddms v1.8.8 h1:YWsmRXTyK6Ba0hm4qTBak5g1oLhryuM8rSBxHWC8icloud.google.com/go/clouddms v1.8.8/go.mod h1:QtCyw+a73dlkDb2q20aTAPvfaTZCepDDi6Gb1AKq0a4=cloud.google.com/go/cloudtasks v1.13.7 h1:H2v8GEolNtMFfYzUpZBaZbydqU7drpyo99GtAgA+m4I=cloud.google.com/go/cloudtasks v1.13.7/go.mod h1:H0TThOUG+Ml34e2+ZtW6k6nt4i9KuH3nYAJ5mxh7OM4=+cloud.google.com/go/compute v1.23.4 h1:EBT9Nw4q3zyE7G45Wvv3MzolIrCJEuHys5muLY0wvAw=+cloud.google.com/go/compute v1.23.4/go.mod h1:/EJMj55asU6kAFnuZET8zqgwgJ9FvXWXOkkfQZa4ioI=cloud.google.com/go/compute v1.54.0 h1:4CKmnpO+40z44bKG5bdcKxQ7ocNpRtOc9SCLLUzze1w=cloud.google.com/go/compute v1.54.0/go.mod h1:RfBj0L1x/pIM84BrzNX2V21oEv16EKRPBiTcBRRH1Ww=cloud.google.com/go/compute/metadata v0.3.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k=@@ -267,6 +272,8 @@ cloud.google.com/go/texttospeech v1.16.0 h1:Ra4w+6qmaeb12ozlPBqGw8Jzdge1yfzhvZgccloud.google.com/go/texttospeech v1.16.0/go.mod h1:AeSkoH3ziPvapsuyI07TWY4oGxluAjntX+pF4PJ2jy0=cloud.google.com/go/tpu v1.8.4 h1:5DDheA1f7yZ/KUbVT/9lL+Yhgd3IqHDSVVrSqDVkAFY=cloud.google.com/go/tpu v1.8.4/go.mod h1:ul0cyWSHr6jHGZYElZe6HvQn35VY93RAlwpDiSBRnPA=+cloud.google.com/go/trace v1.11.3 h1:c+I4YFjxRQjvAhRmSsmjpASUKq88chOX854ied0K/pE=+cloud.google.com/go/trace v1.11.3/go.mod h1:pt7zCYiDSQjC9Y2oqCsh9jF4GStB/hmjrYLsxRR27q8=cloud.google.com/go/trace v1.11.7 h1:kDNDX8JkaAG3R2nq1lIdkb7FCSi1rCmsEtKVsty7p+U=cloud.google.com/go/trace v1.11.7/go.mod h1:TNn9d5V3fQVf6s4SCveVMIBS2LJUqo73GACmq/Tky0s=cloud.google.com/go/translate v1.12.7 h1:aSxMbfJ3MVmEdQzu5jGXmPPxCAb1ySsor2yBMCI5MT4=@@ -606,6 +613,7 @@ github.com/aws/smithy-go v1.23.2 h1:Crv0eatJUQhaManss33hS5r40CG3ZFH+21XSkqMrIUM=github.com/aws/smithy-go v1.23.2/go.mod h1:LEj2LM3rBRQJxPZTB4KuzZkaZYnZPnvgIhb4pu07mx0=github.com/aws/smithy-go v1.24.0 h1:LpilSUItNPFr1eY85RYgTIg5eIEPtvFbskaFcmmIUnk=github.com/aws/smithy-go v1.24.0/go.mod h1:LEj2LM3rBRQJxPZTB4KuzZkaZYnZPnvgIhb4pu07mx0=+github.com/aws/smithy-go v1.27.1/go.mod h1:YE2RhdIuDbA5E5bTdciG9KrW3+TiEONeUWCqxX9i1Fc=github.com/aymanbagabas/go-udiff v0.4.0/go.mod h1:0L9PGwj20lrtmEMeyw4WKJ/TMyDtvAoK9bf2u/mNo3w=github.com/beevik/ntp v1.5.0 h1:y+uj/JjNwlY2JahivxYvtmv4ehfi3h74fAuABB9ZSM4=github.com/beevik/ntp v1.5.0/go.mod h1:mJEhBrwT76w9D+IfOEGvuzyuudiW9E52U2BaTrMOYow=@@ -727,6 +735,7 @@ github.com/cloudwego/base64x v0.1.6 h1:t11wG9AECkCDk5fMSoxmufanudBtJ+/HemLstXDLIgithub.com/cloudwego/base64x v0.1.6/go.mod h1:OFcloc187FXDaYHvrNIjxSe8ncn0OOM8gEHfghB2IPU=github.com/cloudwego/iasm v0.2.0 h1:1KNIy1I1H9hNNFEEH3DVnI4UujN+1zjpuk6gwHLTssg=github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY=+github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f h1:WBZRG4aNOuI15bLRrCgN8fCq8E5Xuty6jGbmSNEvSsU=github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe h1:QQ3GSy+MqSHxm/d8nCtnAiZdYFd45cYZPs8vOOIYKfk=github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI=@@ -799,6 +808,7 @@ github.com/containerd/stargz-snapshotter/estargz v0.15.1/go.mod h1:gr2RNwukQ/S9Ngithub.com/containerd/ttrpc v1.2.5/go.mod h1:YCXHsb32f+Sq5/72xHubdiJRQY9inL4a4ZQrAbN1q9o=github.com/containerd/ttrpc v1.2.7/go.mod h1:YCXHsb32f+Sq5/72xHubdiJRQY9inL4a4ZQrAbN1q9o=github.com/containerd/typeurl/v2 v2.1.1/go.mod h1:IDp2JFvbwZ31H8dQbEIY7sDl2L3o3HZj1hsSQlywkQ0=+github.com/containerd/typeurl/v2 v2.2.3/go.mod h1:95ljDnPfD3bAbDJRugOiShd/DlAAsxGtUBhJxIn7SCk=github.com/containerd/zfs/v2 v2.0.0-rc.0 h1:0dRlgpoaepW7HuovtcvYQMF7NlpceQVdn7+3Udeth4M=github.com/containerd/zfs/v2 v2.0.0-rc.0/go.mod h1:g36g/XCEGDRxUXIFdM3oWAEvmTvhfz/eKWElqg4Secw=github.com/containerd/zfs/v2 v2.0.0 h1:sI0wKwWNQXR9G4jnPPrXmMSetm6PGAwgqBRTQtFUY/o=@@ -1106,6 +1116,7 @@ github.com/golang/glog v1.2.5 h1:DrW6hGnjIhtvhOIiAKT6Psh/Kd/ldepEa81DKeiRJ5I=github.com/golang/glog v1.2.5/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w=github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=+github.com/golang/mock v1.1.1 h1:G5FRp8JnTd7RQH5kemVNlMeyXQAztQ3mOWV95KxsXH8=github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=github.com/golang/mock v1.7.0-rc.1 h1:YojYx61/OLFsiv6Rw1Z96LpldJIy31o+UHmwAUMJ6/U=github.com/golang/mock v1.7.0-rc.1/go.mod h1:s42URUywIqd+OcERslBJvOjepvNymP31m3q8d/GkuRs=@@ -1132,6 +1143,8 @@ github.com/google/addlicense v1.1.1 h1:jpVf9qPbU8rz5MxKo7d+RMcNHkqxi4YJi/laauX4agithub.com/google/addlicense v1.1.1/go.mod h1:Sm/DHu7Jk+T5miFHHehdIjbi4M5+dJDRS3Cq0rncIxA=github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg=github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=+github.com/google/cel-go v0.17.1 h1:s2151PDGy/eqpCI80/8dl4VL3xTkqI/YubXLXCFw0mw=+github.com/google/cel-go v0.17.1/go.mod h1:HXZKzB0LXqer5lHHgfWAnlYwJaQBDKMjxjulNQzhwhY=github.com/google/cel-go v0.25.0 h1:jsFw9Fhn+3y2kBbltZR4VEz5xKkcIFRPDnuEzAGv5GY=github.com/google/cel-go v0.25.0/go.mod h1:hjEb6r5SuOSlhCHmFoLzu8HGCERvIsDAbxDAyNU/MmI=github.com/google/certificate-transparency-go v1.1.4/go.mod h1:D6lvbfwckhNrbM9WVl1EVeMOyzC19mpIjMOI4nxBHtQ=@@ -1364,7 +1377,9 @@ github.com/keybase/dbus v0.0.0-20220506165403-5aa21ea2c23a/go.mod h1:YPNKjjE7Ubpgithub.com/keybase/go-keychain v0.0.1 h1:way+bWYa6lDppZoZcgMbYsvC7GxljxrskdNInRtuthU=github.com/keybase/go-keychain v0.0.1/go.mod h1:PdEILRW3i9D8JcdM+FmY6RwkHGnhHxXwkPPMeUgOK1k=github.com/kisielk/errcheck v1.5.0 h1:e8esj/e4R+SAOwFwN+n3zr0nYeCyeweozKfO23MvHzY=+github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=github.com/kisielk/gotool v1.0.0 h1:AV2c/EiW3KqPNT9ZKl07ehoAGi4C5/01Cfbblndcapg=+github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=github.com/klauspost/asmfmt v1.3.2 h1:4Ri7ox3EwapiOjCki+hw14RyKk201CN4rzyCJRFLpK4=github.com/klauspost/asmfmt v1.3.2/go.mod h1:AG8TuvYojzulgDAMCnYn50l/5QV3Bs/tp6j0HLHbNSE=github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=@@ -1494,6 +1509,7 @@ github.com/microsoft/go-mssqldb v1.0.0 h1:k2p2uuG8T5T/7Hp7/e3vMGTnnR0sU4h8d1CcC7github.com/microsoft/go-mssqldb v1.0.0/go.mod h1:+4wZTUnz/SV6nffv+RRRB/ss8jPng5Sho2SmM1l2ts4=github.com/microsoft/go-mssqldb v1.9.8 h1:d4IFMvF/o+HdpXUqbBfzHvn/NlFA75YGcfHUUvDFJEM=github.com/microsoft/go-mssqldb v1.9.8/go.mod h1:eGSRSGAW4hKMy5YcAenhCDjIRm2rhqIdmmwgciMzLus=+github.com/miekg/dns v1.1.57 h1:Jzi7ApEIzwEPLHWRcafCN9LZSBbqQpxjt/wpgvg7wcM=github.com/miekg/dns v1.1.57/go.mod h1:uqRjCRUuEAA6qsOiJvDd+CFo/vW+y5WR6SNmHE55hZk=github.com/miekg/dns v1.1.62 h1:cN8OuEF1/x5Rq6Np+h1epln8OiyPWV+lROx9LxcGgIQ=github.com/miekg/dns v1.1.62/go.mod h1:mvDlcItzm+br7MToIKqkglaGhlFMHJ9DTNNWONWXbNQ=@@ -1530,9 +1546,12 @@ github.com/mndrix/tap-go v0.0.0-20171203230836-629fa407e90b/go.mod h1:pzzDgJWZ34github.com/moby/buildkit v0.26.2/go.mod h1:ylDa7IqzVJgLdi/wO7H1qLREFQpmhFbw2fbn4yoTw40=github.com/moby/buildkit v0.26.3/go.mod h1:4T4wJzQS4kYWIfFRjsbJry4QoxDBjK+UGOEOs1izL7w=github.com/moby/buildkit v0.27.0/go.mod h1:4STUkNc5t1nf03HS+01UmI2X6FdfOI3XaKt9QNoTsms=+github.com/moby/buildkit v0.31.1 h1:j3p55abBl4kiXXPZgYX+6zWgB2aefqHXoPown12fIzU=github.com/moby/go-archive v0.1.0/go.mod h1:G9B+YoujNohJmrIYFBpSd54GTUB4lt9S+xVQvsJyFuo=github.com/moby/moby/api v1.52.0/go.mod h1:8mb+ReTlisw4pS6BRzCMts5M49W5M7bKt1cJy/YbAqc=+github.com/moby/moby/api v1.54.2/go.mod h1:+RQ6wluLwtYaTd1WnPLykIDPekkuyD/ROWQClE83pzs=github.com/moby/moby/client v0.2.1/go.mod h1:O+/tw5d4a1Ha/ZA/tPxIZJapJRUS6LNZ1wiVRxYHyUE=+github.com/moby/moby/client v0.4.1/go.mod h1:z52C9O2POPOsnxZAy//WtKcQ32P+jT/NGeXu/7nfjGQ=github.com/moby/patternmatcher v0.5.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc=github.com/moby/policy-helpers v0.0.0-20251105011237-bcaa71c99f14 h1:JO22uXMy3CN7wh7A/wrtYQWV1WYQMg2gh6d8YO325k4=github.com/moby/policy-helpers v0.0.0-20251105011237-bcaa71c99f14/go.mod h1:HJfK0E8dR+Jpk5anJ3oADg2dRSom1gJK17sqEiiMS7w=@@ -1553,6 +1572,7 @@ github.com/moby/sys/mount v0.3.5-0.20260529155943-fc52b7222d0b h1:RB/940R3dFkU1fgithub.com/moby/sys/mount v0.3.5-0.20260529155943-fc52b7222d0b/go.mod h1:WUQDO+/uCiCIkIztx8SrwIDVn2dtMFRBebRhpDFT71M=github.com/moby/sys/reexec v0.1.0 h1:RrBi8e0EBTLEgfruBOFcxtElzRGTEUkeIFaVXgU7wok=github.com/moby/sys/reexec v0.1.0/go.mod h1:EqjBg8F3X7iZe5pU6nRZnYCMUTXoxsjiIfHup5wYIN8=+github.com/moby/sys/sequential v0.6.0/go.mod h1:uyv8EUTrca5PnDsdMGXhZe6CCe8U/UiTWd+lL+7b/Ko=github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=@@ -1827,6 +1847,7 @@ github.com/spiffe/go-spiffe/v2 v2.6.0 h1:l+DolpxNWYgruGQVV0xsfeya3CsC7m8iBzDnMpsgithub.com/spiffe/go-spiffe/v2 v2.6.0/go.mod h1:gm2SeUoMZEtpnzPNs2Csc0D/gX33k1xIx7lEzqblHEs=github.com/stefanberger/go-pkcs11uri v0.0.0-20230803200340-78284954bff6 h1:pnnLyeX7o/5aX8qUQ69P/mLojDqwda8hFOCBTmP/6hw=github.com/stefanberger/go-pkcs11uri v0.0.0-20230803200340-78284954bff6/go.mod h1:39R/xuhNgVhi+K0/zst4TLrJrVmbm6LVgl4A0+ZFS5M=+github.com/stoewer/go-strcase v1.3.0 h1:g0eASXYtp+yvN9fK8sH94oCIk0fau9uV1/ZdJ0AVEzs=github.com/stoewer/go-strcase v1.3.0/go.mod h1:fAH5hQ5pehh+j3nZfvwdk2RgEgQjAoM8wodgtPmh1xo=github.com/stoewer/go-strcase v1.3.1 h1:iS0MdW+kVTxgMoE1LAZyMiYJFKlOzLooE4MxjirtkAs=github.com/stoewer/go-strcase v1.3.1/go.mod h1:fAH5hQ5pehh+j3nZfvwdk2RgEgQjAoM8wodgtPmh1xo=@@ -1877,6 +1898,7 @@ github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75 h1:6fotK7github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75/go.mod h1:KO6IkyS8Y3j8OdNO85qEYBsRPuteD+YciPomcXdrMnk=github.com/tomasen/realip v0.0.0-20180522021738-f0c99a92ddce h1:fb190+cK2Xz/dvi9Hv8eCYJYvIGUTN2/KLq1pT6CjEc=github.com/tomasen/realip v0.0.0-20180522021738-f0c99a92ddce/go.mod h1:o8v6yHRoik09Xen7gje4m9ERNah1d1PPsVq1VEx9vE4=+github.com/tonistiigi/fsutil v0.0.0-20260609091201-0257b3308df4/go.mod h1:K5zrLch9UaSGNiek5XHZeqZUf1zPWJHqDfLIcnpquQ4=github.com/tonistiigi/go-actions-cache v0.0.0-20250626083717-378c5ed1ddd9 h1:GWuTlpuUQBaK6u0R3HwE+eWaQ2aXwHgo8CaXgqtDQZU=github.com/tonistiigi/go-actions-cache v0.0.0-20250626083717-378c5ed1ddd9/go.mod h1:cD0SB2270BYw6HYKriFn4H6NRLhGj6ytf48YTpsm8LY=github.com/tonistiigi/go-actions-cache v0.0.0-20260120203934-54bc28c26fd2 h1:5p6hffZeB25G4rhBc3HU6x1aIlyDELfib+/Omq+ZfQA=@@ -1899,6 +1921,7 @@ github.com/ulikunitz/xz v0.5.15 h1:9DNdB5s+SgV3bQ2ApL10xRc35ck0DuIX/isZvIk+ubY=github.com/ulikunitz/xz v0.5.15/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=github.com/uptrace/bunrouter v1.0.23 h1:Bi7NKw3uCQkcA/GUCtDNPq5LE5UdR9pe+UyWbjHB/wU=github.com/uptrace/bunrouter v1.0.23/go.mod h1:O3jAcl+5qgnF+ejhgkmbceEk0E/mqaK+ADOocdNpY8M=+github.com/urfave/cli v1.22.16 h1:MH0k6uJxdwdeWQTwhSO42Pwr4YLrNLwBtg1MRgTqPdQ=github.com/urfave/cli v1.22.16/go.mod h1:EeJR6BKodywf4zciqrdw6hpCPk68JO9z5LazXZMn5Po=github.com/urfave/cli v1.22.17 h1:SYzXoiPfQjHBbkYxbew5prZHS1TOLT3ierW8SYLqtVQ=github.com/urfave/cli v1.22.17/go.mod h1:b0ht0aqgH/6pBYzzxURyrM4xXNgsoT/n2ZzwQiEhNVo=@@ -1925,6 +1948,7 @@ github.com/vbauerster/mpb/v8 v8.12.0 h1:+gneY3ifzc88tKDzOtfG8k8gfngCx615S2ZmFM4lgithub.com/vbauerster/mpb/v8 v8.12.0/go.mod h1:V02YIuMVo301Y1VE9VtZlD8s84OMsk+EKN6mwvf/588=github.com/vektah/gqlparser/v2 v2.5.30 h1:EqLwGAFLIzt1wpx1IPpY67DwUujF1OfzgEyDsLrN6kE=github.com/vektah/gqlparser/v2 v2.5.30/go.mod h1:D1/VCZtV3LPnQrcPBeR/q5jkSQIPti0uYCP/RI0gIeo=+github.com/veraison/go-cose v1.1.0 h1:AalPS4VGiKavpAzIlBjrn7bhqXiXi4jbMYY/2+UC+4o=github.com/veraison/go-cose v1.1.0/go.mod h1:7ziE85vSq4ScFTg6wyoMXjucIGOf4JkFEZi/an96Ct4=github.com/veraison/go-cose v1.3.0 h1:2/H5w8kdSpQJyVtIhx8gmwPJ2uSz1PkyWFx0idbd7rk=github.com/veraison/go-cose v1.3.0/go.mod h1:df09OV91aHoQWLmy1KsDdYiagtXgyAwAl8vFeFn1gMc=@@ -1990,7 +2014,9 @@ github.com/ysmood/gson v0.7.3 h1:QFkWbTH8MxyUTKPkVWAENJhxqdBa4lYTQWqZCiLG6kE=github.com/ysmood/gson v0.7.3/go.mod h1:3Kzs5zDl21g5F/BlLTNcuAGAYLKt2lV5G8D1zF3RNmg=github.com/ysmood/leakless v0.9.0 h1:qxCG5VirSBvmi3uynXFkcnLMzkphdh3xx5FtrORwDCU=github.com/ysmood/leakless v0.9.0/go.mod h1:R8iAXPRaG97QJwqxs74RdwzcRHT1SWCGTNqY8q0JvMQ=+github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=github.com/yuin/goldmark v1.2.1 h1:ruQGxdhGHe7FWOJPT0mKs5+pD2Xs1Bm/kdGlHO04FmM=+github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=github.com/yuin/goldmark v1.4.13 h1:fVcFKWvrslecOb/tg+Cc05dkeYx540o0FuFt3nUVDoE=@@ -2049,12 +2075,11 @@ go.etcd.io/gofail v0.2.0 h1:p19drv16FKK345a09a1iubchlw/vmRuksmRzgBIGjcA=go.etcd.io/gofail v0.2.0/go.mod h1:nL3ILMGfkXTekKI3clMBNazKnjUZjYLKmBHzsVAnC1o=go.etcd.io/raft/v3 v3.6.0 h1:5NtvbDVYpnfZWcIHgGRk9DyzkBIXOi8j+DDp1IcnUWQ=go.etcd.io/raft/v3 v3.6.0/go.mod h1:nLvLevg6+xrVtHUmVaTcTz603gQPHfh7kUAwV6YpfGo=+go.getarcane.app/builds v0.1.0/go.mod h1:3g7+969+qWH33EXnA+nu5MKhs72JYDPf9Q/OtYO6CIA=go.getarcane.app/updater v0.3.6 h1:+BqoycaRsHj+cLVSzcYQuqbHxUKbtmaozMNblz5bVSw=go.getarcane.app/updater v0.3.6/go.mod h1:2ENitZR/lA5MuBn60OZYR5wvU3ZCE+pAgfrebfOlRDA=go.getarcane.app/updater v0.3.7 h1:WqHsxudvt8gvCR7iSHdxdzwH0+hM0FAh64bSypBX9Mo=go.getarcane.app/updater v0.3.7/go.mod h1:9RZOKaBbpUJfVA4Q9/jvqtjvWBwCnVw0OkPeQCnqAAo=-go.getarcane.app/updater v0.4.0 h1:ZVXZ8N/sXDZq7/0VvB8JMwtbwNpGqrswLDjESimL8mw=-go.getarcane.app/updater v0.4.0/go.mod h1:Pqz4cI9nePA6abdZzfESZPxQC5jWVoiWKqcgX+pDkAk=go.mongodb.org/mongo-driver v1.7.5 h1:ny3p0reEpgsR2cfA5cjgwFZg3Cv/ofFh/8jbhGtz9VI=go.mongodb.org/mongo-driver v1.7.5/go.mod h1:VXEWRZ6URJIkUq2SCAyapmhH0ZLRBP+FT4xhp5Zvxng=go.mongodb.org/mongo-driver v1.17.6 h1:87JUG1wZfWsr6rIz3ZmpH90rL5tea7O3IHuSwHUpsss=@@ -2071,6 +2096,7 @@ go.opentelemetry.io/contrib/detectors/gcp v1.42.0/go.mod h1:W9zQ439utxymRrXsUOzZgo.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0/go.mod h1:rg+RlpR5dKwaS95IyyZqj5Wd4E13lk/msnTS0Xl9lJM=go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0/go.mod h1:snMWehoOh2wsEwnvvwtDyFCxVeDAODenXHtn5vzrKjo=go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.67.0/go.mod h1:NoUCKYWK+3ecatC4HjkRktREheMeEtrXoQxrqYFeHSc=+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.68.0/go.mod h1:Sje3i3MjSPKTSPvVWCaL8ugBzJwik3u4smCjUeuupqg=go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0/go.mod h1:69uWxva0WgAA/4bu2Yy70SLDBwZXuQ6PbBpbsa5iZrQ=go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0/go.mod h1:UHB22Z8QsdRDrnAtX4PntOl36ajSxcdUMt1sF7Y6E7Q=go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0/go.mod h1:h06DGIukJOevXaj/xrNjhi/2098RZzcLTbc0jDAUbsg=@@ -2091,11 +2117,14 @@ go.opentelemetry.io/otel/exporters/jaeger v1.17.0 h1:D7UpUy2Xc2wsi1Ras6V40q806WMgo.opentelemetry.io/otel/exporters/jaeger v1.17.0/go.mod h1:nPCqOnEH9rNLKqH/+rrUjiMzHJdV1BlpKcTwRTyKkKI=go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.35.0/go.mod h1:zjPK58DtkqQFn+YUMbx0M2XV3QgKU0gS9LeGohREyK4=go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0/go.mod h1:ri3aaHSmCTVYu2AWv44YMauwAQc0aqI9gHKIcSbI1pU=+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.43.0/go.mod h1:Vl1/iaggsuRlrHf/hfPJPvVag77kKyvrLeD10kpMl+A=go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.35.0/go.mod h1:LjReUci/F4BUyv+y4dwnq3h/26iNOeC3wAIqgvTIZVo=go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.38.0/go.mod h1:Kz/oCE7z5wuyhPxsXDuaPteSWqjSBD5YaSdbxZYGbGk=+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.43.0/go.mod h1:AGmbycVGEsRx9mXMZ75CsOyhSP6MFIcj/6dnG+vhVjk=go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.33.0/go.mod h1:wAy0T/dUbs468uOlkT31xjvqQgEVXv58BRFWEgn5v/0=go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.35.0/go.mod h1:u5BF1xyjstDowA1R5QAO9JHzqK+ublenEW/dyqTjBVk=go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.38.0/go.mod h1:kldtb7jDTeol0l3ewcmd8SDvx3EmIE7lyvqbasU3QC4=+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.43.0/go.mod h1:/G+nUPfhq2e+qiXMGxMwumDrP5jtzU+mWN7/sjT2rak=go.opentelemetry.io/otel/exporters/prometheus v0.42.0 h1:jwV9iQdvp38fxXi8ZC+lNpxjK16MRcZlpDYvbuO1FiA=go.opentelemetry.io/otel/exporters/prometheus v0.42.0/go.mod h1:f3bYiqNqhoPxkvI2LrXqQVC546K7BuRDL/kKuxkujhA=go.opentelemetry.io/otel/exporters/prometheus v0.60.0 h1:cGtQxGvZbnrWdC2GyjZi0PDKVSLWP/Jocix3QWfXtbo=@@ -2152,9 +2181,12 @@ go.uber.org/multierr v1.9.0 h1:7fIwc/ZtS0q++VgcfqFDxSBZVv/Xo49/SYnDFupUwlI=go.uber.org/multierr v1.9.0/go.mod h1:X2jQV1h+kxSjClGpnseKVIxpmcjrj7MNnI0bnlfKTVQ=go.uber.org/zap v1.21.0 h1:WefMeulhovoZ2sYXz7st6K0sLj7bBhpiFaud4r4zST8=go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw=+go.uber.org/zap v1.27.1 h1:08RqriUEv8+ArZRYSTXy1LeBScaMpVSTBhCeaZYfMYc=+go.uber.org/zap v1.27.1/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=go.uber.org/zap v1.28.0 h1:IZzaP1Fv73/T/pBMLk4VutPl36uNC+OSUh3JLG3FIjo=go.uber.org/zap v1.28.0/go.mod h1:rDLpOi171uODNm/mxFcuYWxDsqWSAVkFdX4XojSKg/Q=go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU=+go.yaml.in/yaml/v2 v2.4.3/go.mod h1:zSxWcmIDjOzPXpjlTTbAsKokqkDNAVtZO0WOMiT90s8=go.yaml.in/yaml/v3 v3.0.3/go.mod h1:tBHosrYAkRZjRAOREWbDnBXUf08JOwYq++0QNwQiWzI=gocloud.dev v0.45.0 h1:WknIK8IbRdmynDvara3Q7G6wQhmEiOGwpgJufbM39sY=gocloud.dev v0.45.0/go.mod h1:0kXKmkCLG6d31N7NyLZWzt7jDSQura9zD/mWgiB6THI=@@ -2163,6 +2195,9 @@ golang.org/x/arch v0.24.0/go.mod h1:dNHoOeKiyja7GTvF9NJS1l3Z2yntpQNzgrjh1cU103A=golang.org/x/arch v0.25.0 h1:qnk6Ksugpi5Bz32947rkUgDt9/s5qvqDPl/gBKdMJLE=golang.org/x/arch v0.25.0/go.mod h1:0X+GdSIP+kL5wPmpK7sdkEVTt2XoYP0cSjQSbZBwOi8=golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=@@ -2190,9 +2225,12 @@ golang.org/x/image v0.25.0 h1:Y6uW6rH1y5y/LK1J8BPWZtr6yZ7hrsy6hFrXjgsc2fQ=golang.org/x/image v0.25.0/go.mod h1:tCAmOEGthTtkalusGp1g3xa2gke8J6c2N565dTyl9Rs=golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3 h1:XQyxROzUlZH+WIQwySDgnISgOivlhjIEwaQaJEJrrN0=golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=golang.org/x/lint v0.0.0-20190930215403-16217165b5de h1:5hukYrvBGR8/eNkX5mdUezrA6JiaEZDtJb9Ei+1LlBs=golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=+golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=+golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=@@ -2219,8 +2257,12 @@ golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rgolang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=+golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=+golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=@@ -2264,6 +2306,9 @@ golang.org/x/oauth2 v0.35.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEgolang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=+golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=@@ -2285,12 +2330,15 @@ golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hgolang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=@@ -2368,6 +2416,8 @@ golang.org/x/term v0.38.0/go.mod h1:bSEAKrOT1W+VSu9TSCMtoGEOUcKxOKgl3LE5QEF/xVg=golang.org/x/term v0.39.0/go.mod h1:yxzUCTP/U+FzoxfdKmLaA0RV1WgE0VY7hXBwKtY/4ww=golang.org/x/term v0.42.0/go.mod h1:Dq/D+snpsbazcBG5+F9Q1n2rXV8Ma+71xEjTRufARgY=golang.org/x/term v0.43.0/go.mod h1:lrhlHNdQJHO+1qVYiHfFKVuVioJIheAc3fBSMFYEIsk=+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=@@ -2399,7 +2449,10 @@ golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=+golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=+golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=golang.org/x/tools v0.1.8/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU=@@ -2425,6 +2478,10 @@ golang.org/x/tools/go/packages/packagestest v0.1.1-deprecated h1:1h2MnaIAIXISqTFgolang.org/x/tools/go/packages/packagestest v0.1.1-deprecated/go.mod h1:RVAQXBGNv1ib0J382/DPCRS/BPnsGebyM1Gj5VSDpG8=golang.org/x/tools/godoc v0.1.0-deprecated h1:o+aZ1BOj6Hsx/GBdJO/s815sqftjSnrZZwyYTHODvtk=golang.org/x/tools/godoc v0.1.0-deprecated/go.mod h1:qM63CriJ961IHWmnWa9CjZnBndniPt4a3CK0PVB9bIg=+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSmiC7MMxXNOb3PU/VUEz+EhU=golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90=diff --git a/types/builds/builds.go b/types/builds/builds.godeleted file mode 100644index 3815ca9df..000000000--- a/types/builds/builds.go+++ /dev/null@@ -1,41 +0,0 @@-package builds--import (- "context"- "io"-- imagetypes "github.com/getarcaneapp/arcane/types/v2/image"- dockerregistry "github.com/moby/moby/api/types/registry"- dockerclient "github.com/moby/moby/client"-)--type BuildSettings struct {- DepotProjectId string- DepotToken string- BuildProvider string- BuildTimeoutSecs int-}--type SettingsProvider interface {- BuildSettings() BuildSettings-}--type DockerClientProvider interface {- GetClient(ctx context.Context) (*dockerclient.Client, error)-}--type RegistryAuthProvider interface {- GetRegistryAuthForImage(ctx context.Context, imageRef string) (string, error)- GetRegistryAuthForHost(ctx context.Context, registryHost string) (string, error)- GetAllRegistryAuthConfigs(ctx context.Context) (map[string]dockerregistry.AuthConfig, error)-}--type Builder interface {- BuildImage(ctx context.Context, req imagetypes.BuildRequest, progressWriter io.Writer, serviceName string) (*imagetypes.BuildResult, error)-}--type LogCapture interface {- io.Writer- String() string- Truncated() bool-}diff --git a/types/image/image.go b/types/image/image.goindex b84f3d3a0..0e9406f80 100644--- a/types/image/image.go+++ b/types/image/image.go@@ -285,144 +285,6 @@ type LoadResult struct {Stream string `json:"stream"`}-// ProgressDetail provides byte progress information for stream events.-type ProgressDetail struct {- Current int64 `json:"current,omitempty"`- Total int64 `json:"total,omitempty"`-}--// ProgressEvent is the standardized NDJSON envelope for pull/build/deploy streams.-type ProgressEvent struct {- Type string `json:"type,omitempty"` // pull|build|deploy- Phase string `json:"phase,omitempty"` // begin|complete|... (optional)- Service string `json:"service,omitempty"`- Status string `json:"status,omitempty"`- ID string `json:"id,omitempty"`- ProgressDetail *ProgressDetail `json:"progressDetail,omitempty"`- Error string `json:"error,omitempty"`-}--// BuildRequest contains options for building an image with BuildKit.-type BuildRequest struct {- // ContextDir is the build context source.- // This can be a local server directory or a supported Git URL.- //- // Required: true- ContextDir string `json:"contextDir" minLength:"1" doc:"Build context directory or Git URL"`-- // Dockerfile is the path to the Dockerfile (relative to context or absolute).- //- // Required: false- Dockerfile string `json:"dockerfile,omitempty" doc:"Dockerfile path"`-- // DockerfileInline is the inline Dockerfile content staged into the build context.- //- // Required: false- DockerfileInline string `json:"dockerfileInline,omitempty" doc:"Inline Dockerfile content"`-- // Tags are image tags to apply.- //- // Required: false- Tags []string `json:"tags,omitempty" doc:"Image tags"`-- // Target is the Dockerfile target stage.- //- // Required: false- Target string `json:"target,omitempty" doc:"Target stage"`-- // BuildArgs are build arguments to pass to the Dockerfile.- //- // Required: false- BuildArgs map[string]string `json:"buildArgs,omitempty" doc:"Build arguments"`-- // Labels are image metadata labels applied at build time.- //- // Required: false- Labels map[string]string `json:"labels,omitempty" doc:"Build labels"`-- // CacheFrom defines cache sources to use during build.- //- // Required: false- CacheFrom []string `json:"cacheFrom,omitempty" doc:"Build cache sources"`-- // CacheTo defines cache export targets from build outputs.- //- // Required: false- CacheTo []string `json:"cacheTo,omitempty" doc:"Build cache targets"`-- // NoCache disables layer cache usage for Dockerfile instructions.- //- // Required: false- NoCache bool `json:"noCache,omitempty" doc:"Disable build cache"`-- // Pull forces pulling referenced base images.- //- // Required: false- Pull bool `json:"pull,omitempty" doc:"Always pull referenced base images"`-- // Network sets the build-time network mode for RUN instructions.- //- // Required: false- Network string `json:"network,omitempty" doc:"Build network mode"`-- // Isolation sets platform-specific container isolation mode during build.- //- // Required: false- Isolation string `json:"isolation,omitempty" doc:"Build isolation mode"`-- // ShmSize sets /dev/shm size in bytes for build containers.- //- // Required: false- ShmSize int64 `json:"shmSize,omitempty" doc:"Build shared memory size in bytes"`-- // Ulimits configures ulimit values for build containers.- //- // Required: false- Ulimits map[string]string `json:"ulimits,omitempty" doc:"Build ulimits"`-- // Entitlements sets extra BuildKit entitlements allowed for the build.- //- // Required: false- Entitlements []string `json:"entitlements,omitempty" doc:"Build entitlements"`-- // Privileged enables elevated build privileges where supported.- //- // Required: false- Privileged bool `json:"privileged,omitempty" doc:"Enable privileged build"`-- // ExtraHosts adds host-to-IP mappings at build time.- //- // Required: false- ExtraHosts []string `json:"extraHosts,omitempty" doc:"Build extra host mappings"`-- // Platforms are target platforms (e.g., linux/amd64,linux/arm64).- //- // Required: false- Platforms []string `json:"platforms,omitempty" doc:"Target platforms"`-- // Push controls whether the image should be pushed to a registry.- //- // Required: false- Push bool `json:"push,omitempty" doc:"Push image"`-- // Load controls whether the image should be loaded into the local Docker daemon.- //- // Required: false- Load bool `json:"load,omitempty" doc:"Load image into local Docker"`-- // Provider overrides the build provider (local|depot).- //- // Required: false- Provider string `json:"provider,omitempty" doc:"Build provider override"`-}--// BuildResult provides basic build output metadata.-type BuildResult struct {- Provider string `json:"provider"`- Tags []string `json:"tags,omitempty"`- Digest string `json:"digest,omitempty"`-}-type DetailSummary struct {// ID is the unique identifier of the image.//