Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
feat: image build support (#1687)
Kyle Mendell25383559dd76
diff --git a/Justfile b/Justfileindex 55879d83b..d03266d4e 100644--- a/Justfile+++ b/Justfile@@ -992,6 +992,39 @@ _fix-all:fix target="all":@just "_fix-{{ target }}"+# Run go mod tidy in backend module+[group('gomod')]+_gomod-tidy-backend:+ cd backend && go mod tidy++# Run go mod tidy in CLI module+[group('gomod')]+_gomod-tidy-cli:+ cd cli && go mod tidy++# Run go mod tidy in types module+[group('gomod')]+_gomod-tidy-types:+ cd types && go mod tidy++# Run go mod tidy in all Go modules+[group('gomod')]+_gomod-tidy-go: _gomod-tidy-backend _gomod-tidy-cli _gomod-tidy-types++[group('gomod')]+_gomod-tidy-all:+ @just _gomod-tidy-go+ go work sync++[group('gomod')]+_gomod-sync-all:+ go work sync++# Go module targets. Valid: "tidy [backend|cli|types|go|all]", "sync all".+[group('gomod')]+gomod action="tidy" target="all":+ @just "_gomod-{{ action }}-{{ target }}"+# Format frontend (Prettier) and Go modules (gofmt)[group('format')]_format-frontend:diff --git a/backend/cli/upgrade/upgrade.go b/backend/cli/upgrade/upgrade.goindex 6d75d3bd6..b4bbafa02 100644--- a/backend/cli/upgrade/upgrade.go+++ b/backend/cli/upgrade/upgrade.go@@ -3,7 +3,6 @@ package upgradeimport ("context""fmt"- "io""log/slog""strings""time"@@ -328,9 +327,7 @@ func pullImage(ctx context.Context, dockerClient *client.Client, imageName strin}defer func() { _ = reader.Close() }()- // Copy output to discard but wait for completion- _, err = io.Copy(io.Discard, reader)- return err+ return docker.ConsumeJSONMessageStream(reader, nil)}func upgradeContainer(ctx context.Context, dockerClient *client.Client, oldContainer container.InspectResponse, newImage string) error {diff --git a/backend/go.mod b/backend/go.modindex 93f13f4ce..63c28e9e1 100644--- a/backend/go.mod+++ b/backend/go.mod@@ -10,6 +10,7 @@ require (github.com/containerd/errdefs v1.0.0github.com/coreos/go-oidc/v3 v3.17.0github.com/danielgtaylor/huma/v2 v2.37.2+ github.com/depot/depot-go v0.5.2github.com/docker/cli v29.2.1+incompatiblegithub.com/docker/compose/v5 v5.1.0github.com/docker/distribution v2.8.3+incompatible@@ -29,9 +30,12 @@ require (github.com/jinzhu/copier v0.4.0github.com/joho/godotenv v1.5.1github.com/lmittmann/tint v1.1.3+ github.com/moby/buildkit v0.27.1+ github.com/moby/go-archive v0.2.0github.com/moby/moby/api v1.53.0github.com/moby/moby/client v0.2.2github.com/nicholas-fedor/shoutrrr v0.13.2+ github.com/opencontainers/image-spec v1.1.1github.com/orandin/slog-gorm v1.4.0github.com/robfig/cron/v3 v3.0.1github.com/samber/slog-gin v1.21.0@@ -52,6 +56,7 @@ require ()require (+ connectrpc.com/connect v1.16.1 // indirectdario.cat/mergo v1.0.2 // indirectgithub.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirectgithub.com/DefangLabs/secret-detector v0.0.0-20250811234530-d4b4214cd679 // indirect@@ -73,6 +78,7 @@ require (github.com/containerd/errdefs/pkg v0.3.0 // indirectgithub.com/containerd/log v0.1.0 // indirectgithub.com/containerd/platforms v1.0.0-rc.2 // indirect+ github.com/containerd/stargz-snapshotter/estargz v0.18.1 // indirectgithub.com/containerd/ttrpc v1.2.7 // indirectgithub.com/containerd/typeurl/v2 v2.2.3 // indirectgithub.com/cyphar/filepath-securejoin v0.6.0 // indirect@@ -111,6 +117,7 @@ require (github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirectgithub.com/grpc-ecosystem/grpc-gateway/v2 v2.27.3 // indirectgithub.com/hashicorp/errwrap v1.1.0 // indirect+ github.com/hashicorp/go-cleanhttp v0.5.2 // indirectgithub.com/hashicorp/go-multierror v1.1.1 // indirectgithub.com/hashicorp/go-version v1.8.0 // indirectgithub.com/in-toto/in-toto-golang v0.9.0 // indirect@@ -137,9 +144,7 @@ require (github.com/mattn/go-shellwords v1.0.12 // indirectgithub.com/mattn/go-sqlite3 v1.14.32 // indirectgithub.com/mitchellh/hashstructure/v2 v2.0.2 // indirect- github.com/moby/buildkit v0.27.1 // 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 // indirectgithub.com/moby/patternmatcher v0.6.0 // indirectgithub.com/moby/sys/atomicwriter v0.1.0 // indirect@@ -155,7 +160,6 @@ require (github.com/morikuni/aec v1.1.0 // indirectgithub.com/ncruces/go-strftime v0.1.9 // indirectgithub.com/opencontainers/go-digest v1.0.0 // indirect- github.com/opencontainers/image-spec v1.1.1 // indirectgithub.com/pelletier/go-toml v1.9.5 // indirectgithub.com/pelletier/go-toml/v2 v2.2.4 // indirectgithub.com/pjbgf/sha1cd v0.3.2 // indirectdiff --git a/backend/go.sum b/backend/go.sumindex ff5cd7d12..a8161c797 100644--- a/backend/go.sum+++ b/backend/go.sum@@ -1,3 +1,5 @@+connectrpc.com/connect v1.16.1 h1:rOdrK/RTI/7TVnn3JsVxt3n028MlTRwmK5Q4heSpjis=+connectrpc.com/connect v1.16.1/go.mod h1:XpZAduBQUySsb4/KO5JffORVkDI4B6/EYPi7N8xpNZw=cyphar.com/go-pathrs v0.2.1 h1:9nx1vOgwVvX1mNBWDu93+vaceedpbsDqo+XuBGL40b8=cyphar.com/go-pathrs v0.2.1/go.mod h1:y8f1EMG7r+hCuFf/rXsKqMJrJAUoADZGNh5/vZPKcGc=dario.cat/mergo v1.0.2 h1:85+piFYR1tMbRrLcDwR18y4UKJ3aH1Tbzi24VRW1TK8=@@ -77,9 +79,8 @@ github.com/containerd/platforms v1.0.0-rc.2 h1:0SPgaNZPVWGEi4grZdV8VRYQn78y+nm6agithub.com/containerd/platforms v1.0.0-rc.2/go.mod h1:J71L7B+aiM5SdIEqmd9wp6THLVRzJGXfNuWCZCllLA4=github.com/containerd/plugin v1.0.0 h1:c8Kf1TNl6+e2TtMHZt+39yAPDbouRH9WAToRjex483Y=github.com/containerd/plugin v1.0.0/go.mod h1:hQfJe5nmWfImiqT1q8Si3jLv3ynMUIBB47bQ+KexvO8=-github.com/containerd/stargz-snapshotter v0.17.0 h1:djNS4KU8ztFhLdEDZ1bsfzOiYuVHT6TgSU5qwRk+cNc=-github.com/containerd/stargz-snapshotter/estargz v0.17.0 h1:+TyQIsR/zSFI1Rm31EQBwpAA1ovYgIKHy7kctL3sLcE=-github.com/containerd/stargz-snapshotter/estargz v0.17.0/go.mod h1:s06tWAiJcXQo9/8AReBCIo/QxcXFZ2n4qfsRnpl71SM=+github.com/containerd/stargz-snapshotter/estargz v0.18.1 h1:cy2/lpgBXDA3cDKSyEfNOFMA/c10O1axL69EU7iirO8=+github.com/containerd/stargz-snapshotter/estargz v0.18.1/go.mod h1:ALIEqa7B6oVDsrF37GkGN20SuvG/pIMm7FwP7ZmRb0Q=github.com/containerd/ttrpc v1.2.7 h1:qIrroQvuOL9HQ1X6KHe2ohc7p+HP/0VE6XPU7elJRqQ=github.com/containerd/ttrpc v1.2.7/go.mod h1:YCXHsb32f+Sq5/72xHubdiJRQY9inL4a4ZQrAbN1q9o=github.com/containerd/typeurl/v2 v2.2.3 h1:yNA/94zxWdvYACdYO8zofhrTVuQY73fFU1y++dYSw40=@@ -99,6 +100,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsgithub.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=+github.com/depot/depot-go v0.5.2 h1:mQHyy1tGdmMKnlmsThjAc9mU3NHGUUUyzmnkhyotV+E=+github.com/depot/depot-go v0.5.2/go.mod h1:QQtSqwRn0flx4KxrUVSJGlh0hTFeZ19MLYvOcJbxtP0=github.com/dhui/dktest v0.4.6 h1:+DPKyScKSEp3VLtbMDHcUq6V5Lm5zfZZVb0Sk7Ahom4=github.com/dhui/dktest v0.4.6/go.mod h1:JHTSYDtKkvFNFHJKqCzVzqXecyv+tKt8EzceOmQOgbU=github.com/digitorus/pkcs7 v0.0.0-20230818184609-3a137a874352 h1:ge14PCmCvPjpMQMIAH7uKg0lrtNSOdpYsRXlwk3QbaE=@@ -271,6 +274,8 @@ github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.3/go.mod h1:zQrxl1YP88HQlA6i9c63github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=+github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=+github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8=diff --git a/backend/internal/bootstrap/bootstrap.go b/backend/internal/bootstrap/bootstrap.goindex a82d139a4..db44ec780 100644--- a/backend/internal/bootstrap/bootstrap.go+++ b/backend/internal/bootstrap/bootstrap.go@@ -124,6 +124,10 @@ func initializeStartupState(appCtx context.Context, cfg *config.Config, appServislog.WarnContext(appCtx, "Failed to normalize projects directory", "error", err)}+ if err := appServices.Settings.NormalizeBuildsDirectory(appCtx); err != nil {+ slog.WarnContext(appCtx, "Failed to normalize builds directory", "error", err)+ }+if err := appServices.Environment.EnsureLocalEnvironment(appCtx, cfg.AppUrl); err != nil {slog.WarnContext(appCtx, "Failed to ensure local environment", "error", err)}diff --git a/backend/internal/bootstrap/jobs_bootstrap.go b/backend/internal/bootstrap/jobs_bootstrap.goindex b555a70e3..f426270bd 100644--- a/backend/internal/bootstrap/jobs_bootstrap.go+++ b/backend/internal/bootstrap/jobs_bootstrap.go@@ -7,6 +7,7 @@ import ("net/http""github.com/getarcaneapp/arcane/backend/internal/config"+ "github.com/getarcaneapp/arcane/backend/pkg/libarcane"pkg_scheduler "github.com/getarcaneapp/arcane/backend/pkg/scheduler")@@ -209,14 +210,14 @@ func setupSettingsCallbacks(lifecycleCtx context.Context, appServices *Services,// Only set up timeout sync callback on main instance (not in agent mode)if !appConfig.AgentMode {- appServices.Settings.OnTimeoutSettingsChanged = func(ctx context.Context, timeoutSettings map[string]string) {+ appServices.Settings.OnTimeoutSettingsChanged = func(ctx context.Context, timeoutSettings []libarcane.SettingUpdate) {go syncTimeoutSettingsToAgentsInternal(context.WithoutCancel(ctx), appServices, timeoutSettings)}}}// syncTimeoutSettingsToAgentsInternal syncs timeout settings to all connected remote environments-func syncTimeoutSettingsToAgentsInternal(ctx context.Context, appServices *Services, timeoutSettings map[string]string) {+func syncTimeoutSettingsToAgentsInternal(ctx context.Context, appServices *Services, timeoutSettings []libarcane.SettingUpdate) {envs, err := appServices.Environment.ListRemoteEnvironments(ctx)if err != nil {slog.WarnContext(ctx, "Failed to list remote environments for timeout sync", "error", err)@@ -228,13 +229,19 @@ func syncTimeoutSettingsToAgentsInternal(ctx context.Context, appServices *Servi}// Build the settings update payload- body, err := json.Marshal(timeoutSettings)+ settingsMap := make(map[string]string, len(timeoutSettings))+ keys := make([]string, 0, len(timeoutSettings))+ for _, update := range timeoutSettings {+ settingsMap[update.Key] = update.Value+ keys = append(keys, update.Key)+ }+ body, err := json.Marshal(settingsMap)if err != nil {slog.WarnContext(ctx, "Failed to marshal timeout settings for sync", "error", err)return}- slog.InfoContext(ctx, "Syncing timeout settings to remote environments", "count", len(envs), "settings", timeoutSettings)+ slog.InfoContext(ctx, "Syncing environment settings to remote environments", "count", len(envs), "keys", keys)for _, env := range envs {_, statusCode, err := appServices.Environment.ProxyRequest(ctx, env.ID, http.MethodPut, "/api/environments/0/settings", body)diff --git a/backend/internal/bootstrap/router_bootstrap.go b/backend/internal/bootstrap/router_bootstrap.goindex 610018d9a..1a7ef67af 100644--- a/backend/internal/bootstrap/router_bootstrap.go+++ b/backend/internal/bootstrap/router_bootstrap.go@@ -140,6 +140,8 @@ func setupRouter(ctx context.Context, cfg *config.Config, appServices *Services)Docker: appServices.Docker,Image: appServices.Image,ImageUpdate: appServices.ImageUpdate,+ Build: appServices.Build,+ BuildWorkspace: appServices.BuildWorkspace,Volume: appServices.Volume,Container: appServices.Container,Network: appServices.Network,diff --git a/backend/internal/bootstrap/services_bootstrap.go b/backend/internal/bootstrap/services_bootstrap.goindex 3252722db..de2b08174 100644--- a/backend/internal/bootstrap/services_bootstrap.go+++ b/backend/internal/bootstrap/services_bootstrap.go@@ -22,6 +22,8 @@ type Services struct {CustomizeSearch *services.CustomizeSearchServiceContainer *services.ContainerServiceImage *services.ImageService+ Build *services.BuildService+ BuildWorkspace *services.BuildWorkspaceServiceVolume *services.VolumeServiceNetwork *services.NetworkServiceImageUpdate *services.ImageUpdateService@@ -68,7 +70,9 @@ func initializeServices(ctx context.Context, db *database.DB, cfg *config.Configsvcs.Dashboard = services.NewDashboardService(db, svcs.Docker, svcs.Vulnerability)svcs.ImageUpdate = services.NewImageUpdateService(db, svcs.Settings, svcs.ContainerRegistry, svcs.Docker, svcs.Event, svcs.Notification)svcs.Image = services.NewImageService(db, svcs.Docker, svcs.ContainerRegistry, svcs.ImageUpdate, svcs.Vulnerability, svcs.Event)- svcs.Project = services.NewProjectService(db, svcs.Settings, svcs.Event, svcs.Image, svcs.Docker)+ svcs.Build = services.NewBuildService(db, svcs.Settings, svcs.Docker, svcs.ContainerRegistry)+ svcs.BuildWorkspace = services.NewBuildWorkspaceService(svcs.Settings)+ svcs.Project = services.NewProjectService(db, svcs.Settings, svcs.Event, svcs.Image, svcs.Docker, svcs.Build)svcs.Environment = services.NewEnvironmentService(db, httpClient, svcs.Docker, svcs.Event, svcs.Settings)svcs.Container = services.NewContainerService(db, svcs.Event, svcs.Docker, svcs.Image, svcs.Settings)svcs.Volume = services.NewVolumeService(db, svcs.Docker, svcs.Event, svcs.Settings, svcs.Container, svcs.Image, cfg.BackupVolumeName)diff --git a/backend/internal/common/errors.go b/backend/internal/common/errors.goindex 4b07d846d..5eeb26052 100644--- a/backend/internal/common/errors.go+++ b/backend/internal/common/errors.go@@ -94,6 +94,22 @@ func (e *ImageRetrievalError) Error() string {return "Failed to retrieve image"}+type BuildHistoryListError struct {+ Err error+}++func (e *BuildHistoryListError) Error() string {+ return "Failed to list build history"+}++type BuildHistoryRetrievalError struct {+ Err error+}++func (e *BuildHistoryRetrievalError) Error() string {+ return "Failed to retrieve build history"+}+type ContainerIDRequiredError struct{}func (e *ContainerIDRequiredError) Error() string {diff --git a/backend/internal/huma/handlers/build_workspaces.go b/backend/internal/huma/handlers/build_workspaces.gonew file mode 100644index 000000000..883d65478--- /dev/null+++ b/backend/internal/huma/handlers/build_workspaces.go@@ -0,0 +1,214 @@+package handlers++import (+ "context"+ "io"+ "path"++ "github.com/danielgtaylor/huma/v2"+ "github.com/getarcaneapp/arcane/backend/internal/services"+ "github.com/getarcaneapp/arcane/types/base"+ volumetypes "github.com/getarcaneapp/arcane/types/volume"+)++// BuildWorkspaceHandler provides file browsing endpoints for manual build workspaces.+type BuildWorkspaceHandler struct {+ service *services.BuildWorkspaceService+}++// RegisterBuildWorkspaces registers build workspace file browser routes.+func RegisterBuildWorkspaces(api huma.API, workspaceService *services.BuildWorkspaceService) {+ h := &BuildWorkspaceHandler{service: workspaceService}++ huma.Register(api, huma.Operation{+ OperationID: "builds-browse",+ Method: "GET",+ Path: "/environments/{id}/builds/browse",+ Summary: "Browse build workspace files",+ Description: "List files and directories under the builds workspace root",+ Tags: []string{"Builds"},+ Security: []map[string][]string{{"BearerAuth": {}}, {"ApiKeyAuth": {}}},+ }, h.BrowseDirectory)++ huma.Register(api, huma.Operation{+ OperationID: "builds-browse-content",+ Method: "GET",+ Path: "/environments/{id}/builds/browse/content",+ Summary: "Get build workspace file content",+ Description: "Read file content under the builds workspace root",+ Tags: []string{"Builds"},+ Security: []map[string][]string{{"BearerAuth": {}}, {"ApiKeyAuth": {}}},+ }, h.GetFileContent)++ huma.Register(api, huma.Operation{+ OperationID: "builds-browse-download",+ Method: "GET",+ Path: "/environments/{id}/builds/browse/download",+ Summary: "Download build workspace file",+ Description: "Download a file from the builds workspace root",+ Tags: []string{"Builds"},+ Security: []map[string][]string{{"BearerAuth": {}}, {"ApiKeyAuth": {}}},+ }, h.DownloadFile)++ huma.Register(api, huma.Operation{+ OperationID: "builds-browse-upload",+ Method: "POST",+ Path: "/environments/{id}/builds/browse/upload",+ Summary: "Upload build workspace file",+ Description: "Upload a file into the builds workspace root",+ Tags: []string{"Builds"},+ Security: []map[string][]string{{"BearerAuth": {}}, {"ApiKeyAuth": {}}},+ }, h.UploadFile)++ huma.Register(api, huma.Operation{+ OperationID: "builds-browse-mkdir",+ Method: "POST",+ Path: "/environments/{id}/builds/browse/mkdir",+ Summary: "Create build workspace directory",+ Description: "Create a directory under the builds workspace root",+ Tags: []string{"Builds"},+ Security: []map[string][]string{{"BearerAuth": {}}, {"ApiKeyAuth": {}}},+ }, h.CreateDirectory)++ huma.Register(api, huma.Operation{+ OperationID: "builds-browse-delete",+ Method: "DELETE",+ Path: "/environments/{id}/builds/browse",+ Summary: "Delete build workspace file",+ Description: "Delete a file or directory under the builds workspace root",+ Tags: []string{"Builds"},+ Security: []map[string][]string{{"BearerAuth": {}}, {"ApiKeyAuth": {}}},+ }, h.DeleteFile)+}++type BrowseBuildsInput struct {+ EnvironmentID string `path:"id" doc:"Environment ID"`+ Path string `query:"path" default:"/" doc:"Directory path to browse"`+}++type BrowseBuildsOutput struct {+ Body base.ApiResponse[[]volumetypes.FileEntry]+}++type GetBuildFileContentInput struct {+ EnvironmentID string `path:"id" doc:"Environment ID"`+ Path string `query:"path" doc:"File path"`+ MaxBytes int64 `query:"maxBytes" default:"1048576" doc:"Maximum bytes to read (default 1MB)"`+}++type BuildFileContentResponse struct {+ Content []byte `json:"content"`+ MimeType string `json:"mimeType"`+}++type GetBuildFileContentOutput struct {+ Body base.ApiResponse[BuildFileContentResponse]+}++type DownloadBuildFileInput struct {+ EnvironmentID string `path:"id" doc:"Environment ID"`+ Path string `query:"path" doc:"File path"`+}++type DownloadBuildFileOutput struct {+ ContentType string `header:"Content-Type"`+ ContentDisposition string `header:"Content-Disposition"`+ ContentLength int64 `header:"Content-Length"`+ Body io.ReadCloser+}++type UploadBuildFileInput struct {+ EnvironmentID string `path:"id" doc:"Environment ID"`+ Path string `query:"path" default:"/" doc:"Destination path"`+ File huma.FormFile `form:"file" doc:"File to upload"`+}++type CreateBuildDirectoryInput struct {+ EnvironmentID string `path:"id" doc:"Environment ID"`+ Path string `query:"path" doc:"Directory path to create"`+}++type DeleteBuildFileInput struct {+ EnvironmentID string `path:"id" doc:"Environment ID"`+ Path string `query:"path" doc:"File or directory path to delete"`+}++func (h *BuildWorkspaceHandler) BrowseDirectory(ctx context.Context, input *BrowseBuildsInput) (*BrowseBuildsOutput, error) {+ if h.service == nil {+ return nil, huma.Error500InternalServerError("service not available")+ }+ entries, err := h.service.ListDirectory(ctx, input.Path)+ if err != nil {+ return nil, huma.Error500InternalServerError(err.Error())+ }+ return &BrowseBuildsOutput{Body: base.ApiResponse[[]volumetypes.FileEntry]{Success: true, Data: entries}}, nil+}++func (h *BuildWorkspaceHandler) GetFileContent(ctx context.Context, input *GetBuildFileContentInput) (*GetBuildFileContentOutput, error) {+ if h.service == nil {+ return nil, huma.Error500InternalServerError("service not available")+ }+ content, mimeType, err := h.service.GetFileContent(ctx, input.Path, input.MaxBytes)+ if err != nil {+ return nil, huma.Error500InternalServerError(err.Error())+ }+ return &GetBuildFileContentOutput{Body: base.ApiResponse[BuildFileContentResponse]{+ Success: true,+ Data: BuildFileContentResponse{Content: content, MimeType: mimeType},+ }}, nil+}++func (h *BuildWorkspaceHandler) DownloadFile(ctx context.Context, input *DownloadBuildFileInput) (*DownloadBuildFileOutput, error) {+ if h.service == nil {+ return nil, huma.Error500InternalServerError("service not available")+ }+ reader, size, err := h.service.DownloadFile(ctx, input.Path)+ if err != nil {+ return nil, huma.Error500InternalServerError(err.Error())+ }+ return &DownloadBuildFileOutput{+ ContentType: "application/octet-stream",+ ContentDisposition: "attachment; filename=" + path.Base(input.Path),+ ContentLength: size,+ Body: reader,+ }, nil+}++func (h *BuildWorkspaceHandler) UploadFile(ctx context.Context, input *UploadBuildFileInput) (*base.ApiResponse[base.MessageResponse], error) {+ if h.service == nil {+ return nil, huma.Error500InternalServerError("service not available")+ }+ if err := h.service.UploadFile(ctx, input.Path, input.File, input.File.Filename); err != nil {+ return nil, huma.Error500InternalServerError(err.Error())+ }+ return &base.ApiResponse[base.MessageResponse]{+ Success: true,+ Data: base.MessageResponse{Message: "File uploaded successfully"},+ }, nil+}++func (h *BuildWorkspaceHandler) CreateDirectory(ctx context.Context, input *CreateBuildDirectoryInput) (*base.ApiResponse[base.MessageResponse], error) {+ if h.service == nil {+ return nil, huma.Error500InternalServerError("service not available")+ }+ if err := h.service.CreateDirectory(ctx, input.Path); err != nil {+ return nil, huma.Error500InternalServerError(err.Error())+ }+ return &base.ApiResponse[base.MessageResponse]{+ Success: true,+ Data: base.MessageResponse{Message: "Directory created successfully"},+ }, nil+}++func (h *BuildWorkspaceHandler) DeleteFile(ctx context.Context, input *DeleteBuildFileInput) (*base.ApiResponse[base.MessageResponse], error) {+ if h.service == nil {+ return nil, huma.Error500InternalServerError("service not available")+ }+ if err := h.service.DeleteFile(ctx, input.Path); err != nil {+ return nil, huma.Error500InternalServerError(err.Error())+ }+ return &base.ApiResponse[base.MessageResponse]{+ Success: true,+ Data: base.MessageResponse{Message: "Deleted successfully"},+ }, nil+}diff --git a/backend/internal/huma/handlers/images.go b/backend/internal/huma/handlers/images.goindex 834586a4d..2b8644d06 100644--- a/backend/internal/huma/handlers/images.go+++ b/backend/internal/huma/handlers/images.go@@ -15,6 +15,7 @@ import ("github.com/getarcaneapp/arcane/backend/internal/utils/pagination""github.com/getarcaneapp/arcane/types/base""github.com/getarcaneapp/arcane/types/image"+ "gorm.io/gorm")// ImageHandler provides Huma-based image management endpoints.@@ -23,6 +24,7 @@ type ImageHandler struct {imageService *services.ImageServiceimageUpdateService *services.ImageUpdateServicesettingsService *services.SettingsService+ buildService *services.BuildService}// --- Huma Input/Output Wrappers ---@@ -73,6 +75,41 @@ type PullImageInput struct {Body image.PullOptions}+type BuildImageInput struct {+ EnvironmentID string `path:"id" doc:"Environment ID"`+ Body image.BuildRequest+}++type ImageBuildPaginatedResponse struct {+ Success bool `json:"success"`+ Data []image.BuildRecord `json:"data"`+ Pagination base.PaginationResponse `json:"pagination"`+}++type ListImageBuildsInput struct {+ EnvironmentID string `path:"id" doc:"Environment ID"`+ Search string `query:"search" doc:"Search query"`+ Sort string `query:"sort" doc:"Column to sort by"`+ Order string `query:"order" default:"desc" doc:"Sort direction (asc or desc)"`+ Start int `query:"start" default:"0" doc:"Start index for pagination"`+ Limit int `query:"limit" default:"20" doc:"Number of items per page"`+ Status string `query:"status" doc:"Filter by status"`+ Provider string `query:"provider" doc:"Filter by provider"`+}++type ListImageBuildsOutput struct {+ Body ImageBuildPaginatedResponse+}++type GetImageBuildInput struct {+ EnvironmentID string `path:"id" doc:"Environment ID"`+ BuildID string `path:"buildId" doc:"Build ID"`+}++type GetImageBuildOutput struct {+ Body base.ApiResponse[image.BuildRecord]+}+type PruneImagesInput struct {EnvironmentID string `path:"id" doc:"Environment ID"`Dangling bool `query:"dangling" doc:"Only remove dangling images"`@@ -109,12 +146,13 @@ type UploadImageOutput struct {}// RegisterImages registers image management routes using Huma.-func RegisterImages(api huma.API, dockerService *services.DockerClientService, imageService *services.ImageService, imageUpdateService *services.ImageUpdateService, settingsService *services.SettingsService) {+func RegisterImages(api huma.API, dockerService *services.DockerClientService, imageService *services.ImageService, imageUpdateService *services.ImageUpdateService, settingsService *services.SettingsService, buildService *services.BuildService) {h := &ImageHandler{dockerService: dockerService,imageService: imageService,imageUpdateService: imageUpdateService,settingsService: settingsService,+ buildService: buildService,}huma.Register(api, huma.Operation{@@ -182,6 +220,45 @@ func RegisterImages(api huma.API, dockerService *services.DockerClientService, i},}, h.PullImage)+ huma.Register(api, huma.Operation{+ OperationID: "build-image",+ Method: http.MethodPost,+ Path: "/environments/{id}/images/build",+ Summary: "Build an image",+ Description: "Build a Docker image using BuildKit with streaming progress output",+ Tags: []string{"Images"},+ Security: []map[string][]string{+ {"BearerAuth": {}},+ {"ApiKeyAuth": {}},+ },+ }, h.BuildImage)++ huma.Register(api, huma.Operation{+ OperationID: "list-image-builds",+ Method: http.MethodGet,+ Path: "/environments/{id}/images/builds",+ Summary: "List image builds",+ Description: "Get a paginated list of image build history for an environment",+ Tags: []string{"Images"},+ Security: []map[string][]string{+ {"BearerAuth": {}},+ {"ApiKeyAuth": {}},+ },+ }, h.ListImageBuilds)++ huma.Register(api, huma.Operation{+ OperationID: "get-image-build",+ Method: http.MethodGet,+ Path: "/environments/{id}/images/builds/{buildId}",+ Summary: "Get image build",+ Description: "Get a single image build history entry with output",+ Tags: []string{"Images"},+ Security: []map[string][]string{+ {"BearerAuth": {}},+ {"ApiKeyAuth": {}},+ },+ }, h.GetImageBuild)+huma.Register(api, huma.Operation{OperationID: "prune-images",Method: http.MethodPost,@@ -363,6 +440,109 @@ func (h *ImageHandler) PullImage(ctx context.Context, input *PullImageInput) (*h}, nil}+// BuildImage builds a Docker image with streaming progress.+func (h *ImageHandler) BuildImage(ctx context.Context, input *BuildImageInput) (*huma.StreamResponse, error) {+ if h.buildService == nil {+ return nil, huma.Error500InternalServerError("service not available")+ }++ if strings.TrimSpace(input.Body.ContextDir) == "" {+ return nil, huma.Error400BadRequest("contextDir is required")+ }++ user, exists := humamw.GetCurrentUserFromContext(ctx)+ if !exists {+ return nil, huma.Error401Unauthorized((&common.NotAuthenticatedError{}).Error())+ }++ return &huma.StreamResponse{+ Body: func(humaCtx huma.Context) { //nolint:contextcheck // context is obtained from humaCtx.Context()+ humaCtx.SetHeader("Content-Type", "application/x-json-stream")+ humaCtx.SetHeader("Cache-Control", "no-cache")+ humaCtx.SetHeader("Connection", "keep-alive")+ humaCtx.SetHeader("X-Accel-Buffering", "no")++ writer := humaCtx.BodyWriter()+ if _, err := h.buildService.BuildImage(humaCtx.Context(), input.EnvironmentID, input.Body, writer, "", user); err != nil {+ _, _ = fmt.Fprintf(writer, `{"error":%q}`+"\n", err.Error())+ return+ }+ },+ }, nil+}++// ListImageBuilds returns a paginated list of image build history entries.+func (h *ImageHandler) ListImageBuilds(ctx context.Context, input *ListImageBuildsInput) (*ListImageBuildsOutput, error) {+ if h.buildService == nil {+ return nil, huma.Error500InternalServerError("service not available")+ }++ if input.EnvironmentID == "" {+ return nil, huma.Error400BadRequest((&common.EnvironmentIDRequiredError{}).Error())+ }++ params := buildPaginationParams(0, input.Start, input.Limit, input.Sort, input.Order, input.Search)+ if input.Status != "" {+ params.Filters["status"] = input.Status+ }+ if input.Provider != "" {+ params.Filters["provider"] = input.Provider+ }++ builds, paginationResp, err := h.buildService.ListImageBuildsByEnvironmentPaginated(ctx, input.EnvironmentID, params)+ if err != nil {+ return nil, huma.Error500InternalServerError((&common.BuildHistoryListError{Err: err}).Error())+ }++ if builds == nil {+ builds = []image.BuildRecord{}+ }++ return &ListImageBuildsOutput{+ Body: ImageBuildPaginatedResponse{+ Success: true,+ Data: builds,+ Pagination: base.PaginationResponse{+ TotalPages: paginationResp.TotalPages,+ TotalItems: paginationResp.TotalItems,+ CurrentPage: paginationResp.CurrentPage,+ ItemsPerPage: paginationResp.ItemsPerPage,+ GrandTotalItems: paginationResp.GrandTotalItems,+ },+ },+ }, nil+}++// GetImageBuild returns a single build history entry.+func (h *ImageHandler) GetImageBuild(ctx context.Context, input *GetImageBuildInput) (*GetImageBuildOutput, error) {+ if h.buildService == nil {+ return nil, huma.Error500InternalServerError("service not available")+ }++ if input.EnvironmentID == "" {+ return nil, huma.Error400BadRequest((&common.EnvironmentIDRequiredError{}).Error())+ }++ if input.BuildID == "" {+ return nil, huma.Error400BadRequest("buildId is required")+ }++ buildRecord, err := h.buildService.GetImageBuildByID(ctx, input.EnvironmentID, input.BuildID)+ if err != nil {+ if errors.Is(err, gorm.ErrRecordNotFound) {+ return nil, huma.Error404NotFound("build not found")+ }+ return nil, huma.Error500InternalServerError((&common.BuildHistoryRetrievalError{Err: err}).Error())+ }++ return &GetImageBuildOutput{+ Body: base.ApiResponse[image.BuildRecord]{+ Success: true,+ Data: *buildRecord,+ },+ }, nil+}+// PruneImages removes unused Docker images.func (h *ImageHandler) PruneImages(ctx context.Context, input *PruneImagesInput) (*PruneImagesOutput, error) {if h.imageService == nil {diff --git a/backend/internal/huma/handlers/projects.go b/backend/internal/huma/handlers/projects.goindex 1dec4f71f..7fb4309f9 100644--- a/backend/internal/huma/handlers/projects.go+++ b/backend/internal/huma/handlers/projects.go@@ -145,6 +145,17 @@ type PullProjectImagesInput struct {ProjectID string `path:"projectId" doc:"Project ID"`}+type BuildProjectInput struct {+ EnvironmentID string `path:"id" doc:"Environment ID"`+ ProjectID string `path:"projectId" doc:"Project ID"`+ Body *struct {+ Services []string `json:"services,omitempty" doc:"Service names to build"`+ Provider string `json:"provider,omitempty" doc:"Build provider override"`+ Push *bool `json:"push,omitempty" doc:"Push images"`+ Load *bool `json:"load,omitempty" doc:"Load images into Docker"`+ }+}+// PullProgressEvent represents a Docker pull progress eventtype PullProgressEvent struct {Status string `json:"status,omitempty"`@@ -319,6 +330,19 @@ func RegisterProjects(api huma.API, projectService *services.ProjectService) {{"ApiKeyAuth": {}},},}, h.PullProjectImages)++ huma.Register(api, huma.Operation{+ OperationID: "build-project-images",+ Method: http.MethodPost,+ Path: "/environments/{id}/projects/{projectId}/build",+ Summary: "Build project images",+ Description: "Build Docker Compose services with build directives using BuildKit",+ Tags: []string{"Projects"},+ Security: []map[string][]string{+ {"BearerAuth": {}},+ {"ApiKeyAuth": {}},+ },+ }, h.BuildProjectImages)}// ListProjects returns a paginated list of projects.@@ -728,3 +752,55 @@ func (h *ProjectHandler) PullProjectImages(ctx context.Context, input *PullProje},}, nil}++// BuildProjectImages builds compose services with build directives.+func (h *ProjectHandler) BuildProjectImages(ctx context.Context, input *BuildProjectInput) (*huma.StreamResponse, error) {+ if h.projectService == nil {+ return nil, huma.Error500InternalServerError("service not available")+ }++ if input.ProjectID == "" {+ return nil, huma.Error400BadRequest((&common.ProjectIDRequiredError{}).Error())+ }++ user, exists := humamw.GetCurrentUserFromContext(ctx)+ if !exists {+ return nil, huma.Error401Unauthorized((&common.NotAuthenticatedError{}).Error())+ }++ options := services.ProjectBuildOptions{}+ if input.Body != nil {+ options.Services = input.Body.Services+ options.Provider = input.Body.Provider+ options.Push = input.Body.Push+ options.Load = input.Body.Load+ }++ return &huma.StreamResponse{+ Body: func(humaCtx huma.Context) { //nolint:contextcheck // context is obtained from humaCtx.Context()+ humaCtx.SetHeader("Content-Type", "application/x-json-stream")+ humaCtx.SetHeader("Cache-Control", "no-cache")+ humaCtx.SetHeader("Connection", "keep-alive")+ humaCtx.SetHeader("X-Accel-Buffering", "no")++ writer := humaCtx.BodyWriter()+ _, _ = writer.Write([]byte(`{"type":"build","phase":"begin"}` + "\n"))+ if f, ok := writer.(http.Flusher); ok {+ f.Flush()+ }++ if err := h.projectService.BuildProjectServices(humaCtx.Context(), input.ProjectID, options, writer, user); err != nil {+ _, _ = fmt.Fprintf(writer, `{"error":%q}`+"\n", err.Error())+ if f, ok := writer.(http.Flusher); ok {+ f.Flush()+ }+ return+ }++ _, _ = writer.Write([]byte(`{"type":"build","phase":"complete"}` + "\n"))+ if f, ok := writer.(http.Flusher); ok {+ f.Flush()+ }+ },+ }, nil+}diff --git a/backend/internal/huma/handlers/settings.go b/backend/internal/huma/handlers/settings.goindex 5815f1d2f..244f4a6d7 100644--- a/backend/internal/huma/handlers/settings.go+++ b/backend/internal/huma/handlers/settings.go@@ -217,6 +217,15 @@ func (h *SettingsHandler) GetPublicSettings(ctx context.Context, input *GetPubliValue: backupVolumeName,Type: "string",})+ if h.settingsService != nil {+ cfg := h.settingsService.GetSettingsConfig()+ depotConfigured := strings.TrimSpace(cfg.DepotProjectId.Value) != "" && strings.TrimSpace(cfg.DepotToken.Value) != ""+ settingsDto = append(settingsDto, settings.PublicSetting{+ Key: "depotConfigured",+ Value: strconv.FormatBool(depotConfigured),+ Type: "boolean",+ })+ }return &GetPublicSettingsOutput{Body: settingsDto}, nil}@@ -274,6 +283,15 @@ func (h *SettingsHandler) GetSettings(ctx context.Context, input *GetSettingsInpValue: backupVolumeName,Type: "string",})+ if h.settingsService != nil {+ cfg := h.settingsService.GetSettingsConfig()+ depotConfigured := strings.TrimSpace(cfg.DepotProjectId.Value) != "" && strings.TrimSpace(cfg.DepotToken.Value) != ""+ settingsDto = append(settingsDto, settings.PublicSetting{+ Key: "depotConfigured",+ Value: strconv.FormatBool(depotConfigured),+ Type: "boolean",+ })+ }return &GetSettingsOutput{Body: settingsDto}, nil}diff --git a/backend/internal/huma/huma.go b/backend/internal/huma/huma.goindex 9bbec8220..7c67ef4c6 100644--- a/backend/internal/huma/huma.go+++ b/backend/internal/huma/huma.go@@ -155,6 +155,8 @@ type Services struct {Docker *services.DockerClientServiceImage *services.ImageServiceImageUpdate *services.ImageUpdateService+ Build *services.BuildService+ BuildWorkspace *services.BuildWorkspaceServiceVolume *services.VolumeServiceContainer *services.ContainerServiceNetwork *services.NetworkService@@ -315,6 +317,8 @@ func registerHandlers(api huma.API, svc *Services) {var dockerSvc *services.DockerClientServicevar imageSvc *services.ImageServicevar imageUpdateSvc *services.ImageUpdateService+ var buildSvc *services.BuildService+ var buildWorkspaceSvc *services.BuildWorkspaceServicevar volumeSvc *services.VolumeServicevar containerSvc *services.ContainerServicevar networkSvc *services.NetworkService@@ -349,6 +353,8 @@ func registerHandlers(api huma.API, svc *Services) {dockerSvc = svc.DockerimageSvc = svc.ImageimageUpdateSvc = svc.ImageUpdate+ buildSvc = svc.Build+ buildWorkspaceSvc = svc.BuildWorkspacevolumeSvc = svc.VolumecontainerSvc = svc.ContainernetworkSvc = svc.Network@@ -377,7 +383,8 @@ func registerHandlers(api huma.API, svc *Services) {handlers.RegisterEnvironments(api, environmentSvc, settingsSvc, apiKeySvc, eventSvc, cfg)handlers.RegisterContainerRegistries(api, containerRegistrySvc, environmentSvc)handlers.RegisterTemplates(api, templateSvc)- handlers.RegisterImages(api, dockerSvc, imageSvc, imageUpdateSvc, settingsSvc)+ handlers.RegisterImages(api, dockerSvc, imageSvc, imageUpdateSvc, settingsSvc, buildSvc)+ handlers.RegisterBuildWorkspaces(api, buildWorkspaceSvc)handlers.RegisterImageUpdates(api, imageUpdateSvc)handlers.RegisterSettings(api, settingsSvc, settingsSearchSvc, environmentSvc, cfg)handlers.RegisterJobSchedules(api, jobScheduleSvc, environmentSvc)diff --git a/backend/internal/models/image_build.go b/backend/internal/models/image_build.gonew file mode 100644index 000000000..a34e0c2ed--- /dev/null+++ b/backend/internal/models/image_build.go@@ -0,0 +1,50 @@+package models++import "time"++type ImageBuildStatus string++const (+ ImageBuildStatusRunning ImageBuildStatus = "running"+ ImageBuildStatusSuccess ImageBuildStatus = "success"+ ImageBuildStatusFailed ImageBuildStatus = "failed"+)++type ImageBuild struct {+ EnvironmentID string `json:"environmentId" gorm:"column:environment_id;index"`+ UserID *string `json:"userId,omitempty" gorm:"column:user_id"`+ Username *string `json:"username,omitempty" gorm:"column:username"`+ Status ImageBuildStatus `json:"status" gorm:"column:status;index" sortable:"true"`+ Provider string `json:"provider,omitempty" gorm:"column:provider"`+ ContextDir string `json:"contextDir" gorm:"column:context_dir"`+ Dockerfile string `json:"dockerfile,omitempty" gorm:"column:dockerfile"`+ Target string `json:"target,omitempty" gorm:"column:target"`+ Tags StringSlice `json:"tags,omitempty" gorm:"column:tags;type:text"`+ Platforms StringSlice `json:"platforms,omitempty" gorm:"column:platforms;type:text"`+ BuildArgs JSON `json:"buildArgs,omitempty" gorm:"column:build_args;type:text"`+ Labels JSON `json:"labels,omitempty" gorm:"column:labels;type:text"`+ CacheFrom StringSlice `json:"cacheFrom,omitempty" gorm:"column:cache_from;type:text"`+ CacheTo StringSlice `json:"cacheTo,omitempty" gorm:"column:cache_to;type:text"`+ NoCache bool `json:"noCache" gorm:"column:no_cache;default:false"`+ Pull bool `json:"pull" gorm:"column:pull;default:false"`+ BuildNetwork string `json:"network,omitempty" gorm:"column:build_network"`+ Isolation string `json:"isolation,omitempty" gorm:"column:isolation"`+ ShmSize int64 `json:"shmSize,omitempty" gorm:"column:shm_size"`+ Ulimits JSON `json:"ulimits,omitempty" gorm:"column:ulimits;type:text"`+ Entitlements StringSlice `json:"entitlements,omitempty" gorm:"column:entitlements;type:text"`+ Privileged bool `json:"privileged" gorm:"column:privileged;default:false"`+ ExtraHosts StringSlice `json:"extraHosts,omitempty" gorm:"column:extra_hosts;type:text"`+ Push bool `json:"push" gorm:"column:push"`+ Load bool `json:"load" gorm:"column:load"`+ Digest *string `json:"digest,omitempty" gorm:"column:digest"`+ ErrorMessage *string `json:"errorMessage,omitempty" gorm:"column:error_message"`+ Output *string `json:"output,omitempty" gorm:"column:output;type:text"`+ OutputTruncated bool `json:"outputTruncated" gorm:"column:output_truncated;default:false"`+ CompletedAt *time.Time `json:"completedAt,omitempty" gorm:"column:completed_at" sortable:"true"`+ DurationMs *int64 `json:"durationMs,omitempty" gorm:"column:duration_ms"`+ BaseModel+}++func (ImageBuild) TableName() string {+ return "image_builds"+}diff --git a/backend/internal/models/settings.go b/backend/internal/models/settings.goindex 9ad23059b..94b9764b7 100644--- a/backend/internal/models/settings.go+++ b/backend/internal/models/settings.go@@ -77,6 +77,11 @@ type Settings struct {AutoHealRestartWindow SettingVariable `key:"autoHealRestartWindow" meta:"label=Auto Heal Restart Window;type=number;keywords=auto,heal,restart,window,minutes,cooldown,protection;category=internal;description=Time window in minutes for counting auto-heal restarts (default: 30)"`MaxImageUploadSize SettingVariable `key:"maxImageUploadSize" meta:"label=Max Image Upload Size;type=number;keywords=upload,size,limit,maximum,image,tar,file,megabytes,mb,storage;category=internal;description=Maximum size in MB for image archive uploads (default: 500)"`DockerHost SettingVariable `key:"dockerHost,public,envOverride" meta:"label=Docker Host;type=text;keywords=docker,host,daemon,socket,unix,remote;category=internal;description=URI for Docker daemon"`+ BuildProvider SettingVariable `key:"buildProvider,envOverride" meta:"label=Build Provider;type=select;keywords=build,buildkit,depot,provider,remote,local;category=build;description=Default build provider (local or depot)" catmeta:"id=build;title=Build;icon=code;url=/settings/builds;description=Configure BuildKit and Depot build settings"`+ BuildsDirectory SettingVariable `key:"buildsDirectory,envOverride" meta:"label=Builds Directory;type=text;keywords=builds,directory,path,workspace,context;category=build;description=Root directory for manual build workspaces"`+ BuildTimeout SettingVariable `key:"buildTimeout,envOverride" meta:"label=Build Timeout;type=number;keywords=build,timeout,seconds,buildkit;category=build;description=Timeout for BuildKit builds in seconds (default: 1800 = 30 minutes)"`+ DepotProjectId SettingVariable `key:"depotProjectId,envOverride" meta:"label=Depot Project ID;type=text;keywords=depot,project,id,build,provider;category=build;description=Depot project identifier"`+ DepotToken SettingVariable `key:"depotToken,envOverride,sensitive" meta:"label=Depot Token;type=password;keywords=depot,token,api,secret,build,provider;category=build;description=Depot API token"`// Security categoryAuthLocalEnabled SettingVariable `key:"authLocalEnabled,public" meta:"label=Local Authentication;type=boolean;keywords=local,auth,authentication,username,password,login,credentials;category=security;description=Enable local username/password authentication" catmeta:"id=security;title=Security;icon=shield;url=/settings/security;description=Manage authentication and security settings"`diff --git a/backend/internal/services/build_service.go b/backend/internal/services/build_service.gonew file mode 100644index 000000000..26a69c423--- /dev/null+++ b/backend/internal/services/build_service.go@@ -0,0 +1,351 @@+package services++import (+ "context"+ "errors"+ "fmt"+ "io"+ "log/slog"+ "strings"+ "time"++ "github.com/getarcaneapp/arcane/backend/internal/database"+ "github.com/getarcaneapp/arcane/backend/internal/models"+ "github.com/getarcaneapp/arcane/backend/internal/utils/pagination"+ libbuild "github.com/getarcaneapp/arcane/backend/pkg/libarcane/libbuild"+ buildtypes "github.com/getarcaneapp/arcane/types/builds"+ imagetypes "github.com/getarcaneapp/arcane/types/image"+ dockerregistry "github.com/moby/moby/api/types/registry"+ "gorm.io/gorm"+)++type BuildService struct {+ db *database.DB+ settings *SettingsService+ dockerService *DockerClientService+ registryService *ContainerRegistryService+ builder buildtypes.Builder+}++const buildHistoryOutputLimitBytes = 2 * 1024 * 1024++func NewBuildService(db *database.DB, settings *SettingsService, dockerService *DockerClientService, registryService *ContainerRegistryService) *BuildService {+ svc := &BuildService{+ db: db,+ settings: settings,+ dockerService: dockerService,+ registryService: registryService,+ }+ svc.builder = libbuild.NewBuilder(svc, dockerService, svc)++ return svc+}++func (s *BuildService) GetRegistryAuthForImage(ctx context.Context, imageRef string) (string, error) {+ if s.registryService == nil {+ return "", nil+ }+ return s.registryService.GetRegistryAuthForImage(ctx, imageRef)+}++func (s *BuildService) GetRegistryAuthForHost(ctx context.Context, registryHost string) (string, error) {+ if s.registryService == nil {+ return "", nil+ }+ return s.registryService.GetRegistryAuthForHost(ctx, registryHost)+}++func (s *BuildService) GetAllRegistryAuthConfigs(ctx context.Context) (map[string]dockerregistry.AuthConfig, error) {+ if s.registryService == nil {+ return nil, nil+ }+ return s.registryService.GetAllRegistryAuthConfigs(ctx)+}++func (s *BuildService) BuildSettings() buildtypes.BuildSettings {+ if s.settings == nil {+ return buildtypes.BuildSettings{}+ }+ settings := s.settings.GetSettingsConfig()+ return buildtypes.BuildSettings{+ DepotProjectId: settings.DepotProjectId.Value,+ DepotToken: settings.DepotToken.Value,+ BuildProvider: settings.BuildProvider.Value,+ BuildTimeoutSecs: settings.BuildTimeout.AsInt(),+ }+}++func (s *BuildService) BuildImage(ctx context.Context, environmentID string, req imagetypes.BuildRequest, progressWriter io.Writer, serviceName string, user *models.User) (*imagetypes.BuildResult, error) {+ if s.builder == nil {+ return nil, errors.New("build service not available")+ }++ logCapture := libbuild.NewLogCapture(buildHistoryOutputLimitBytes)+ writer := io.Writer(logCapture)+ if progressWriter != nil {+ writer = io.MultiWriter(progressWriter, logCapture)+ }++ buildRecordID := ""+ if s.db != nil && strings.TrimSpace(environmentID) != "" {+ if record, err := s.createBuildRecord(ctx, environmentID, req, user); err != nil {+ slog.WarnContext(ctx, "failed to create build history record", "error", err)+ } else {+ buildRecordID = record.ID+ }+ }++ startedAt := time.Now()+ result, err := s.builder.BuildImage(ctx, req, writer, serviceName)+ completedAt := time.Now()+ durationMs := completedAt.Sub(startedAt).Milliseconds()++ if s.db != nil && buildRecordID != "" {+ output := logCapture.String()+ var outputPtr *string+ if output != "" {+ outputPtr = &output+ }++ provider := req.Provider+ var digest *string+ if result != nil {+ if result.Provider != "" {+ provider = result.Provider+ }+ if result.Digest != "" {+ digest = &result.Digest+ }+ }++ status := models.ImageBuildStatusSuccess+ var errMsg *string+ if err != nil {+ status = models.ImageBuildStatusFailed+ msg := err.Error()+ errMsg = &msg+ }++ if updateErr := s.completeBuildRecord(ctx, buildRecordID, status, outputPtr, logCapture.Truncated(), errMsg, digest, provider, completedAt, &durationMs); updateErr != nil {+ slog.WarnContext(ctx, "failed to update build history record", "error", updateErr)+ }+ }++ return result, err+}++func (s *BuildService) ListImageBuildsByEnvironmentPaginated(ctx context.Context, environmentID string, params pagination.QueryParams) ([]imagetypes.BuildRecord, pagination.Response, error) {+ if s.db == nil {+ return nil, pagination.Response{}, fmt.Errorf("build history not available")+ }++ var builds []models.ImageBuild+ q := s.db.WithContext(ctx).Model(&models.ImageBuild{}).Where("environment_id = ?", environmentID)++ if term := strings.TrimSpace(params.Search); term != "" {+ searchPattern := "%" + term + "%"+ q = q.Where(+ "context_dir LIKE ? OR COALESCE(dockerfile, '') LIKE ? OR COALESCE(username, '') LIKE ? OR COALESCE(provider, '') LIKE ? OR COALESCE(error_message, '') LIKE ?",+ searchPattern, searchPattern, searchPattern, searchPattern, searchPattern,+ )+ }++ q = pagination.ApplyFilter(q, "status", params.Filters["status"])+ q = pagination.ApplyFilter(q, "provider", params.Filters["provider"])++ if params.Sort == "" {+ params.Sort = "createdAt"+ }++ paginationResp, err := pagination.PaginateAndSortDB(params, q, &builds)+ if err != nil {+ return nil, pagination.Response{}, fmt.Errorf("failed to paginate builds: %w", err)+ }++ records := make([]imagetypes.BuildRecord, 0, len(builds))+ for _, build := range builds {+ records = append(records, buildToRecord(build, false))+ }++ return records, paginationResp, nil+}++func (s *BuildService) GetImageBuildByID(ctx context.Context, environmentID, buildID string) (*imagetypes.BuildRecord, error) {+ if s.db == nil {+ return nil, fmt.Errorf("build history not available")+ }++ var build models.ImageBuild+ if err := s.db.WithContext(ctx).First(&build, "id = ? AND environment_id = ?", buildID, environmentID).Error; err != nil {+ return nil, err+ }++ record := buildToRecord(build, true)+ return &record, nil+}++func (s *BuildService) createBuildRecord(ctx context.Context, environmentID string, req imagetypes.BuildRequest, user *models.User) (*models.ImageBuild, error) {+ buildArgs := mapToJSON(req.BuildArgs)+ labels := mapToJSON(req.Labels)+ ulimits := mapToJSON(req.Ulimits)++ var userID *string+ var username *string+ if user != nil {+ userID = &user.ID+ username = &user.Username+ }++ record := &models.ImageBuild{+ EnvironmentID: environmentID,+ UserID: userID,+ Username: username,+ Status: models.ImageBuildStatusRunning,+ Provider: req.Provider,+ ContextDir: req.ContextDir,+ Dockerfile: req.Dockerfile,+ Target: req.Target,+ Tags: models.StringSlice(req.Tags),+ Platforms: models.StringSlice(req.Platforms),+ BuildArgs: buildArgs,+ Labels: labels,+ CacheFrom: models.StringSlice(req.CacheFrom),+ CacheTo: models.StringSlice(req.CacheTo),+ NoCache: req.NoCache,+ Pull: req.Pull,+ BuildNetwork: req.Network,+ Isolation: req.Isolation,+ ShmSize: req.ShmSize,+ Ulimits: ulimits,+ Entitlements: models.StringSlice(req.Entitlements),+ Privileged: req.Privileged,+ ExtraHosts: models.StringSlice(req.ExtraHosts),+ Push: req.Push,+ Load: req.Load,+ BaseModel: models.BaseModel{+ CreatedAt: time.Now(),+ },+ }++ if err := s.db.WithContext(ctx).Create(record).Error; err != nil {+ return nil, fmt.Errorf("failed to create build record: %w", err)+ }++ return record, nil+}++func (s *BuildService) completeBuildRecord(+ ctx context.Context,+ buildID string,+ status models.ImageBuildStatus,+ output *string,+ outputTruncated bool,+ errMsg *string,+ digest *string,+ provider string,+ completedAt time.Time,+ durationMs *int64,+) error {+ if s.db == nil {+ return nil+ }++ updates := map[string]any{+ "status": status,+ "completed_at": completedAt,+ "duration_ms": durationMs,+ "output": output,+ "output_truncated": outputTruncated,+ "error_message": errMsg,+ "digest": digest,+ "provider": provider,+ }++ return s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {+ result := tx.Model(&models.ImageBuild{}).Where("id = ?", buildID).Updates(updates)+ if result.Error != nil {+ return fmt.Errorf("failed to update build record: %w", result.Error)+ }+ if result.RowsAffected == 0 {+ return fmt.Errorf("build record not found")+ }+ return nil+ })+}++func buildToRecord(build models.ImageBuild, includeOutput bool) imagetypes.BuildRecord {+ buildArgs := jsonToStringMap(build.BuildArgs)+ labels := jsonToStringMap(build.Labels)+ ulimits := jsonToStringMap(build.Ulimits)++ var output *string+ if includeOutput {+ output = build.Output+ }++ return imagetypes.BuildRecord{+ ID: build.ID,+ EnvironmentID: build.EnvironmentID,+ UserID: build.UserID,+ Username: build.Username,+ Status: string(build.Status),+ Provider: build.Provider,+ ContextDir: build.ContextDir,+ Dockerfile: build.Dockerfile,+ Target: build.Target,+ Tags: []string(build.Tags),+ Platforms: []string(build.Platforms),+ BuildArgs: buildArgs,+ Labels: labels,+ CacheFrom: []string(build.CacheFrom),+ CacheTo: []string(build.CacheTo),+ NoCache: build.NoCache,+ Pull: build.Pull,+ Network: build.BuildNetwork,+ Isolation: build.Isolation,+ ShmSize: build.ShmSize,+ Ulimits: ulimits,+ Entitlements: []string(build.Entitlements),+ Privileged: build.Privileged,+ ExtraHosts: []string(build.ExtraHosts),+ Push: build.Push,+ Load: build.Load,+ Digest: build.Digest,+ ErrorMessage: build.ErrorMessage,+ Output: output,+ OutputTruncated: build.OutputTruncated,+ CompletedAt: build.CompletedAt,+ DurationMs: build.DurationMs,+ CreatedAt: build.CreatedAt,+ }+}++func mapToJSON(input map[string]string) models.JSON {+ if len(input) == 0 {+ return nil+ }++ out := models.JSON{}+ for key, value := range input {+ out[key] = value+ }++ if len(out) == 0 {+ return nil+ }++ return out+}++func jsonToStringMap(input models.JSON) map[string]string {+ out := map[string]string{}+ for key, value := range input {+ out[key] = fmt.Sprint(value)+ }++ if len(out) == 0 {+ return nil+ }++ return out+}diff --git a/backend/internal/services/build_service_test.go b/backend/internal/services/build_service_test.gonew file mode 100644index 000000000..8d78e7110--- /dev/null+++ b/backend/internal/services/build_service_test.go@@ -0,0 +1,68 @@+package services++import (+ "context"+ "testing"++ "github.com/stretchr/testify/assert"+ "github.com/stretchr/testify/require"+)++func TestBuildService_GetRegistryAuthForHost_UsesDatabaseCredentials(t *testing.T) {+ _, db := setupImageServiceAuthTest(t)+ createTestPullRegistry(t, db, "https://index.docker.io/v1/", "docker-user", "docker-token")++ svc := &BuildService{registryService: NewContainerRegistryService(db)}++ auth, err := svc.GetRegistryAuthForHost(context.Background(), "registry-1.docker.io")+ require.NoError(t, err)+ require.NotEmpty(t, auth)++ cfg := decodeRegistryAuth(t, auth)+ assert.Equal(t, "docker-user", cfg.Username)+ assert.Equal(t, "docker-token", cfg.Password)+ assert.Equal(t, "https://index.docker.io/v1/", cfg.ServerAddress)+}++func TestBuildService_GetRegistryAuthForImage_UsesHostLookup(t *testing.T) {+ _, db := setupImageServiceAuthTest(t)+ createTestPullRegistry(t, db, "https://ghcr.io", "gh-user", "gh-token")++ svc := &BuildService{registryService: NewContainerRegistryService(db)}++ auth, err := svc.GetRegistryAuthForImage(context.Background(), "ghcr.io/getarcaneapp/arcane:latest")+ require.NoError(t, err)+ require.NotEmpty(t, auth)++ cfg := decodeRegistryAuth(t, auth)+ assert.Equal(t, "gh-user", cfg.Username)+ assert.Equal(t, "gh-token", cfg.Password)+ assert.Equal(t, "ghcr.io", cfg.ServerAddress)+}++func TestBuildService_GetAllRegistryAuthConfigs_UsesDatabaseCredentials(t *testing.T) {+ _, db := setupImageServiceAuthTest(t)+ createTestPullRegistry(t, db, "https://index.docker.io/v1/", "docker-user", "docker-token")++ svc := &BuildService{registryService: NewContainerRegistryService(db)}++ authConfigs, err := svc.GetAllRegistryAuthConfigs(context.Background())+ require.NoError(t, err)+ require.NotNil(t, authConfigs)++ dockerCfg, ok := authConfigs["docker.io"]+ require.True(t, ok)+ assert.Equal(t, "docker-user", dockerCfg.Username)+ assert.Equal(t, "docker-token", dockerCfg.Password)+ assert.Equal(t, "https://index.docker.io/v1/", dockerCfg.ServerAddress)+ assert.Equal(t, dockerCfg, authConfigs["registry-1.docker.io"])+ assert.Equal(t, dockerCfg, authConfigs["index.docker.io"])+}++func TestBuildService_GetAllRegistryAuthConfigs_NoRegistryService(t *testing.T) {+ svc := &BuildService{}++ authConfigs, err := svc.GetAllRegistryAuthConfigs(context.Background())+ require.NoError(t, err)+ assert.Nil(t, authConfigs)+}diff --git a/backend/internal/services/build_workspace_service.go b/backend/internal/services/build_workspace_service.gonew file mode 100644index 000000000..da38564b9--- /dev/null+++ b/backend/internal/services/build_workspace_service.go@@ -0,0 +1,371 @@+package services++import (+ "context"+ "errors"+ "fmt"+ "io"+ "net/http"+ "os"+ "path"+ "path/filepath"+ "strings"++ "log/slog"++ volumetypes "github.com/getarcaneapp/arcane/types/volume"+)++const defaultBuildsDirectory = "/builds"++// BuildWorkspaceService provides file operations for the manual build workspace.+type BuildWorkspaceService struct {+ settings *SettingsService+}++func NewBuildWorkspaceService(settings *SettingsService) *BuildWorkspaceService {+ return &BuildWorkspaceService{settings: settings}+}++func (s *BuildWorkspaceService) ListDirectory(ctx context.Context, dirPath string) ([]volumetypes.FileEntry, error) {+ slog.DebugContext(ctx, "build workspace: list directory", "path", dirPath)+ root, err := s.resolveRoot()+ if err != nil {+ return nil, err+ }++ cleaned, err := sanitizeBuildPath(dirPath)+ if err != nil {+ return nil, fmt.Errorf("invalid path: %w", err)+ }++ targetPath, err := joinBuildRoot(root, cleaned)+ if err != nil {+ return nil, err+ }++ entries, err := os.ReadDir(targetPath)+ if err != nil {+ return nil, fmt.Errorf("failed to list directory: %w", err)+ }++ results := make([]volumetypes.FileEntry, 0, len(entries))+ for _, entry := range entries {+ info, err := entry.Info()+ if err != nil {+ continue+ }++ entryPath := path.Join(cleaned, entry.Name())+ if entryPath == "" {+ entryPath = "/"+ }++ isSymlink := entry.Type()&os.ModeSymlink != 0+ mode := info.Mode().String()++ fileEntry := volumetypes.FileEntry{+ Name: entry.Name(),+ Path: entryPath,+ IsDirectory: info.IsDir(),+ Size: info.Size(),+ ModTime: info.ModTime(),+ Mode: mode,+ IsSymlink: isSymlink,+ }++ if isSymlink {+ target, err := os.Readlink(filepath.Join(targetPath, entry.Name()))+ if err == nil && target != "" {+ fileEntry.LinkTarget = resolveLinkTarget(root, target)+ }+ }++ results = append(results, fileEntry)+ }++ return results, nil+}++func (s *BuildWorkspaceService) GetFileContent(ctx context.Context, filePath string, maxBytes int64) ([]byte, string, error) {+ slog.DebugContext(ctx, "build workspace: get file content", "path", filePath, "max_bytes", maxBytes)+ root, err := s.resolveRoot()+ if err != nil {+ return nil, "", err+ }++ cleaned, err := sanitizeBuildPath(filePath)+ if err != nil {+ return nil, "", fmt.Errorf("invalid path: %w", err)+ }++ fullPath, err := joinBuildRoot(root, cleaned)+ if err != nil {+ return nil, "", err+ }++ info, err := os.Stat(fullPath)+ if err != nil {+ return nil, "", fmt.Errorf("failed to stat file: %w", err)+ }+ if info.IsDir() {+ return nil, "", fmt.Errorf("path is a directory")+ }++ if maxBytes <= 0 {+ maxBytes = 1048576+ }++ file, err := os.Open(fullPath)+ if err != nil {+ return nil, "", fmt.Errorf("failed to open file: %w", err)+ }+ defer file.Close()++ content, err := io.ReadAll(io.LimitReader(file, maxBytes))+ if err != nil {+ return nil, "", fmt.Errorf("failed to read file: %w", err)+ }++ mimeType := http.DetectContentType(content)+ return content, mimeType, nil+}++func (s *BuildWorkspaceService) DownloadFile(ctx context.Context, filePath string) (io.ReadCloser, int64, error) {+ slog.DebugContext(ctx, "build workspace: download file", "path", filePath)+ root, err := s.resolveRoot()+ if err != nil {+ return nil, 0, err+ }++ cleaned, err := sanitizeBuildPath(filePath)+ if err != nil {+ return nil, 0, fmt.Errorf("invalid path: %w", err)+ }++ fullPath, err := joinBuildRoot(root, cleaned)+ if err != nil {+ return nil, 0, err+ }++ info, err := os.Stat(fullPath)+ if err != nil {+ return nil, 0, fmt.Errorf("failed to stat file: %w", err)+ }+ if info.IsDir() {+ return nil, 0, fmt.Errorf("path is a directory")+ }++ file, err := os.Open(fullPath)+ if err != nil {+ return nil, 0, fmt.Errorf("failed to open file: %w", err)+ }++ return file, info.Size(), nil+}++func (s *BuildWorkspaceService) UploadFile(ctx context.Context, destPath string, content io.Reader, filename string) error {+ slog.DebugContext(ctx, "build workspace: upload file", "dest_path", destPath, "filename", filename)+ root, err := s.resolveRoot()+ if err != nil {+ return err+ }++ safeFilename, err := sanitizeUploadFilename(filename)+ if err != nil {+ return err+ }++ cleaned, err := sanitizeBuildPath(destPath)+ if err != nil {+ return fmt.Errorf("invalid path: %w", err)+ }++ dirPath, err := joinBuildRoot(root, cleaned)+ if err != nil {+ return err+ }++ if err := os.MkdirAll(dirPath, 0o755); err != nil {+ return fmt.Errorf("failed to create directory: %w", err)+ }++ targetFile := filepath.Join(dirPath, safeFilename)+ file, err := os.Create(targetFile)+ if err != nil {+ return fmt.Errorf("failed to create file: %w", err)+ }+ defer file.Close()++ if _, err := io.Copy(file, content); err != nil {+ return fmt.Errorf("failed to write file: %w", err)+ }++ return nil+}++func (s *BuildWorkspaceService) CreateDirectory(ctx context.Context, dirPath string) error {+ slog.DebugContext(ctx, "build workspace: create directory", "path", dirPath)+ root, err := s.resolveRoot()+ if err != nil {+ return err+ }++ cleaned, err := sanitizeBuildPath(dirPath)+ if err != nil {+ return fmt.Errorf("invalid path: %w", err)+ }++ fullPath, err := joinBuildRoot(root, cleaned)+ if err != nil {+ return err+ }++ if cleaned == "/" {+ return nil+ }++ if err := os.MkdirAll(fullPath, 0o755); err != nil {+ return fmt.Errorf("failed to create directory: %w", err)+ }++ return nil+}++func (s *BuildWorkspaceService) DeleteFile(ctx context.Context, filePath string) error {+ slog.DebugContext(ctx, "build workspace: delete path", "path", filePath)+ root, err := s.resolveRoot()+ if err != nil {+ return err+ }++ cleaned, err := sanitizeBuildPath(filePath)+ if err != nil {+ return fmt.Errorf("invalid path: %w", err)+ }++ if cleaned == "/" {+ return fmt.Errorf("cannot delete root directory")+ }++ fullPath, err := joinBuildRoot(root, cleaned)+ if err != nil {+ return err+ }++ if err := os.RemoveAll(fullPath); err != nil {+ return fmt.Errorf("failed to delete path: %w", err)+ }++ return nil+}++func (s *BuildWorkspaceService) resolveRoot() (string, error) {+ if s.settings == nil {+ return "", errors.New("settings service not available")+ }++ root := strings.TrimSpace(s.settings.GetSettingsConfig().BuildsDirectory.Value)+ if root == "" {+ root = defaultBuildsDirectory+ }++ if !filepath.IsAbs(root) {+ return "", fmt.Errorf("builds directory must be an absolute path")+ }++ cleaned := filepath.Clean(root)+ if err := os.MkdirAll(cleaned, 0o755); err != nil {+ return "", fmt.Errorf("failed to ensure builds directory: %w", err)+ }++ return cleaned, nil+}++func sanitizeBuildPath(input string) (string, error) {+ trimmed := strings.TrimSpace(input)+ if trimmed == "" || trimmed == "/" {+ return "/", nil+ }++ cleaned := path.Clean(trimmed)+ if !path.IsAbs(cleaned) {+ cleaned = "/" + cleaned+ }+ if strings.Contains(cleaned, "/../") || strings.HasSuffix(cleaned, "/..") || cleaned == "/.." {+ return "", fmt.Errorf("invalid path: path traversal not allowed")+ }+ if !strings.HasPrefix(cleaned, "/") {+ return "", fmt.Errorf("invalid path: must be absolute")+ }++ return cleaned, nil+}++func sanitizeUploadFilename(filename string) (string, error) {+ name := strings.TrimSpace(filename)+ if name == "" {+ return "", fmt.Errorf("invalid filename")+ }++ // Reject any path separators (handle both Unix and Windows-style separators).+ if strings.Contains(name, "/") || strings.Contains(name, "\\") {+ return "", fmt.Errorf("invalid filename: must not contain path separators")+ }++ // On Windows, disallow drive/volume prefixes (e.g. C: or \\server\share).+ if vol := filepath.VolumeName(name); vol != "" {+ return "", fmt.Errorf("invalid filename: must not include volume prefix")+ }++ base := filepath.Base(name)+ if base != name {+ return "", fmt.Errorf("invalid filename: must not contain path separators")+ }+ if base == "." || base == ".." {+ return "", fmt.Errorf("invalid filename")+ }++ return base, nil+}++func joinBuildRoot(root, cleaned string) (string, error) {+ rel := strings.TrimPrefix(cleaned, "/")+ fullPath := filepath.Join(root, filepath.FromSlash(rel))+ if !isWithinRoot(root, fullPath) {+ return "", fmt.Errorf("invalid path: outside builds directory")+ }+ return fullPath, nil+}++func isWithinRoot(root, target string) bool {+ rootClean := filepath.Clean(root)+ targetClean := filepath.Clean(target)+ if targetClean == rootClean {+ return true+ }+ return strings.HasPrefix(targetClean, rootClean+string(os.PathSeparator))+}++func resolveLinkTarget(root, target string) string {+ if target == "" {+ return ""+ }+ if filepath.IsAbs(target) {+ targetClean := filepath.Clean(target)+ if isWithinRoot(root, targetClean) {+ rel, err := filepath.Rel(root, targetClean)+ if err != nil {+ return "(external)"+ }+ rel = filepath.ToSlash(rel)+ if rel == "." || rel == "" {+ return "/"+ }+ return "/" + rel+ }+ return "(external)"+ }++ return filepath.ToSlash(target)+}diff --git a/backend/internal/services/container_registry_service.go b/backend/internal/services/container_registry_service.goindex 4d31b6df6..399757c2e 100644--- a/backend/internal/services/container_registry_service.go+++ b/backend/internal/services/container_registry_service.go@@ -18,8 +18,9 @@ import ("github.com/getarcaneapp/arcane/backend/internal/utils/crypto""github.com/getarcaneapp/arcane/backend/internal/utils/mapper""github.com/getarcaneapp/arcane/backend/internal/utils/pagination"- "github.com/getarcaneapp/arcane/backend/internal/utils/registry"+ utilsregistry "github.com/getarcaneapp/arcane/backend/internal/utils/registry""github.com/getarcaneapp/arcane/types/containerregistry"+ dockerregistry "github.com/moby/moby/api/types/registry"ref "go.podman.io/image/v5/docker/reference")@@ -190,6 +191,90 @@ func (s *ContainerRegistryService) GetEnabledRegistries(ctx context.Context) ([]return registries, nil}+// GetRegistryAuthForImage returns X-Registry-Auth for the image's registry host.+func (s *ContainerRegistryService) GetRegistryAuthForImage(ctx context.Context, imageRef string) (string, error) {+ registryHost, err := utilsregistry.GetRegistryAddress(imageRef)+ if err != nil {+ return "", err+ }+ return s.GetRegistryAuthForHost(ctx, registryHost)+}++// GetRegistryAuthForHost returns X-Registry-Auth for a configured and enabled registry.+func (s *ContainerRegistryService) GetRegistryAuthForHost(ctx context.Context, registryHost string) (string, error) {+ normalizedRegistryHost := utilsregistry.NormalizeRegistryForComparison(registryHost)+ if normalizedRegistryHost == "" {+ return "", nil+ }++ authConfigs, err := s.GetAllRegistryAuthConfigs(ctx)+ if err != nil {+ return "", err+ }+ if len(authConfigs) == 0 {+ return "", nil+ }++ cfg, ok := authConfigs[normalizedRegistryHost]+ if !ok {+ return "", nil+ }++ return utilsregistry.EncodeAuthHeader(cfg.Username, cfg.Password, cfg.ServerAddress)+}++func (s *ContainerRegistryService) GetAllRegistryAuthConfigs(ctx context.Context) (map[string]dockerregistry.AuthConfig, error) {+ registries, err := s.GetEnabledRegistries(ctx)+ if err != nil {+ return nil, err+ }++ authConfigs := make(map[string]dockerregistry.AuthConfig, len(registries))+ for _, reg := range registries {+ username := strings.TrimSpace(reg.Username)+ if !reg.Enabled || username == "" || reg.Token == "" {+ continue+ }++ decryptedToken, decryptErr := crypto.Decrypt(reg.Token)+ if decryptErr != nil {+ return nil, fmt.Errorf("failed to decrypt token for registry %s: %w", reg.URL, decryptErr)+ }+ token := strings.TrimSpace(decryptedToken)+ if token == "" {+ continue+ }++ normalizedHost := strings.TrimSpace(utilsregistry.NormalizeRegistryForComparison(reg.URL))+ if normalizedHost == "" {+ continue+ }++ serverAddress := normalizedHost+ if normalizedHost == "docker.io" {+ serverAddress = utilsregistry.NormalizeRegistryURL(reg.URL)+ }+ if serverAddress == "" {+ continue+ }++ authConfig := dockerregistry.AuthConfig{+ Username: username,+ Password: token,+ ServerAddress: serverAddress,+ }+ for _, key := range utilsregistry.RegistryAuthLookupKeys(normalizedHost) {+ authConfigs[key] = authConfig+ }+ }++ if len(authConfigs) == 0 {+ return nil, nil+ }++ return authConfigs, nil+}+// GetImageDigest fetches the current digest for an image:tag from the registry// This is used for digest-based update detection for non-semver tagsfunc (s *ContainerRegistryService) GetImageDigest(ctx context.Context, imageRef string) (string, error) {@@ -281,15 +366,8 @@ func (s *ContainerRegistryService) findCredentialsForRegistry(ctx context.Contexreturn nil}- // Normalize registry URL for comparison- normalizedURL := strings.TrimPrefix(registryURL, "https://")- normalizedURL = strings.TrimPrefix(normalizedURL, "http://")-for _, reg := range registries {- regURL := strings.TrimPrefix(reg.URL, "https://")- regURL = strings.TrimPrefix(regURL, "http://")-- if strings.Contains(normalizedURL, regURL) || strings.Contains(regURL, normalizedURL) {+ if utilsregistry.IsRegistryMatch(reg.URL, registryURL) {token, err := crypto.Decrypt(reg.Token)if err != nil {slog.WarnContext(ctx, "Failed to decrypt registry token", "registry", reg.URL, "error", err)@@ -521,13 +599,13 @@ func parseImageReference(imageRef string) (repository, tag string) {func parseRegistryAndRepo(repository string) (registryURL, repoPath string) {named, err := ref.ParseNormalizedNamed(repository)if err != nil {- return "https://registry-1.docker.io", "library/" + repository+ return "https://" + utilsregistry.DefaultRegistry, "library/" + repository}domain := ref.Domain(named)repoPath = ref.Path(named)- registryURL, err = registry.GetRegistryAddress(named.Name())+ registryURL, err = utilsregistry.GetRegistryAddress(named.Name())if err != nil {registryURL = "https://" + domain} else {@@ -539,6 +617,6 @@ func parseRegistryAndRepo(repository string) (registryURL, repoPath string) {// parseWWWAuth parses the WWW-Authenticate header using the registry clientfunc parseWWWAuth(header string) (realm, service string) {- c := registry.NewClient()+ c := utilsregistry.NewClient()return c.ParseAuthChallenge(header)}diff --git a/backend/internal/services/container_registry_service_test.go b/backend/internal/services/container_registry_service_test.gonew file mode 100644index 000000000..9ca07760e--- /dev/null+++ b/backend/internal/services/container_registry_service_test.go@@ -0,0 +1,56 @@+package services++import (+ "context"+ "testing"++ "github.com/stretchr/testify/assert"+ "github.com/stretchr/testify/require"+)++func TestContainerRegistryService_GetAllRegistryAuthConfigs_NormalizesHosts(t *testing.T) {+ _, db := setupImageServiceAuthTest(t)+ createTestPullRegistry(t, db, "https://index.docker.io/v1/", "docker-user", "docker-token")+ createTestPullRegistry(t, db, "https://GHCR.IO/", "gh-user", "gh-token")++ svc := NewContainerRegistryService(db)+ authConfigs, err := svc.GetAllRegistryAuthConfigs(context.Background())+ require.NoError(t, err)+ require.NotNil(t, authConfigs)++ dockerCfg, ok := authConfigs["docker.io"]+ require.True(t, ok)+ assert.Equal(t, "docker-user", dockerCfg.Username)+ assert.Equal(t, "docker-token", dockerCfg.Password)+ assert.Equal(t, "https://index.docker.io/v1/", dockerCfg.ServerAddress)++ assert.Equal(t, dockerCfg, authConfigs["registry-1.docker.io"])+ assert.Equal(t, dockerCfg, authConfigs["index.docker.io"])++ ghcrCfg, ok := authConfigs["ghcr.io"]+ require.True(t, ok)+ assert.Equal(t, "gh-user", ghcrCfg.Username)+ assert.Equal(t, "gh-token", ghcrCfg.Password)+ assert.Equal(t, "ghcr.io", ghcrCfg.ServerAddress)+}++func TestContainerRegistryService_GetAllRegistryAuthConfigs_SkipsInvalidEntries(t *testing.T) {+ _, db := setupImageServiceAuthTest(t)+ createTestPullRegistry(t, db, "https://docker.io", " ", "docker-token")+ createTestPullRegistry(t, db, "https://ghcr.io", "gh-user", " ")+ createTestPullRegistry(t, db, "https://registry.example.com", "example-user", "example-token")++ svc := NewContainerRegistryService(db)+ authConfigs, err := svc.GetAllRegistryAuthConfigs(context.Background())+ require.NoError(t, err)+ require.NotNil(t, authConfigs)++ assert.NotContains(t, authConfigs, "docker.io")+ assert.NotContains(t, authConfigs, "ghcr.io")++ exampleCfg, ok := authConfigs["registry.example.com"]+ require.True(t, ok)+ assert.Equal(t, "example-user", exampleCfg.Username)+ assert.Equal(t, "example-token", exampleCfg.Password)+ assert.Equal(t, "registry.example.com", exampleCfg.ServerAddress)+}diff --git a/backend/internal/services/container_service.go b/backend/internal/services/container_service.goindex b5e87b208..b7a0e3be1 100644--- a/backend/internal/services/container_service.go+++ b/backend/internal/services/container_service.go@@ -14,6 +14,7 @@ import ("github.com/getarcaneapp/arcane/backend/internal/database""github.com/getarcaneapp/arcane/backend/internal/models"+ dockerutils "github.com/getarcaneapp/arcane/backend/internal/utils/docker""github.com/getarcaneapp/arcane/backend/internal/utils/pagination""github.com/getarcaneapp/arcane/backend/internal/utils/timeouts""github.com/getarcaneapp/arcane/backend/pkg/libarcane"@@ -219,10 +220,10 @@ func (s *ContainerService) CreateContainer(ctx context.Context, config *containe}defer func() { _ = reader.Close() }()- _, copyErr := io.Copy(io.Discard, reader)- if copyErr != nil {- s.eventService.LogErrorEvent(ctx, models.EventTypeContainerError, "container", "", containerName, user.ID, user.Username, "0", copyErr, models.JSON{"action": "create", "image": config.Image, "step": "complete_pull"})- return nil, fmt.Errorf("failed to complete image pull: %w", copyErr)+ streamErr := dockerutils.ConsumeJSONMessageStream(reader, nil)+ if streamErr != nil {+ s.eventService.LogErrorEvent(ctx, models.EventTypeContainerError, "container", "", containerName, user.ID, user.Username, "0", streamErr, models.JSON{"action": "create", "image": config.Image, "step": "complete_pull"})+ return nil, fmt.Errorf("failed to complete image pull: %w", streamErr)}}diff --git a/backend/internal/services/image_service.go b/backend/internal/services/image_service.goindex bd6a0b449..6b281db45 100644--- a/backend/internal/services/image_service.go+++ b/backend/internal/services/image_service.go@@ -1,10 +1,7 @@package servicesimport (- "bufio""context"- "encoding/base64"- "encoding/json""errors""fmt""io"@@ -14,13 +11,14 @@ import ("github.com/getarcaneapp/arcane/backend/internal/database""github.com/getarcaneapp/arcane/backend/internal/models"+ dockerutils "github.com/getarcaneapp/arcane/backend/internal/utils/docker""github.com/getarcaneapp/arcane/backend/internal/utils/pagination"+ utilsregistry "github.com/getarcaneapp/arcane/backend/internal/utils/registry""github.com/getarcaneapp/arcane/types/containerregistry"imagetypes "github.com/getarcaneapp/arcane/types/image""github.com/getarcaneapp/arcane/types/vulnerability""github.com/moby/moby/api/types/container""github.com/moby/moby/api/types/image"- "github.com/moby/moby/api/types/registry""github.com/moby/moby/client"ref "go.podman.io/image/v5/docker/reference""golang.org/x/sync/errgroup"@@ -190,32 +188,32 @@ func (s *ImageService) PullImage(ctx context.Context, imageName string, progress}defer func() { _ = reader.Close() }()- scanner := bufio.NewScanner(reader)- flusher, implementsFlusher := progressWriter.(http.Flusher)+ streamWriter := progressWriter+ if streamWriter == nil {+ streamWriter = io.Discard+ }- for scanner.Scan() {- line := scanner.Bytes()- if _, writeErr := progressWriter.Write(line); writeErr != nil {- s.eventService.LogErrorEvent(ctx, models.EventTypeImageError, "image", "", imageName, user.ID, user.Username, "0", writeErr, models.JSON{"action": "pull", "step": "write_progress"})- return fmt.Errorf("error writing pull progress for %s: %w", imageName, writeErr)+ flusher, implementsFlusher := streamWriter.(http.Flusher)+ streamErr := dockerutils.ConsumeJSONMessageStream(reader, func(line []byte) error {+ if _, writeErr := streamWriter.Write(line); writeErr != nil {+ return writeErr}- if _, writeErr := progressWriter.Write([]byte("\n")); writeErr != nil {- s.eventService.LogErrorEvent(ctx, models.EventTypeImageError, "image", "", imageName, user.ID, user.Username, "0", writeErr, models.JSON{"action": "pull", "step": "write_newline"})- return fmt.Errorf("error writing newline for %s: %w", imageName, writeErr)+ if _, writeErr := streamWriter.Write([]byte("\n")); writeErr != nil {+ return writeErr}-if implementsFlusher {flusher.Flush()}- }- if scanErr := scanner.Err(); scanErr != nil {- if errors.Is(scanErr, context.Canceled) || strings.Contains(scanErr.Error(), "context canceled") {- slog.Debug("image pull stream canceled", "image", imageName, "err", scanErr)- s.eventService.LogErrorEvent(ctx, models.EventTypeImageError, "image", "", imageName, user.ID, user.Username, "0", scanErr, models.JSON{"action": "pull", "step": "canceled"})- return fmt.Errorf("image pull stream canceled for %s: %w", imageName, scanErr)+ return nil+ })+ if streamErr != nil {+ if errors.Is(streamErr, context.Canceled) || strings.Contains(streamErr.Error(), "context canceled") {+ slog.Debug("image pull stream canceled", "image", imageName, "err", streamErr)+ s.eventService.LogErrorEvent(ctx, models.EventTypeImageError, "image", "", imageName, user.ID, user.Username, "0", streamErr, models.JSON{"action": "pull", "step": "canceled"})+ return fmt.Errorf("image pull stream canceled for %s: %w", imageName, streamErr)}- s.eventService.LogErrorEvent(ctx, models.EventTypeImageError, "image", "", imageName, user.ID, user.Username, "0", scanErr, models.JSON{"action": "pull", "step": "read_stream"})- return fmt.Errorf("error reading image pull stream for %s: %w", imageName, scanErr)+ s.eventService.LogErrorEvent(ctx, models.EventTypeImageError, "image", "", imageName, user.ID, user.Username, "0", streamErr, models.JSON{"action": "pull", "step": "read_stream"})+ return fmt.Errorf("error reading image pull stream for %s: %w", imageName, streamErr)}slog.Debug("image pull stream completed", "image", imageName)@@ -254,14 +252,22 @@ func (s *ImageService) LoadImageFromReader(ctx context.Context, reader io.Readerdefer func() { _ = loadResp.Close() }()var result imagetypes.LoadResult- responseBytes, err := io.ReadAll(loadResp)- if err != nil {- s.eventService.LogErrorEvent(ctx, models.EventTypeImageError, "image", "", fileName, user.ID, user.Username, "0", err, models.JSON{"action": "load", "file": fileName, "step": "read_response"})- return nil, fmt.Errorf("failed to read load response: %w", err)+ var responseBuilder strings.Builder+ streamErr := dockerutils.ConsumeJSONMessageStream(loadResp, func(line []byte) error {+ if _, err := responseBuilder.Write(line); err != nil {+ return err+ }+ if err := responseBuilder.WriteByte('\n'); err != nil {+ return err+ }+ return nil+ })+ if streamErr != nil {+ s.eventService.LogErrorEvent(ctx, models.EventTypeImageError, "image", "", fileName, user.ID, user.Username, "0", streamErr, models.JSON{"action": "load", "file": fileName, "step": "read_response"})+ return nil, fmt.Errorf("failed to read load response: %w", streamErr)}- responseStr := string(responseBytes)- result.Stream = responseStr+ result.Stream = responseBuilder.String()metadata := models.JSON{"action": "load",@@ -295,7 +301,7 @@ func (s *ImageService) ImageExistsLocally(ctx context.Context, imageName string)func (s *ImageService) getPullOptionsWithAuth(ctx context.Context, imageRef string, externalCreds []containerregistry.Credential) (client.ImagePullOptions, error) {pullOptions := client.ImagePullOptions{}- registryHost := s.extractRegistryHost(imageRef)+ registryHost := utilsregistry.ExtractRegistryHost(imageRef)// Check external credentials firstfor _, cred := range externalCreds {@@ -303,8 +309,8 @@ func (s *ImageService) getPullOptionsWithAuth(ctx context.Context, imageRef stricontinue}- if s.isRegistryMatch(cred.URL, registryHost) {- authStr, err := s.createAuthHeader(cred.Username, cred.Token, s.normalizeRegistryURL(cred.URL))+ if utilsregistry.IsRegistryMatch(cred.URL, registryHost) {+ authStr, err := utilsregistry.EncodeAuthHeader(cred.Username, cred.Token, utilsregistry.NormalizeRegistryURL(cred.URL))if err != nil {return pullOptions, fmt.Errorf("failed to create auth header: %w", err)}@@ -319,110 +325,18 @@ func (s *ImageService) getPullOptionsWithAuth(ctx context.Context, imageRef strireturn pullOptions, nil}- // Check database registries- registries, err := s.registryService.GetEnabledRegistries(ctx)+ authStr, err := s.registryService.GetRegistryAuthForHost(ctx, registryHost)if err != nil {return pullOptions, fmt.Errorf("failed to get registry credentials: %w", err)}-- for _, reg := range registries {- if s.isRegistryMatch(reg.URL, registryHost) {- username := strings.TrimSpace(reg.Username)- if username == "" {- slog.DebugContext(ctx, "Skipping database credentials for image pull", "registry", registryHost, "configuredRegistry", reg.URL, "reason", "missing_username")- continue- }-- decryptedToken, err := s.registryService.GetDecryptedToken(ctx, reg.ID)- if err != nil {- return pullOptions, fmt.Errorf("failed to decrypt token for registry %s: %w", reg.URL, err)- }- token := strings.TrimSpace(decryptedToken)- if token == "" {- slog.DebugContext(ctx, "Skipping database credentials for image pull", "registry", registryHost, "configuredRegistry", reg.URL, "reason", "missing_token")- continue- }-- authStr, err := s.createAuthHeader(username, token, s.normalizeRegistryURL(reg.URL))- if err != nil {- return pullOptions, fmt.Errorf("failed to create auth header: %w", err)- }- pullOptions.RegistryAuth = authStr-- slog.DebugContext(ctx, "Using database credentials for image pull", "registry", registryHost, "username", username)- break- }+ if authStr != "" {+ pullOptions.RegistryAuth = authStr+ slog.DebugContext(ctx, "Using database credentials for image pull", "registry", registryHost)}return pullOptions, nil}-func (s *ImageService) createAuthHeader(username, password, serverAddress string) (string, error) {- authConfig := ®istry.AuthConfig{- Username: username,- Password: password,- ServerAddress: serverAddress,- }-- authBytes, err := json.Marshal(authConfig)- if err != nil {- return "", err- }-- return base64.StdEncoding.EncodeToString(authBytes), nil-}--func (s *ImageService) extractRegistryHost(imageRef string) string {- if i := strings.IndexByte(imageRef, '@'); i != -1 {- imageRef = imageRef[:i]- }-- hostCandidate, _, found := strings.Cut(imageRef, "/")- if !found {- return "docker.io"- }-- if !strings.Contains(hostCandidate, ".") && !strings.Contains(hostCandidate, ":") {- return "docker.io"- }- return hostCandidate-}--func (s *ImageService) isRegistryMatch(credURL, registryHost string) bool {- normalizedCred := s.normalizeRegistryForComparison(credURL)- normalizedHost := s.normalizeRegistryForComparison(registryHost)-- return normalizedCred == normalizedHost-}--func (s *ImageService) normalizeRegistryForComparison(url string) string {- url = strings.TrimPrefix(url, "https://")- url = strings.TrimPrefix(url, "http://")- url = strings.TrimSuffix(url, "/")-- if slash := strings.Index(url, "/"); slash != -1 {- url = url[:slash]- }-- if url == "docker.io" || url == "registry-1.docker.io" || url == "index.docker.io" {- return "docker.io"- }- return url-}--func (s *ImageService) normalizeRegistryURL(url string) string {- normalized := s.normalizeRegistryForComparison(url)- if normalized == "docker.io" {- return "https://index.docker.io/v1/"- }-- result := strings.TrimPrefix(url, "https://")- result = strings.TrimPrefix(result, "http://")- result = strings.TrimSuffix(result, "/")-- return result-}-func shouldRetryAnonymousPullInternal(pullOptions client.ImagePullOptions, pullErr error) bool {if pullOptions.RegistryAuth == "" || pullErr == nil {return falsediff --git a/backend/internal/services/image_service_test.go b/backend/internal/services/image_service_test.goindex 570c053ef..1c67bdd9a 100644--- a/backend/internal/services/image_service_test.go+++ b/backend/internal/services/image_service_test.go@@ -2,8 +2,6 @@ package servicesimport ("context"- "encoding/base64"- "encoding/json""errors""testing"@@ -17,6 +15,7 @@ import ("github.com/getarcaneapp/arcane/backend/internal/utils/crypto"imagetypes "github.com/getarcaneapp/arcane/types/image""github.com/getarcaneapp/arcane/types/vulnerability"+ dockerauthconfig "github.com/moby/moby/api/pkg/authconfig"dockerregistry "github.com/moby/moby/api/types/registry""github.com/moby/moby/client""github.com/stretchr/testify/assert"@@ -92,12 +91,9 @@ func createTestPullRegistry(t *testing.T, db *database.DB, url, username, tokenfunc decodeRegistryAuth(t *testing.T, encoded string) dockerregistry.AuthConfig {t.Helper()- raw, err := base64.StdEncoding.DecodeString(encoded)+ cfg, err := dockerauthconfig.Decode(encoded)require.NoError(t, err)-- var cfg dockerregistry.AuthConfig- require.NoError(t, json.Unmarshal(raw, &cfg))- return cfg+ return *cfg}func TestGetPullOptionsWithAuth_DBRegistrySkipsEmptyToken(t *testing.T) {diff --git a/backend/internal/services/image_update_service.go b/backend/internal/services/image_update_service.goindex 872021357..2bb644211 100644--- a/backend/internal/services/image_update_service.go+++ b/backend/internal/services/image_update_service.go@@ -248,7 +248,7 @@ func (s *ImageUpdateService) parseImageReference(imageRef string) *ImageParts {}// Extract registry- registry := ref.Domain(named)+ registryHost := ref.Domain(named)// Extract repository (path without registry)repository := ref.Path(named)@@ -263,7 +263,7 @@ func (s *ImageUpdateService) parseImageReference(imageRef string) *ImageParts {}return &ImageParts{- Registry: registry,+ Registry: registry.NormalizeRegistryForComparison(registryHost),Repository: repository,Tag: tag,}@@ -326,7 +326,7 @@ func (s *ImageUpdateService) parseImageReferenceFallback(imageRef string) *Image}}}- return &ImageParts{Registry: registryHost, Repository: repository, Tag: tag}+ return &ImageParts{Registry: registry.NormalizeRegistryForComparison(registryHost), Repository: repository, Tag: tag}}func (s *ImageUpdateService) getImageRefByID(ctx context.Context, imageID string) (string, error) {@@ -444,7 +444,7 @@ func (s *ImageUpdateService) inspectLocalImageSnapshotInternal(ctx context.Conte// Returns all enabled credentials whose URL matches the image registry domain (normalized)func (s *ImageUpdateService) getRegistriesForImage(ctx context.Context, regHost string) []models.ContainerRegistry {- normalizedDomain := s.normalizeRegistryURL(regHost)+ normalizedDomain := registry.NormalizeRegistryForComparison(regHost)registries, err := s.registryService.GetAllRegistries(ctx)if err != nil {@@ -457,40 +457,21 @@ func (s *ImageUpdateService) getRegistriesForImage(ctx context.Context, regHostif !reg.Enabled {continue}- normalizedRegURL := s.normalizeRegistryURL(reg.URL)+ normalizedRegURL := registry.NormalizeRegistryForComparison(reg.URL)if normalizedRegURL == normalizedDomain {matches = append(matches, reg)}}- slog.DebugContext(ctx, "Matched registry credentials for image",- "registry", regHost,- "normalizedDomain", normalizedDomain,- "matchCount", len(matches))+ slog.DebugContext(ctx, "Matched registry credentials for image", "registry", regHost, "normalizedDomain", normalizedDomain, "matchCount", len(matches))for i, reg := range matches {- slog.DebugContext(ctx, "Matched credential",- "index", i,- "registryURL", reg.URL,- "username", reg.Username)+ slog.DebugContext(ctx, "Matched credential", "index", i, "registryURL", reg.URL, "username", reg.Username)}return matches}-func (s *ImageUpdateService) normalizeRegistryURL(url string) string {- url = strings.TrimSpace(strings.ToLower(url))- url = strings.TrimPrefix(url, "https://")- url = strings.TrimPrefix(url, "http://")- url = strings.TrimSuffix(url, "/")-- switch url {- case "docker.io", "registry-1.docker.io", "index.docker.io":- return "docker.io"- }- return url-}-func (s *ImageUpdateService) normalizeRepository(regHost, repo string) string {if regHost == "docker.io" && !strings.Contains(repo, "/") {return "library/" + repo@@ -756,20 +737,13 @@ func (s *ImageUpdateService) buildCredentialMap(ctx context.Context, externalCrevar enabledRegs []models.ContainerRegistrycredMap := make(map[string]batchCred)- normalizeHost := func(u string) string {- u = strings.TrimSpace(u)- u = strings.TrimPrefix(u, "https://")- u = strings.TrimPrefix(u, "http://")- return strings.TrimSuffix(u, "/")- }-if len(externalCreds) > 0 {enabledRegHosts := make(map[string]struct{})for _, c := range externalCreds {if !c.Enabled || c.Username == "" || c.Token == "" {continue}- host := normalizeHost(c.URL)+ host := registry.NormalizeRegistryForComparison(c.URL)if host == "" {continue}@@ -807,7 +781,7 @@ func (s *ImageUpdateService) buildCredentialMap(ctx context.Context, externalCreif r.Username == "" || r.Token == "" {continue}- host := normalizeHost(r.URL)+ host := registry.NormalizeRegistryForComparison(r.URL)if host == "" {continue}@@ -825,12 +799,6 @@ func (s *ImageUpdateService) buildCredentialMap(ctx context.Context, externalCrefunc (s *ImageUpdateService) buildRegistryAuthMap(ctx context.Context, rc *registry.Client, regRepos map[string]map[string]struct{}, credMap map[string]batchCred) map[string]regAuth {regAuthMap := make(map[string]regAuth, len(regRepos))- normalizeHost := func(u string) string {- u = strings.TrimSpace(u)- u = strings.TrimPrefix(u, "https://")- u = strings.TrimPrefix(u, "http://")- return strings.TrimSuffix(u, "/")- }slog.DebugContext(ctx, "Building registry auth map","registryCount", len(regRepos),@@ -868,7 +836,7 @@ func (s *ImageUpdateService) buildRegistryAuthMap(ctx context.Context, rc *regis}// Credential attempt first (if available)- host := normalizeHost(regHost)+ host := registry.NormalizeRegistryForComparison(regHost)slog.DebugContext(ctx, "Looking up credentials for registry","registry", regHost,"normalizedHost", host,diff --git a/backend/internal/services/image_update_service_test.go b/backend/internal/services/image_update_service_test.goindex 2da670cc6..617846eef 100644--- a/backend/internal/services/image_update_service_test.go+++ b/backend/internal/services/image_update_service_test.go@@ -10,6 +10,7 @@ import ("github.com/getarcaneapp/arcane/backend/internal/database""github.com/getarcaneapp/arcane/backend/internal/models""github.com/getarcaneapp/arcane/backend/internal/utils/crypto"+ utilsregistry "github.com/getarcaneapp/arcane/backend/internal/utils/registry""github.com/getarcaneapp/arcane/types/containerregistry""github.com/getarcaneapp/arcane/types/imageupdate"glsqlite "github.com/glebarez/sqlite"@@ -789,7 +790,7 @@ func TestImageUpdateService_BuildCredentialMap_ExternalCredsDedupesEnabledRegist// Enabled registry records used for auth fallback should be de-duplicated per host.enabledByHost := make(map[string]models.ContainerRegistry, len(enabledRegs))for _, reg := range enabledRegs {- host := svc.normalizeRegistryURL(reg.URL)+ host := utilsregistry.NormalizeRegistryForComparison(reg.URL)enabledByHost[host] = reg}require.Contains(t, enabledByHost, "ghcr.io")diff --git a/backend/internal/services/project_service.go b/backend/internal/services/project_service.goindex 796b46e85..5296314b7 100644--- a/backend/internal/services/project_service.go+++ b/backend/internal/services/project_service.go@@ -7,6 +7,7 @@ import ("fmt""io""log/slog"+ "maps""os""path/filepath""strings"@@ -26,7 +27,9 @@ import ("github.com/getarcaneapp/arcane/backend/internal/utils/pathmapper""github.com/getarcaneapp/arcane/backend/internal/utils/timeouts""github.com/getarcaneapp/arcane/backend/pkg/projects"+ "github.com/getarcaneapp/arcane/types""github.com/getarcaneapp/arcane/types/containerregistry"+ imagetypes "github.com/getarcaneapp/arcane/types/image""github.com/getarcaneapp/arcane/types/project""github.com/moby/moby/api/types/container""gorm.io/gorm"@@ -38,15 +41,17 @@ type ProjectService struct {eventService *EventServiceimageService *ImageServicedockerService *DockerClientService+ buildService *BuildService}-func NewProjectService(db *database.DB, settingsService *SettingsService, eventService *EventService, imageService *ImageService, dockerService *DockerClientService) *ProjectService {+func NewProjectService(db *database.DB, settingsService *SettingsService, eventService *EventService, imageService *ImageService, dockerService *DockerClientService, buildService *BuildService) *ProjectService {return &ProjectService{db: db,settingsService: settingsService,eventService: eventService,imageService: imageService,dockerService: dockerService,+ buildService: buildService,}}@@ -114,6 +119,21 @@ type ProjectServiceInfo struct {ServiceConfig *composetypes.ServiceConfig `json:"service_config,omitempty"`}+type ProjectBuildOptions struct {+ Services []string+ Provider string+ Push *bool+ Load *bool+}++type deployImageDecision struct {+ Build bool+ PullAlways bool+ PullIfMissing bool+ FallbackBuildOnPullFail bool+ RequireLocalOnly bool+}+type imagePullMode intconst (@@ -361,6 +381,7 @@ func (s *ProjectService) GetProjectDetails(ctx context.Context, projectID stringresp.UpdatedAt = proj.UpdatedAt.Format(time.RFC3339)resp.ComposeContent = composeContentresp.EnvContent = envContent+ resp.HasBuildDirective = falseresp.DirName = utils.DerefString(proj.DirName)resp.GitOpsManagedBy = proj.GitOpsManagedBymeta := s.getProjectMetadataFromPath(ctx, proj.Path)@@ -456,10 +477,15 @@ func (s *ProjectService) enrichWithComposeServiceConfigs(ctx context.Context, prif loadErr == nil && composeProj != nil {// Convert map to slicesvcList := make([]composetypes.ServiceConfig, 0, len(composeProj.Services))+ hasBuildDirective := falsefor _, svc := range composeProj.Services {svcList = append(svcList, svc)+ if svc.Build != nil {+ hasBuildDirective = true+ }}resp.Services = svcList+ resp.HasBuildDirective = resp.HasBuildDirective || hasBuildDirective}}@@ -791,13 +817,8 @@ func (s *ProjectService) DeployProject(ctx context.Context, projectID string, usreturn fmt.Errorf("failed to update project status to deploying: %w", err)}- progressWriter, _ := ctx.Value(projects.ProgressWriterKey{}).(io.Writer)- if progressWriter == nil {- progressWriter = io.Discard- }-- if perr := s.EnsureProjectImagesPresent(ctx, projectID, progressWriter, user, nil); perr != nil {- slog.Warn("ensure images present failed (continuing to compose up)", "projectID", projectID, "error", perr)+ if perr := s.prepareProjectImagesForDeploy(ctx, projectID, project, io.Discard, nil, &user); perr != nil {+ slog.Warn("prepare images for deploy failed (continuing to compose up)", "projectID", projectID, "error", perr)}removeOrphans := projectFromDb.GitOpsManagedBy != nil && *projectFromDb.GitOpsManagedBy != ""@@ -1061,6 +1082,38 @@ func (s *ProjectService) PullProjectImages(ctx context.Context, projectID stringreturn nil}+func (s *ProjectService) BuildProjectServices(ctx context.Context, projectID string, options ProjectBuildOptions, progressWriter io.Writer, user *models.User) error {+ projectFromDb, err := s.GetProjectFromDatabaseByID(ctx, projectID)+ if err != nil {+ return err+ }++ composeFileFullPath, derr := projects.DetectComposeFile(projectFromDb.Path)+ if derr != nil {+ return fmt.Errorf("no compose file found in project directory: %s", projectFromDb.Path)+ }++ projectsDirSetting := s.settingsService.GetStringSetting(ctx, "projectsDirectory", "/app/data/projects")+ projectsDirectory, pdErr := fs.GetProjectsDirectory(ctx, strings.TrimSpace(projectsDirSetting))+ if pdErr != nil {+ slog.WarnContext(ctx, "unable to determine projects directory; using default", "error", pdErr)+ projectsDirectory = "/app/data/projects"+ }++ pathMapper, pmErr := s.getPathMapper(ctx)+ if pmErr != nil {+ slog.WarnContext(ctx, "failed to create path mapper, continuing without translation", "error", pmErr)+ }++ autoInjectEnv := s.settingsService.GetBoolSetting(ctx, "autoInjectEnv", false)+ project, loadErr := projects.LoadComposeProject(ctx, composeFileFullPath, normalizeComposeProjectName(projectFromDb.Name), projectsDirectory, autoInjectEnv, pathMapper)+ if loadErr != nil {+ return fmt.Errorf("failed to load compose project from %s: %w", projectFromDb.Path, loadErr)+ }++ return s.buildProjectServicesInternal(ctx, projectID, project, options, progressWriter, user)+}+// EnsureProjectImagesPresent checks all compose service images for the project and// pulls based on service pull policy:// - always/refresh: always pull@@ -1093,6 +1146,10 @@ func (s *ProjectService) EnsureProjectImagesPresent(ctx context.Context, projectpullPlan := buildProjectImagePullPlan(compProj.Services)+ return s.ensureImagesPresent(ctx, pullPlan, progressWriter, credentials, user)+}++func (s *ProjectService) ensureImagesPresent(ctx context.Context, pullPlan map[string]imagePullMode, progressWriter io.Writer, credentials []containerregistry.Credential, user models.User) error {settings := s.settingsService.GetSettingsConfig()for img, mode := range pullPlan {@@ -1137,6 +1194,511 @@ func (s *ProjectService) EnsureProjectImagesPresent(ctx context.Context, projectreturn nil}+func (s *ProjectService) pullImageForService(ctx context.Context, imageRef string, progressWriter io.Writer, credentials []containerregistry.Credential) error {+ settings := s.settingsService.GetSettingsConfig()+ pullCtx, pullCancel := timeouts.WithTimeout(ctx, settings.DockerImagePullTimeout.AsInt(), timeouts.DefaultDockerImagePull)+ defer pullCancel()++ if err := s.imageService.PullImage(pullCtx, imageRef, progressWriter, systemUser, credentials); err != nil {+ if errors.Is(pullCtx.Err(), context.DeadlineExceeded) {+ return fmt.Errorf("image pull timed out for %s (increase DOCKER_IMAGE_PULL_TIMEOUT or setting)", imageRef)+ }+ return err+ }++ return nil+}++func (s *ProjectService) prepareProjectImagesForDeploy(+ ctx context.Context,+ projectID string,+ project *composetypes.Project,+ progressWriter io.Writer,+ credentials []containerregistry.Credential,+ user *models.User,+) error {+ if project == nil {+ return nil+ }++ pathMapper, pmErr := s.getPathMapper(ctx)+ if pmErr != nil {+ slog.WarnContext(ctx, "failed to create path mapper, continuing without translation", "error", pmErr)+ }++ for name, svc := range project.Services {+ svc, imageName, updated := prepareDeployServiceConfig(projectID, project.Name, name, svc)+ if updated {+ project.Services[name] = svc+ }++ if imageName == "" {+ continue+ }++ decision := decideDeployImageAction(svc)+ if err := s.ensureDeployServiceImageReady(ctx, projectID, project, name, svc, imageName, decision, progressWriter, credentials, user, pathMapper); err != nil {+ return err+ }+ }++ return nil+}++func prepareDeployServiceConfig(projectID, projectName, serviceName string, svc composetypes.ServiceConfig) (composetypes.ServiceConfig, string, bool) {+ if svc.Build == nil {+ return svc, strings.TrimSpace(svc.Image), false+ }++ resolvedImage, updatedSvc, updated := ensureServiceImage(projectID, projectName, serviceName, svc)+ return updatedSvc, resolvedImage, updated+}++func shouldPullDeployImage(decision deployImageDecision, exists bool) bool {+ return decision.PullAlways || (decision.PullIfMissing && !exists)+}++func (s *ProjectService) ensureDeployServiceImageReady(+ ctx context.Context,+ projectID string,+ project *composetypes.Project,+ serviceName string,+ svc composetypes.ServiceConfig,+ imageName string,+ decision deployImageDecision,+ progressWriter io.Writer,+ credentials []containerregistry.Credential,+ user *models.User,+ pathMapper *pathmapper.PathMapper,+) error {+ if decision.Build {+ return s.buildServiceImageForDeploy(ctx, projectID, project, serviceName, svc, progressWriter, user, pathMapper)+ }++ exists, err := s.imageService.ImageExistsLocally(ctx, imageName)+ if err != nil {+ slog.WarnContext(ctx, "failed to check local image existence", "image", imageName, "error", err)+ }++ if decision.RequireLocalOnly {+ if !exists {+ return fmt.Errorf("image %s is not available locally and pull_policy is set to never", imageName)+ }+ return nil+ }++ if !shouldPullDeployImage(decision, exists) {+ return nil+ }++ if err := s.pullImageForService(ctx, imageName, progressWriter, credentials); err == nil {+ return nil+ } else if svc.Build != nil && decision.FallbackBuildOnPullFail {+ slog.WarnContext(ctx, "image pull failed, falling back to build", "service", serviceName, "image", imageName, "error", err)+ return s.buildServiceImageForDeploy(ctx, projectID, project, serviceName, svc, progressWriter, user, pathMapper)+ } else {+ return fmt.Errorf("failed to pull image %s: %w", imageName, err)+ }+}++func (s *ProjectService) buildServiceImageForDeploy(+ ctx context.Context,+ projectID string,+ project *composetypes.Project,+ serviceName string,+ svc composetypes.ServiceConfig,+ progressWriter io.Writer,+ user *models.User,+ pathMapper *pathmapper.PathMapper,+) error {+ if s.buildService == nil {+ return fmt.Errorf("build service not available for service %s", serviceName)+ }++ buildReq, updatedSvc, updated, err := s.prepareServiceBuildRequest(ctx, projectID, project, serviceName, svc, ProjectBuildOptions{}, pathMapper)+ if err != nil {+ return err+ }+ if updated {+ project.Services[serviceName] = updatedSvc+ }++ if _, err := s.buildService.BuildImage(ctx, types.LOCAL_DOCKER_ENVIRONMENT_ID, buildReq, progressWriter, serviceName, user); err != nil {+ return err+ }++ return nil+}++func normalizeBuildSelections(services []string) map[string]struct{} {+ selected := map[string]struct{}{}+ for _, name := range services {+ name = strings.TrimSpace(name)+ if name == "" {+ continue+ }+ selected[name] = struct{}{}+ }+ return selected+}++func serviceSelected(selected map[string]struct{}, name string) bool {+ if len(selected) == 0 {+ return true+ }+ _, ok := selected[name]+ return ok+}++func ensureServiceImage(projectID, projectName, serviceName string, svc composetypes.ServiceConfig) (string, composetypes.ServiceConfig, bool) {+ imageName := strings.TrimSpace(svc.Image)+ if imageName == "" {+ imageName = buildLocalImageTag(projectID, projectName, serviceName)+ svc.Image = imageName+ return imageName, svc, true+ }+ return imageName, svc, false+}++func normalizePullPolicy(policy string) string {+ policy = strings.ToLower(strings.TrimSpace(policy))+ if policy == "if_not_present" {+ return "missing"+ }+ return policy+}++func isAlwaysPullPolicy(policy string) bool {+ if policy == "always" || policy == "daily" || policy == "weekly" {+ return true+ }+ return strings.HasPrefix(policy, "every_")+}++func decideDeployImageAction(svc composetypes.ServiceConfig) deployImageDecision {+ policy := normalizePullPolicy(svc.PullPolicy)+ buildEnabled := svc.Build != nil++ if buildEnabled {+ switch {+ case policy == "build":+ return deployImageDecision{Build: true}+ case policy == "never":+ return deployImageDecision{RequireLocalOnly: true}+ case isAlwaysPullPolicy(policy):+ return deployImageDecision{PullAlways: true}+ case policy == "missing":+ return deployImageDecision{PullIfMissing: true}+ case policy == "":+ return deployImageDecision{PullIfMissing: true, FallbackBuildOnPullFail: true}+ default:+ return deployImageDecision{PullIfMissing: true}+ }+ }++ switch {+ case policy == "never":+ return deployImageDecision{RequireLocalOnly: true}+ case isAlwaysPullPolicy(policy):+ return deployImageDecision{PullAlways: true}+ default:+ return deployImageDecision{PullIfMissing: true}+ }+}++func resolveBuildContext(workingDir string, svc composetypes.ServiceConfig, serviceName string, pathMapper *pathmapper.PathMapper) (string, error) {+ contextDir := strings.TrimSpace(svc.Build.Context)+ if contextDir == "" {+ contextDir = workingDir+ } else if !filepath.IsAbs(contextDir) {+ contextDir = filepath.Join(workingDir, contextDir)+ }++ if contextDir == "" {+ return "", fmt.Errorf("build context not set for service %s", serviceName)+ }++ if pathMapper == nil {+ return contextDir, nil+ }++ mapped, err := pathMapper.ContainerToHost(contextDir)+ if err != nil {+ return "", fmt.Errorf("failed to map build context for %s: %w", serviceName, err)+ }+ return mapped, nil+}++func resolveDockerfilePath(svc composetypes.ServiceConfig, serviceName string, pathMapper *pathmapper.PathMapper) (string, error) {+ dockerfilePath := strings.TrimSpace(svc.Build.Dockerfile)+ if dockerfilePath == "" {+ dockerfilePath = "Dockerfile"+ }++ if !filepath.IsAbs(dockerfilePath) || pathMapper == nil {+ return dockerfilePath, nil+ }++ mapped, err := pathMapper.ContainerToHost(dockerfilePath)+ if err != nil {+ return "", fmt.Errorf("failed to map dockerfile path for %s: %w", serviceName, err)+ }+ return mapped, nil+}++func buildArgsFromCompose(args map[string]*string) map[string]string {+ buildArgs := map[string]string{}+ for key, value := range args {+ if value == nil {+ continue+ }+ buildArgs[key] = *value+ }+ return buildArgs+}++func (s *ProjectService) resolveEffectiveBuildProvider(override string) string {+ provider := strings.ToLower(strings.TrimSpace(override))+ if provider != "" {+ return provider+ }++ if s.buildService != nil {+ provider = strings.ToLower(strings.TrimSpace(s.buildService.BuildSettings().BuildProvider))+ }++ if provider == "" {+ provider = "local"+ }++ return provider+}++func labelsFromCompose(labels composetypes.Labels) map[string]string {+ if len(labels) == 0 {+ return nil+ }++ out := make(map[string]string, len(labels))+ maps.Copy(out, labels)++ return out+}++func ulimitsFromCompose(ulimits map[string]*composetypes.UlimitsConfig) map[string]string {+ if len(ulimits) == 0 {+ return nil+ }++ out := make(map[string]string, len(ulimits))+ for name, cfg := range ulimits {+ if cfg == nil {+ continue+ }++ switch {+ case cfg.Single > 0:+ out[name] = fmt.Sprintf("%d", cfg.Single)+ case cfg.Soft > 0 || cfg.Hard > 0:+ out[name] = fmt.Sprintf("%d:%d", cfg.Soft, cfg.Hard)+ }+ }++ if len(out) == 0 {+ return nil+ }++ return out+}++func mergeBuildTags(primaryImage string, composeTags []string) []string {+ seen := map[string]struct{}{}+ merged := make([]string, 0, len(composeTags)+1)++ appendTag := func(tag string) {+ tag = strings.TrimSpace(tag)+ if tag == "" {+ return+ }+ if _, ok := seen[tag]; ok {+ return+ }+ seen[tag] = struct{}{}+ merged = append(merged, tag)+ }++ appendTag(primaryImage)+ for _, tag := range composeTags {+ appendTag(tag)+ }++ return merged+}++func buildPlatformsFromCompose(svc composetypes.ServiceConfig) []string {+ platforms := make([]string, 0, len(svc.Build.Platforms)+1)+ for _, platform := range svc.Build.Platforms {+ platform = strings.TrimSpace(platform)+ if platform == "" {+ continue+ }+ platforms = append(platforms, platform)+ }++ if len(platforms) == 0 {+ if servicePlatform := strings.TrimSpace(svc.Platform); servicePlatform != "" {+ platforms = append(platforms, servicePlatform)+ }+ }++ return platforms+}++func (s *ProjectService) prepareServiceBuildRequest(+ ctx context.Context,+ projectID string,+ project *composetypes.Project,+ serviceName string,+ svc composetypes.ServiceConfig,+ options ProjectBuildOptions,+ pathMapper *pathmapper.PathMapper,+) (imagetypes.BuildRequest, composetypes.ServiceConfig, bool, error) {+ _ = ctx+ imageName, 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)+ }+ 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)+ }++ contextDir, err := resolveBuildContext(project.WorkingDir, updatedSvc, serviceName, pathMapper)+ if err != nil {+ return imagetypes.BuildRequest{}, updatedSvc, updated, err+ }++ dockerfilePath, err := resolveDockerfilePath(updatedSvc, serviceName, pathMapper)+ if err != nil {+ return imagetypes.BuildRequest{}, updatedSvc, updated, err+ }++ buildReq := imagetypes.BuildRequest{+ ContextDir: contextDir,+ Dockerfile: dockerfilePath,+ Tags: mergeBuildTags(imageName, updatedSvc.Build.Tags),+ Target: strings.TrimSpace(updatedSvc.Build.Target),+ BuildArgs: buildArgsFromCompose(updatedSvc.Build.Args),+ Labels: labelsFromCompose(updatedSvc.Build.Labels),+ CacheFrom: append([]string(nil), updatedSvc.Build.CacheFrom...),+ CacheTo: append([]string(nil), updatedSvc.Build.CacheTo...),+ NoCache: updatedSvc.Build.NoCache,+ Pull: updatedSvc.Build.Pull,+ Network: strings.TrimSpace(updatedSvc.Build.Network),+ Isolation: strings.TrimSpace(updatedSvc.Build.Isolation),+ ShmSize: int64(updatedSvc.Build.ShmSize),+ Ulimits: ulimitsFromCompose(updatedSvc.Build.Ulimits),+ Entitlements: append(+ []string(nil),+ updatedSvc.Build.Entitlements...,+ ),+ Privileged: updatedSvc.Build.Privileged,+ ExtraHosts: updatedSvc.Build.ExtraHosts.AsList(":"),+ Platforms: buildPlatformsFromCompose(updatedSvc),+ Provider: effectiveProvider,+ }+ if options.Push != nil {+ buildReq.Push = *options.Push+ }+ if options.Load != nil {+ buildReq.Load = *options.Load+ }++ return buildReq, updatedSvc, updated, nil+}++func (s *ProjectService) buildProjectServicesInternal(ctx context.Context, projectID string, project *composetypes.Project, options ProjectBuildOptions, progressWriter io.Writer, user *models.User) error {+ if s.buildService == nil {+ return nil+ }+ if project == nil {+ return nil+ }++ selected := normalizeBuildSelections(options.Services)++ pathMapper, pmErr := s.getPathMapper(ctx)+ if pmErr != nil {+ slog.WarnContext(ctx, "failed to create path mapper, continuing without translation", "error", pmErr)+ }++ buildCount := 0+ for name, svc := range project.Services {+ if svc.Build == nil {+ continue+ }+ if !serviceSelected(selected, name) {+ continue+ }++ buildReq, updatedSvc, updated, err := s.prepareServiceBuildRequest(ctx, projectID, project, name, svc, options, pathMapper)+ if err != nil {+ return err+ }+ if updated {+ project.Services[name] = updatedSvc+ }++ buildCount+++ if _, err := s.buildService.BuildImage(ctx, types.LOCAL_DOCKER_ENVIRONMENT_ID, buildReq, progressWriter, name, user); err != nil {+ return err+ }+ }++ if buildCount == 0 && len(selected) > 0 {+ return fmt.Errorf("no build-enabled services matched: %s", strings.Join(options.Services, ", "))+ }++ return nil+}++func buildLocalImageTag(projectID, projectName, serviceName string) string {+ shortID := strings.TrimSpace(projectID)+ if len(shortID) > 8 {+ shortID = shortID[:8]+ }+ projectPart := sanitizeImageComponent(projectName)+ if projectPart == "" {+ projectPart = "project"+ }+ servicePart := sanitizeImageComponent(serviceName)+ if servicePart == "" {+ servicePart = "service"+ }++ return fmt.Sprintf("arcane.local/%s-%s/%s:latest", projectPart, shortID, servicePart)+}++func sanitizeImageComponent(value string) string {+ value = strings.ToLower(strings.TrimSpace(value))+ if value == "" {+ return ""+ }+ return strings.Map(func(r rune) rune {+ switch {+ case r >= 'a' && r <= 'z':+ return r+ case r >= '0' && r <= '9':+ return r+ case r == '-' || r == '_' || r == '.':+ return r+ default:+ return '-'+ }+ }, value)+}+func (s *ProjectService) RestartProject(ctx context.Context, projectID string, user models.User) error {proj, err := s.GetProjectFromDatabaseByID(ctx, projectID)if err != nil {diff --git a/backend/internal/services/project_service_test.go b/backend/internal/services/project_service_test.goindex e7cf4683e..67ed26936 100644--- a/backend/internal/services/project_service_test.go+++ b/backend/internal/services/project_service_test.go@@ -32,7 +32,7 @@ func TestProjectService_GetProjectFromDatabaseByID(t *testing.T) {// Setup dependenciessettingsService, _ := NewSettingsService(ctx, db)- svc := NewProjectService(db, settingsService, nil, nil, nil)+ svc := NewProjectService(db, settingsService, nil, nil, nil, nil)// Create test projectproj := &models.Project{@@ -149,7 +149,7 @@ func TestProjectService_CalculateProjectStatus(t *testing.T) {func TestProjectService_UpdateProjectStatusInternal(t *testing.T) {db := setupProjectTestDB(t)ctx := context.Background()- svc := NewProjectService(db, nil, nil, nil, nil)+ svc := NewProjectService(db, nil, nil, nil, nil, nil)proj := &models.Project{BaseModel: models.BaseModel{@@ -336,7 +336,6 @@ func TestBuildProjectImagePullPlan(t *testing.T) {assert.Equal(t, imagePullModeAlways, plan["redis:latest"])assert.Equal(t, imagePullModeNever, plan["nginx:latest"])}-func TestProjectService_UpdateProject_RenamesDirectoryWhenNameChanges(t *testing.T) {db := setupProjectTestDB(t)ctx := context.Background()@@ -348,7 +347,7 @@ func TestProjectService_UpdateProject_RenamesDirectoryWhenNameChanges(t *testingrequire.NoError(t, err)eventService := NewEventService(db, nil, nil)- svc := NewProjectService(db, settingsService, eventService, nil, nil)+ svc := NewProjectService(db, settingsService, eventService, nil, nil, nil)originalDirName := "Foo"originalPath := filepath.Join(projectsDir, originalDirName)@@ -397,7 +396,7 @@ func TestProjectService_UpdateProject_RenameFailsWhenTargetDirectoryExists(t *terequire.NoError(t, err)eventService := NewEventService(db, nil, nil)- svc := NewProjectService(db, settingsService, eventService, nil, nil)+ svc := NewProjectService(db, settingsService, eventService, nil, nil, nil)originalDirName := "Foo"originalPath := filepath.Join(projectsDir, originalDirName)@@ -444,7 +443,7 @@ func TestProjectService_UpdateProject_RenameFailsWhenProjectRunning(t *testing.Trequire.NoError(t, err)eventService := NewEventService(db, nil, nil)- svc := NewProjectService(db, settingsService, eventService, nil, nil)+ svc := NewProjectService(db, settingsService, eventService, nil, nil, nil)originalDirName := "Foo"originalPath := filepath.Join(projectsDir, originalDirName)@@ -476,3 +475,181 @@ func TestProjectService_UpdateProject_RenameFailsWhenProjectRunning(t *testing.Trequire.NotNil(t, fromDB.DirName)assert.Equal(t, "Foo", *fromDB.DirName)}++func TestProjectService_MergeBuildTags(t *testing.T) {+ tags := mergeBuildTags("example/app:latest", []string{"example/app:sha", "example/app:latest", " "})+ assert.Equal(t, []string{"example/app:latest", "example/app:sha"}, tags)+}++func TestProjectService_BuildPlatformsFromCompose(t *testing.T) {+ t.Run("uses service platform when build platforms missing", func(t *testing.T) {+ svc := composetypes.ServiceConfig{+ Platform: "linux/amd64",+ Build: &composetypes.BuildConfig{+ Context: ".",+ },+ }++ platforms := buildPlatformsFromCompose(svc)+ assert.Equal(t, []string{"linux/amd64"}, platforms)+ })++ t.Run("keeps explicit build platforms", func(t *testing.T) {+ svc := composetypes.ServiceConfig{+ Platform: "linux/amd64",+ Build: &composetypes.BuildConfig{+ Context: ".",+ Platforms: []string{"linux/arm64"},+ },+ }++ platforms := buildPlatformsFromCompose(svc)+ assert.Equal(t, []string{"linux/arm64"}, platforms)+ })+}++func TestProjectService_PrepareServiceBuildRequest_MapsComposeFields(t *testing.T) {+ svc := &ProjectService{}+ proj := &composetypes.Project{WorkingDir: "/tmp/project", Name: "demo"}++ serviceCfg := composetypes.ServiceConfig{+ Name: "web",+ Image: "example/web:latest",+ Platform: "linux/amd64",+ Build: &composetypes.BuildConfig{+ Context: ".",+ Dockerfile: "Dockerfile.custom",+ Target: "prod",+ Args: composetypes.MappingWithEquals{+ "FOO": new("bar"),+ },+ Tags: []string{"example/web:sha", "example/web:latest"},+ CacheFrom: []string{"example/cache:latest"},+ CacheTo: []string{"type=local,dest=/tmp/cache"},+ NoCache: true,+ Pull: true,+ Network: "host",+ Isolation: "default",+ ShmSize: composetypes.UnitBytes(64 * 1024 * 1024),+ Ulimits: map[string]*composetypes.UlimitsConfig{+ "nofile": {Soft: 1024, Hard: 2048},+ },+ Entitlements: []string{"network.host"},+ Privileged: true,+ ExtraHosts: composetypes.HostsList{+ "registry.local": {"10.0.0.5"},+ },+ Labels: composetypes.Labels{+ "com.example.team": "platform",+ },+ },+ }++ req, _, _, err := svc.prepareServiceBuildRequest(+ context.Background(),+ "project-id",+ proj,+ "web",+ serviceCfg,+ ProjectBuildOptions{},+ nil,+ )+ require.NoError(t, err)++ assert.Equal(t, "/tmp/project", req.ContextDir)+ assert.Equal(t, "Dockerfile.custom", req.Dockerfile)+ assert.Equal(t, "prod", req.Target)+ assert.Equal(t, map[string]string{"FOO": "bar"}, req.BuildArgs)+ assert.Equal(t, []string{"example/web:latest", "example/web:sha"}, req.Tags)+ assert.Equal(t, []string{"linux/amd64"}, req.Platforms)+ assert.Equal(t, []string{"example/cache:latest"}, req.CacheFrom)+ assert.Equal(t, []string{"type=local,dest=/tmp/cache"}, req.CacheTo)+ assert.True(t, req.NoCache)+ assert.True(t, req.Pull)+ assert.Equal(t, "host", req.Network)+ assert.Equal(t, "default", req.Isolation)+ assert.Equal(t, int64(64*1024*1024), req.ShmSize)+ assert.Equal(t, map[string]string{"nofile": "1024:2048"}, req.Ulimits)+ assert.Equal(t, []string{"network.host"}, req.Entitlements)+ assert.True(t, req.Privileged)+ assert.Equal(t, map[string]string{"com.example.team": "platform"}, req.Labels)+ require.Len(t, req.ExtraHosts, 1)+ assert.Contains(t, req.ExtraHosts[0], "registry.local")+ assert.Contains(t, req.ExtraHosts[0], "10.0.0.5")+}++func TestNormalizePullPolicy(t *testing.T) {+ assert.Equal(t, "missing", normalizePullPolicy("if_not_present"))+ assert.Equal(t, "build", normalizePullPolicy(" BUILD "))+ assert.Equal(t, "", normalizePullPolicy(""))+}++func TestDecideDeployImageAction(t *testing.T) {+ t.Run("build service with explicit build policy", func(t *testing.T) {+ svc := composetypes.ServiceConfig{+ PullPolicy: "build",+ Build: &composetypes.BuildConfig{Context: "."},+ }++ decision := decideDeployImageAction(svc)+ assert.True(t, decision.Build)+ assert.False(t, decision.PullAlways)+ })++ t.Run("build service default policy uses pull then fallback build", func(t *testing.T) {+ svc := composetypes.ServiceConfig{Build: &composetypes.BuildConfig{Context: "."}}+ decision := decideDeployImageAction(svc)+ assert.True(t, decision.PullIfMissing)+ assert.True(t, decision.FallbackBuildOnPullFail)+ assert.False(t, decision.Build)+ })++ t.Run("non-build service never policy requires local only", func(t *testing.T) {+ svc := composetypes.ServiceConfig{PullPolicy: "never"}+ decision := decideDeployImageAction(svc)+ assert.True(t, decision.RequireLocalOnly)+ assert.False(t, decision.PullIfMissing)+ })+}++func TestProjectService_PrepareServiceBuildRequest_GeneratedImageProviderGuardrails(t *testing.T) {+ svc := &ProjectService{}+ proj := &composetypes.Project{WorkingDir: "/tmp/project", Name: "demo"}++ serviceCfg := composetypes.ServiceConfig{+ Name: "web",+ Build: &composetypes.BuildConfig{+ Context: ".",+ },+ }++ _, _, _, err := svc.prepareServiceBuildRequest(+ context.Background(),+ "project-id",+ proj,+ "web",+ serviceCfg,+ ProjectBuildOptions{Provider: "depot"},+ nil,+ )+ require.Error(t, err)+ assert.Contains(t, err.Error(), "must define an image when using depot")++ push := true+ _, _, _, err = svc.prepareServiceBuildRequest(+ context.Background(),+ "project-id",+ proj,+ "web",+ serviceCfg,+ ProjectBuildOptions{Provider: "local", Push: &push},+ nil,+ )+ require.Error(t, err)+ assert.Contains(t, err.Error(), "must define an image when push is enabled")+}++//go:fix inline+func ptr(v string) *string {+ return new(v)+}diff --git a/backend/internal/services/settings_service.go b/backend/internal/services/settings_service.goindex da36b1de3..7446d6942 100644--- a/backend/internal/services/settings_service.go+++ b/backend/internal/services/settings_service.go@@ -18,7 +18,6 @@ import ("time""github.com/hashicorp/go-uuid"- "github.com/robfig/cron/v3""gorm.io/gorm""github.com/getarcaneapp/arcane/backend/internal/config"@@ -26,6 +25,7 @@ import ("github.com/getarcaneapp/arcane/backend/internal/models""github.com/getarcaneapp/arcane/backend/internal/utils/pathmapper""github.com/getarcaneapp/arcane/backend/internal/utils/stringutils"+ "github.com/getarcaneapp/arcane/backend/pkg/libarcane""github.com/getarcaneapp/arcane/types/settings")@@ -39,7 +39,7 @@ type SettingsService struct {OnScheduledPruneSettingsChanged func(ctx context.Context)OnVulnerabilityScanSettingsChanged func(ctx context.Context)OnAutoHealSettingsChanged func(ctx context.Context)- OnTimeoutSettingsChanged func(ctx context.Context, timeoutSettings map[string]string)+ OnTimeoutSettingsChanged func(ctx context.Context, timeoutSettings []libarcane.SettingUpdate)}func NewSettingsService(ctx context.Context, db *database.DB) (*SettingsService, error) {@@ -114,6 +114,7 @@ func (s *SettingsService) getDefaultSettings() *models.Settings {EnableGravatar: models.SettingVariable{Value: "true"},DefaultShell: models.SettingVariable{Value: "/bin/sh"},DockerHost: models.SettingVariable{Value: "unix:///var/run/docker.sock"},+ BuildsDirectory: models.SettingVariable{Value: "/builds"},AuthLocalEnabled: models.SettingVariable{Value: "true"},AuthSessionTimeout: models.SettingVariable{Value: "1440"},AuthPasswordPolicy: models.SettingVariable{Value: "strong"},@@ -158,6 +159,10 @@ func (s *SettingsService) getDefaultSettings() *models.Settings {HTTPClientTimeout: models.SettingVariable{Value: "30"},RegistryTimeout: models.SettingVariable{Value: "30"},ProxyRequestTimeout: models.SettingVariable{Value: "60"},+ BuildProvider: models.SettingVariable{Value: "local"},+ BuildTimeout: models.SettingVariable{Value: "1800"},+ DepotProjectId: models.SettingVariable{Value: ""},+ DepotToken: models.SettingVariable{Value: ""},InstanceID: models.SettingVariable{Value: ""},}@@ -511,23 +516,7 @@ func (s *SettingsService) UpdateSettings(ctx context.Context, updates settings.Ureturn settings.ToSettingVariableSlice(false, false), nil}-// timeoutSettingKeys defines settings keys that should be synced to agents.-// This currently includes timeout settings and Trivy runtime resource limits.-var timeoutSettingKeys = []string{- "dockerApiTimeout",- "dockerImagePullTimeout",- "trivyScanTimeout",- "gitOperationTimeout",- "httpClientTimeout",- "registryTimeout",- "proxyRequestTimeout",- "trivyResourceLimitsEnabled",- "trivyCpuLimit",- "trivyMemoryLimitMb",- "trivyConcurrentScanContainers",-}--func (s *SettingsService) prepareUpdateValues(updates settings.Update, cfg, defaultCfg *models.Settings) ([]models.SettingVariable, bool, bool, bool, bool, bool, map[string]string, error) {+func (s *SettingsService) prepareUpdateValues(updates settings.Update, cfg, defaultCfg *models.Settings) ([]models.SettingVariable, bool, bool, bool, bool, bool, []libarcane.SettingUpdate, error) {rt := reflect.TypeFor[settings.Update]()rv := reflect.ValueOf(updates)valuesToUpdate := make([]models.SettingVariable, 0)@@ -537,28 +526,38 @@ func (s *SettingsService) prepareUpdateValues(updates settings.Update, cfg, defachangedScheduledPrune := falsechangedVulnerabilityScan := falsechangedAutoHeal := false- changedTimeouts := make(map[string]string)+ changedTimeouts := make([]libarcane.SettingUpdate, 0)for i := 0; i < rt.NumField(); i++ {field := rt.Field(i)fieldValue := rv.Field(i)- if fieldValue.Kind() == reflect.Pointer && fieldValue.IsNil() {+ key, value, ok := extractUpdateValue(field, fieldValue)+ if !ok {continue}- key, _, _ := strings.Cut(field.Tag.Get("json"), ",")- var value string- if fieldValue.Kind() == reflect.Pointer {- value = fieldValue.Elem().String()- }+ if key == libarcane.DepotTokenSettingKey {+ // Sensitive token: only update when explicitly provided.+ // Empty input preserves existing token.+ if strings.TrimSpace(value) == "" {+ continue+ }++ if err := cfg.UpdateField(key, value, false); err != nil {+ return nil, false, false, false, false, false, nil, fmt.Errorf("failed to update in-memory config for key '%s': %w", key, err)+ }- // Validate cron settings- cronFields := []string{"scheduledPruneInterval", "autoUpdateInterval", "pollingInterval", "environmentHealthInterval", "eventCleanupInterval", "analyticsHeartbeatInterval", "vulnerabilityScanInterval", "gitopsSyncInterval", "autoHealInterval"}- if slices.Contains(cronFields, key) && value != "" {- if _, err := cron.NewParser(cron.Second | cron.Minute | cron.Hour | cron.Dom | cron.Month | cron.Dow).Parse(value); err != nil {- return nil, false, false, false, false, false, nil, fmt.Errorf("invalid cron expression for %s: %w", key, err)+ valuesToUpdate = append(valuesToUpdate, models.SettingVariable{Key: key, Value: value})+ if libarcane.IsTimeoutSettingKey(key) {+ changedTimeouts = append(changedTimeouts, libarcane.SettingUpdate{Key: key, Value: value})}++ continue+ }++ if err := libarcane.ValidateCronSetting(key, value); err != nil {+ return nil, false, false, false, false, false, nil, fmt.Errorf("invalid cron expression for %s: %w", key, err)}var valueToSave string@@ -575,14 +574,12 @@ func (s *SettingsService) prepareUpdateValues(updates settings.Update, cfg, defaif errors.Is(err, models.SettingSensitiveForbiddenError{}) {continue- } else if err != nil {+ }+ if err != nil {return nil, false, false, false, false, false, nil, fmt.Errorf("failed to update in-memory config for key '%s': %w", key, err)}- valuesToUpdate = append(valuesToUpdate, models.SettingVariable{- Key: key,- Value: valueToSave,- })+ valuesToUpdate = append(valuesToUpdate, models.SettingVariable{Key: key, Value: valueToSave})switch key {case "pollingEnabled", "pollingInterval":@@ -597,15 +594,32 @@ func (s *SettingsService) prepareUpdateValues(updates settings.Update, cfg, defachangedAutoHeal = true}- // Track timeout setting changes- if slices.Contains(timeoutSettingKeys, key) {- changedTimeouts[key] = valueToSave+ if libarcane.IsTimeoutSettingKey(key) {+ changedTimeouts = append(changedTimeouts, libarcane.SettingUpdate{Key: key, Value: valueToSave})}}return valuesToUpdate, changedPolling, changedAutoUpdate, changedScheduledPrune, changedVulnerabilityScan, changedAutoHeal, changedTimeouts, nil}+func extractUpdateValue(field reflect.StructField, fieldValue reflect.Value) (string, string, bool) {+ if fieldValue.Kind() == reflect.Pointer && fieldValue.IsNil() {+ return "", "", false+ }++ key, _, _ := strings.Cut(field.Tag.Get("json"), ",")+ if key == "" {+ return "", "", false+ }++ var value string+ if fieldValue.Kind() == reflect.Pointer {+ value = fieldValue.Elem().String()+ }++ return key, value, true+}+func (s *SettingsService) persistSettings(ctx context.Context, values []models.SettingVariable) error {return s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {for _, setting := range values {@@ -1030,3 +1044,53 @@ func (s *SettingsService) NormalizeProjectsDirectory(ctx context.Context, projecreturn nil}++func (s *SettingsService) NormalizeBuildsDirectory(ctx context.Context) error {+ const buildsKey = "buildsDirectory"+ envVarName := stringutils.CamelCaseToScreamingSnakeCase(buildsKey)+ if envVal, ok := os.LookupEnv(envVarName); ok && strings.TrimSpace(envVal) != "" {+ slog.DebugContext(ctx, "BUILDS_DIRECTORY environment variable is set, skipping normalization", "value", envVal)+ return nil+ }++ var buildsDirSetting models.SettingVariable+ err := s.db.WithContext(ctx).Where("key = ?", buildsKey).First(&buildsDirSetting).Error++ if errors.Is(err, gorm.ErrRecordNotFound) {+ slog.DebugContext(ctx, "No buildsDirectory setting found, skipping normalization")+ return nil+ }++ if err != nil {+ return fmt.Errorf("failed to load buildsDirectory setting: %w", err)+ }++ value := strings.TrimSpace(buildsDirSetting.Value)+ if value == "" {+ slog.DebugContext(ctx, "buildsDirectory is empty, skipping normalization")+ return nil+ }++ if !filepath.IsAbs(value) {+ cwd, _ := os.Getwd()+ absPath, absErr := filepath.Abs(value)+ if absErr != nil {+ return fmt.Errorf("failed to resolve relative path to absolute: %w", absErr)+ }+ slog.InfoContext(ctx, "Normalizing builds directory from relative to absolute path", "from", value, "to", absPath, "base", cwd)++ if err := s.UpdateSetting(ctx, buildsKey, absPath); err != nil {+ return fmt.Errorf("failed to update buildsDirectory: %w", err)+ }++ if err := s.LoadDatabaseSettings(ctx); err != nil {+ return fmt.Errorf("failed to reload settings after normalization: %w", err)+ }++ slog.InfoContext(ctx, "Successfully normalized builds directory")+ } else {+ slog.DebugContext(ctx, "Builds directory already normalized or custom, skipping", "value", buildsDirSetting.Value)+ }++ return nil+}diff --git a/backend/internal/services/settings_service_test.go b/backend/internal/services/settings_service_test.goindex dd1c21fa6..8ed78132c 100644--- a/backend/internal/services/settings_service_test.go+++ b/backend/internal/services/settings_service_test.go@@ -13,6 +13,7 @@ import ("github.com/getarcaneapp/arcane/backend/internal/config""github.com/getarcaneapp/arcane/backend/internal/database""github.com/getarcaneapp/arcane/backend/internal/models"+ "github.com/getarcaneapp/arcane/backend/pkg/libarcane""github.com/getarcaneapp/arcane/types/settings")@@ -380,8 +381,8 @@ func TestSettingsService_UpdateSettings_TimeoutCallbackIncludesTrivyScanTimeout(require.NoError(t, err)require.NoError(t, svc.EnsureDefaultSettings(ctx))- var callbackPayload map[string]string- svc.OnTimeoutSettingsChanged = func(_ context.Context, timeoutSettings map[string]string) {+ var callbackPayload []libarcane.SettingUpdate+ svc.OnTimeoutSettingsChanged = func(_ context.Context, timeoutSettings []libarcane.SettingUpdate) {callbackPayload = timeoutSettings}@@ -390,7 +391,7 @@ func TestSettingsService_UpdateSettings_TimeoutCallbackIncludesTrivyScanTimeout(require.NoError(t, err)require.NotNil(t, callbackPayload)- require.Equal(t, "1200", callbackPayload["trivyScanTimeout"])+ require.Contains(t, callbackPayload, libarcane.SettingUpdate{Key: "trivyScanTimeout", Value: "1200"})}func TestSettingsService_UpdateSettings_TimeoutCallbackIncludesTrivyResourceLimits(t *testing.T) {@@ -400,8 +401,8 @@ func TestSettingsService_UpdateSettings_TimeoutCallbackIncludesTrivyResourceLimirequire.NoError(t, err)require.NoError(t, svc.EnsureDefaultSettings(ctx))- var callbackPayload map[string]string- svc.OnTimeoutSettingsChanged = func(_ context.Context, timeoutSettings map[string]string) {+ var callbackPayload []libarcane.SettingUpdate+ svc.OnTimeoutSettingsChanged = func(_ context.Context, timeoutSettings []libarcane.SettingUpdate) {callbackPayload = timeoutSettings}@@ -416,9 +417,9 @@ func TestSettingsService_UpdateSettings_TimeoutCallbackIncludesTrivyResourceLimirequire.NoError(t, err)require.NotNil(t, callbackPayload)- require.Equal(t, "false", callbackPayload["trivyResourceLimitsEnabled"])- require.Equal(t, "2.5", callbackPayload["trivyCpuLimit"])- require.Equal(t, "3072", callbackPayload["trivyMemoryLimitMb"])+ require.Contains(t, callbackPayload, libarcane.SettingUpdate{Key: "trivyResourceLimitsEnabled", Value: "false"})+ require.Contains(t, callbackPayload, libarcane.SettingUpdate{Key: "trivyCpuLimit", Value: "2.5"})+ require.Contains(t, callbackPayload, libarcane.SettingUpdate{Key: "trivyMemoryLimitMb", Value: "3072"})}func TestSettingsService_UpdateSettings_TimeoutCallbackIncludesTrivyConcurrentScanContainers(t *testing.T) {@@ -428,8 +429,8 @@ func TestSettingsService_UpdateSettings_TimeoutCallbackIncludesTrivyConcurrentScrequire.NoError(t, err)require.NoError(t, svc.EnsureDefaultSettings(ctx))- var callbackPayload map[string]string- svc.OnTimeoutSettingsChanged = func(_ context.Context, timeoutSettings map[string]string) {+ var callbackPayload []libarcane.SettingUpdate+ svc.OnTimeoutSettingsChanged = func(_ context.Context, timeoutSettings []libarcane.SettingUpdate) {callbackPayload = timeoutSettings}@@ -438,7 +439,7 @@ func TestSettingsService_UpdateSettings_TimeoutCallbackIncludesTrivyConcurrentScrequire.NoError(t, err)require.NotNil(t, callbackPayload)- require.Equal(t, "4", callbackPayload["trivyConcurrentScanContainers"])+ require.Contains(t, callbackPayload, libarcane.SettingUpdate{Key: "trivyConcurrentScanContainers", Value: "4"})}func TestSettingsService_UpdateSettings_TrivyNetworkTriggersVulnerabilityCallback(t *testing.T) {@@ -466,8 +467,8 @@ func TestSettingsService_UpdateSettings_TrivyNetworkDoesNotTriggerTimeoutCallbacrequire.NoError(t, err)require.NoError(t, svc.EnsureDefaultSettings(ctx))- var callbackPayload map[string]string- svc.OnTimeoutSettingsChanged = func(_ context.Context, timeoutSettings map[string]string) {+ var callbackPayload []libarcane.SettingUpdate+ svc.OnTimeoutSettingsChanged = func(_ context.Context, timeoutSettings []libarcane.SettingUpdate) {callbackPayload = timeoutSettings}diff --git a/backend/internal/services/system_upgrade_service.go b/backend/internal/services/system_upgrade_service.goindex 2fad9a1dd..f08759e6a 100644--- a/backend/internal/services/system_upgrade_service.go+++ b/backend/internal/services/system_upgrade_service.go@@ -4,7 +4,6 @@ import ("context""errors""fmt"- "io""log/slog""os""strings"@@ -144,8 +143,11 @@ func (s *SystemUpgradeService) TriggerUpgradeViaCLI(ctx context.Context, user mo}return fmt.Errorf("pull upgrader image: %w", err)}- // Drain the reader to complete the pull- _, _ = io.Copy(io.Discard, pullReader)+ // Drain and validate the JSON stream to complete the pull.+ if err := dockerutils.ConsumeJSONMessageStream(pullReader, nil); err != nil {+ _ = pullReader.Close()+ return fmt.Errorf("failed to complete upgrader image pull: %w", err)+ }if closeErr := pullReader.Close(); closeErr != nil {slog.Warn("Failed to close upgrader image pull reader", "error", closeErr)}diff --git a/backend/internal/services/updater_service.go b/backend/internal/services/updater_service.goindex 67bfd364c..6ab9e6413 100644--- a/backend/internal/services/updater_service.go+++ b/backend/internal/services/updater_service.go@@ -831,7 +831,7 @@ func (s *UpdaterService) normalizeRef(ref string) string {domain := ""switch {case len(parts) > 0 && (strings.Contains(parts[0], ".") || strings.Contains(parts[0], ":") || parts[0] == "localhost"):- domain = strings.ToLower(parts[0])+ domain = arcRegistry.NormalizeRegistryForComparison(parts[0])parts = parts[1:]default:domain = "docker.io"@@ -840,12 +840,6 @@ func (s *UpdaterService) normalizeRef(ref string) string {if domain == "docker.io" && !strings.Contains(repo, "/") {repo = "library/" + repo}-- // Canonical docker.io domain- switch domain {- case "index.docker.io", "registry-1.docker.io":- domain = "docker.io"- }return strings.ToLower(domain + "/" + repo + ":" + tag)}diff --git a/backend/internal/services/vulnerability_service.go b/backend/internal/services/vulnerability_service.goindex 91d214da4..1e1da3556 100644--- a/backend/internal/services/vulnerability_service.go+++ b/backend/internal/services/vulnerability_service.go@@ -21,6 +21,7 @@ import (cerrdefs "github.com/containerd/errdefs""github.com/getarcaneapp/arcane/backend/internal/database""github.com/getarcaneapp/arcane/backend/internal/models"+ dockerutils "github.com/getarcaneapp/arcane/backend/internal/utils/docker""github.com/getarcaneapp/arcane/backend/internal/utils/pagination""github.com/getarcaneapp/arcane/backend/internal/utils/timeouts""github.com/getarcaneapp/arcane/backend/pkg/libarcane"@@ -1671,7 +1672,10 @@ func (s *VulnerabilityService) ensureTrivyImageInternal(ctx context.Context) (st}return "", fmt.Errorf("pull trivy image %s: %w", trivyImage, err)}- _, _ = io.Copy(io.Discard, pullReader)+ if err := dockerutils.ConsumeJSONMessageStream(pullReader, nil); err != nil {+ _ = pullReader.Close()+ return "", fmt.Errorf("failed to complete trivy image pull: %w", err)+ }_ = pullReader.Close()return trivyImage, nildiff --git a/backend/internal/utils/arcaneupdater/digest.go b/backend/internal/utils/arcaneupdater/digest.goindex 758befa98..2f104964c 100644--- a/backend/internal/utils/arcaneupdater/digest.go+++ b/backend/internal/utils/arcaneupdater/digest.go@@ -8,6 +8,7 @@ import ("github.com/getarcaneapp/arcane/backend/internal/utils/registry""github.com/moby/moby/client"+ ref "go.podman.io/image/v5/docker/reference")// DigestChecker provides methods to check if an image needs updating by comparing digests@@ -152,35 +153,41 @@ func (c *DigestChecker) GetImageIDsForRef(ctx context.Context, ref string) ([]st}// parseImageRef splits an image reference into registry, repository, and tag-func parseImageRef(ref string) (registry, repository, tag string) {- // Strip digest if present- if i := strings.Index(ref, "@"); i != -1 {- ref = ref[:i]+func parseImageRef(imageRef string) (registryHost, repository, tag string) {+ named, err := ref.ParseNormalizedNamed(imageRef)+ if err == nil {+ registryHost = registry.NormalizeRegistryForComparison(ref.Domain(named))+ repository = ref.Path(named)+ tag = "latest"+ if tagged, ok := named.(ref.NamedTagged); ok {+ tag = tagged.Tag()+ }+ return registryHost, repository, tag+ }++ // Fallback for unexpected parser failures.+ registryHost = registry.ExtractRegistryHost(imageRef)+ if i := strings.Index(imageRef, "@"); i != -1 {+ imageRef = imageRef[:i]}- // Default tagtag = "latest"- if i := strings.LastIndex(ref, ":"); i != -1 && strings.LastIndex(ref, "/") < i {- tag = ref[i+1:]- ref = ref[:i]+ if i := strings.LastIndex(imageRef, ":"); i != -1 && strings.LastIndex(imageRef, "/") < i {+ tag = imageRef[i+1:]+ imageRef = imageRef[:i]}- // Parse registry and repository- parts := strings.Split(ref, "/")- switch {- case len(parts) > 0 && (strings.Contains(parts[0], ".") || strings.Contains(parts[0], ":") || parts[0] == "localhost"):- registry = parts[0]+ parts := strings.Split(imageRef, "/")+ if len(parts) > 0 && (strings.Contains(parts[0], ".") || strings.Contains(parts[0], ":") || parts[0] == "localhost") {repository = strings.Join(parts[1:], "/")- default:- registry = "docker.io"- repository = ref- // Docker Hub official images are in library/- if !strings.Contains(repository, "/") {+ } else {+ repository = imageRef+ if registryHost == "docker.io" && !strings.Contains(repository, "/") {repository = "library/" + repository}}- return registry, repository, tag+ return registry.NormalizeRegistryForComparison(registryHost), repository, tag}// normalizeRef normalizes an image reference for comparison@@ -193,11 +200,5 @@ func normalizeRef(ref string) string {// Parse and reconstructreg, repo, tag := parseImageRef(ref)- // Normalize docker.io variants- switch reg {- case "index.docker.io", "registry-1.docker.io":- reg = "docker.io"- }-return strings.ToLower(reg + "/" + repo + ":" + tag)}diff --git a/backend/internal/utils/arcaneupdater/digest_test.go b/backend/internal/utils/arcaneupdater/digest_test.gonew file mode 100644index 000000000..5c077cece--- /dev/null+++ b/backend/internal/utils/arcaneupdater/digest_test.go@@ -0,0 +1,61 @@+package arcaneupdater++import (+ "testing"++ "github.com/stretchr/testify/assert"+)++func TestParseImageRef(t *testing.T) {+ tests := []struct {+ name string+ imageRef string+ wantHost string+ wantRepo string+ wantTag string+ }{+ {+ name: "docker hub official image",+ imageRef: "nginx:latest",+ wantHost: "docker.io",+ wantRepo: "library/nginx",+ wantTag: "latest",+ },+ {+ name: "custom registry image",+ imageRef: "ghcr.io/getarcaneapp/arcane:v1.2.3",+ wantHost: "ghcr.io",+ wantRepo: "getarcaneapp/arcane",+ wantTag: "v1.2.3",+ },+ {+ name: "digest reference defaults to latest tag",+ imageRef: "docker.io/library/redis@sha256:abcdef",+ wantHost: "docker.io",+ wantRepo: "library/redis",+ wantTag: "latest",+ },+ {+ name: "docker registry variant is normalized",+ imageRef: "registry-1.docker.io/library/busybox:1.36",+ wantHost: "docker.io",+ wantRepo: "library/busybox",+ wantTag: "1.36",+ },+ }++ for _, tt := range tests {+ t.Run(tt.name, func(t *testing.T) {+ host, repo, tag := parseImageRef(tt.imageRef)+ assert.Equal(t, tt.wantHost, host)+ assert.Equal(t, tt.wantRepo, repo)+ assert.Equal(t, tt.wantTag, tag)+ })+ }+}++func TestNormalizeRef(t *testing.T) {+ assert.Equal(t, "docker.io/library/nginx:latest", normalizeRef("nginx"))+ assert.Equal(t, "docker.io/library/nginx:latest", normalizeRef("index.docker.io/library/nginx:latest"))+ assert.Equal(t, "ghcr.io/getarcaneapp/arcane:v1", normalizeRef("ghcr.io/getarcaneapp/arcane:v1"))+}diff --git a/backend/internal/utils/docker/jsonstream.go b/backend/internal/utils/docker/jsonstream.gonew file mode 100644index 000000000..7612273ec--- /dev/null+++ b/backend/internal/utils/docker/jsonstream.go@@ -0,0 +1,50 @@+package docker++import (+ "bufio"+ "encoding/json"+ "errors"+ "io"+ "strings"++ "github.com/moby/moby/api/types/jsonstream"+)++// ConsumeJSONMessageStream drains a Docker JSON message stream and returns any daemon-reported error.+// Optional lineHandler receives each raw line before parsing.+func ConsumeJSONMessageStream(reader io.Reader, lineHandler func([]byte) error) error {+ scanner := bufio.NewScanner(reader)+ scanner.Buffer(make([]byte, 0, 64*1024), 4*1024*1024)++ for scanner.Scan() {+ line := scanner.Bytes()+ if lineHandler != nil {+ if err := lineHandler(line); err != nil {+ return err+ }+ }++ var msg jsonstream.Message+ if err := json.Unmarshal(line, &msg); err != nil {+ // Keep behavior resilient to any non-JSON line noise.+ continue+ }+ if msg.Error != nil {+ return msg.Error+ }++ // Some daemons include an additional top-level "error" string.+ var legacy struct {+ Error string `json:"error,omitempty"`+ }+ if err := json.Unmarshal(line, &legacy); err == nil && strings.TrimSpace(legacy.Error) != "" {+ return errors.New(strings.TrimSpace(legacy.Error))+ }+ }++ if err := scanner.Err(); err != nil {+ return err+ }++ return nil+}diff --git a/backend/internal/utils/docker/jsonstream_test.go b/backend/internal/utils/docker/jsonstream_test.gonew file mode 100644index 000000000..6766fd9d8--- /dev/null+++ b/backend/internal/utils/docker/jsonstream_test.go@@ -0,0 +1,40 @@+package docker++import (+ "strings"+ "testing"+)++func TestConsumeJSONMessageStream(t *testing.T) {+ t.Run("streams lines and succeeds without daemon error", func(t *testing.T) {+ stream := strings.NewReader(`{"status":"Pulling fs layer","id":"layer1"}` + "\n")+ seen := 0++ err := ConsumeJSONMessageStream(stream, func(_ []byte) error {+ seen+++ return nil+ })+ if err != nil {+ t.Fatalf("expected nil error, got %v", err)+ }+ if seen != 1 {+ t.Fatalf("expected line handler to be called once, got %d", seen)+ }+ })++ t.Run("returns structured errorDetail from daemon", func(t *testing.T) {+ stream := strings.NewReader(`{"errorDetail":{"code":401,"message":"unauthorized"}}` + "\n")+ err := ConsumeJSONMessageStream(stream, nil)+ if err == nil || !strings.Contains(err.Error(), "unauthorized") {+ t.Fatalf("expected unauthorized error, got %v", err)+ }+ })++ t.Run("returns legacy top-level error string", func(t *testing.T) {+ stream := strings.NewReader(`{"error":"manifest unknown"}` + "\n")+ err := ConsumeJSONMessageStream(stream, nil)+ if err == nil || !strings.Contains(err.Error(), "manifest unknown") {+ t.Fatalf("expected manifest unknown error, got %v", err)+ }+ })+}diff --git a/backend/internal/utils/registry/auth.go b/backend/internal/utils/registry/auth.goindex 08b754059..48b8004ed 100644--- a/backend/internal/utils/registry/auth.go+++ b/backend/internal/utils/registry/auth.go@@ -22,14 +22,22 @@ type Credentials struct {}func (c *Client) GetRegistryURL(registry string) string {- switch registry {- case DefaultRegistry, "docker.io":+ registry = strings.TrimSpace(registry)++ if strings.HasPrefix(registry, "http://") || strings.HasPrefix(registry, "https://") {+ if parsed, err := url.Parse(registry); err == nil && parsed.Host != "" {+ if NormalizeRegistryForComparison(parsed.Host) == "docker.io" {+ return "https://index.docker.io"+ }+ }+ return strings.TrimSuffix(registry, "/")+ }++ switch NormalizeRegistryForComparison(registry) {+ case "docker.io":return "https://index.docker.io"default:- if !strings.HasPrefix(registry, "http") {- return "https://" + registry- }- return registry+ return "https://" + NormalizeRegistryForComparison(registry)}}@@ -217,16 +225,12 @@ func AcquireTokenViaChallenge(// Helpers (formerly in check.go)func normalizeHost(u string) string {- u = strings.TrimSpace(u)- u = strings.TrimPrefix(u, "https://")- u = strings.TrimPrefix(u, "http://")- u = strings.TrimSuffix(u, "/")- return strings.ToLower(u)+ return NormalizeRegistryForComparison(u)}func normalizeRepositoryForDockerIO(registryHost, repo string) string {r := normalizeHost(registryHost)- if r == "docker.io" || r == DefaultRegistry || r == "index.docker.io" {+ if r == "docker.io" {if !strings.Contains(repo, "/") {return "library/" + repo}diff --git a/backend/internal/utils/registry/helpers.go b/backend/internal/utils/registry/helpers.goindex 5addd499c..3043955b2 100644--- a/backend/internal/utils/registry/helpers.go+++ b/backend/internal/utils/registry/helpers.go@@ -1,6 +1,14 @@package registry-import ref "go.podman.io/image/v5/docker/reference"+import (+ "fmt"+ "sort"+ "strings"++ dockerauthconfig "github.com/moby/moby/api/pkg/authconfig"+ dockerregistry "github.com/moby/moby/api/types/registry"+ ref "go.podman.io/image/v5/docker/reference"+)func GetRegistryAddress(imageRef string) (string, error) {named, err := ref.ParseNormalizedNamed(imageRef)@@ -13,3 +21,98 @@ func GetRegistryAddress(imageRef string) (string, error) {}return addr, nil}++func ExtractRegistryHost(imageRef string) string {+ if i := strings.IndexByte(imageRef, '@'); i != -1 {+ imageRef = imageRef[:i]+ }++ hostCandidate, _, found := strings.Cut(imageRef, "/")+ if !found {+ return "docker.io"+ }++ if !strings.Contains(hostCandidate, ".") && !strings.Contains(hostCandidate, ":") {+ return "docker.io"+ }+ return hostCandidate+}++func NormalizeRegistryForComparison(url string) string {+ url = strings.TrimSpace(strings.ToLower(url))+ url = strings.TrimPrefix(url, "https://")+ url = strings.TrimPrefix(url, "http://")+ url = strings.TrimSuffix(url, "/")++ if slash := strings.Index(url, "/"); slash != -1 {+ url = url[:slash]+ }++ if url == "docker.io" || url == "registry-1.docker.io" || url == "index.docker.io" {+ return "docker.io"+ }+ return url+}++func NormalizeRegistryURL(url string) string {+ normalized := NormalizeRegistryForComparison(url)+ if normalized == "docker.io" {+ return "https://index.docker.io/v1/"+ }++ result := strings.TrimSpace(url)+ result = strings.TrimPrefix(result, "https://")+ result = strings.TrimPrefix(result, "http://")+ result = strings.TrimSuffix(result, "/")++ return result+}++func IsRegistryMatch(left, right string) bool {+ return NormalizeRegistryForComparison(left) == NormalizeRegistryForComparison(right)+}++func EncodeAuthHeader(username, password, serverAddress string) (string, error) {+ auth, err := dockerauthconfig.Encode(dockerregistry.AuthConfig{+ Username: username,+ Password: password,+ ServerAddress: serverAddress,+ })+ if err != nil {+ return "", fmt.Errorf("encode registry auth header: %w", err)+ }+ return auth, nil+}++func DecodeAuthHeader(authEncoded string) (dockerregistry.AuthConfig, error) {+ cfg, err := dockerauthconfig.Decode(strings.TrimSpace(authEncoded))+ if err != nil {+ return dockerregistry.AuthConfig{}, fmt.Errorf("decode registry auth header: %w", err)+ }+ if cfg == nil {+ return dockerregistry.AuthConfig{}, nil+ }+ return *cfg, nil+}++func RegistryAuthLookupKeys(url string) []string {+ normalizedHost := NormalizeRegistryForComparison(url)+ if normalizedHost == "" {+ return nil+ }++ keys := map[string]struct{}{+ normalizedHost: {},+ }+ if normalizedHost == "docker.io" {+ keys["registry-1.docker.io"] = struct{}{}+ keys["index.docker.io"] = struct{}{}+ }++ out := make([]string, 0, len(keys))+ for key := range keys {+ out = append(out, key)+ }+ sort.Strings(out)+ return out+}diff --git a/backend/internal/utils/registry/helpers_test.go b/backend/internal/utils/registry/helpers_test.gonew file mode 100644index 000000000..c68cd7a9b--- /dev/null+++ b/backend/internal/utils/registry/helpers_test.go@@ -0,0 +1,87 @@+package registry++import (+ "testing"++ dockerauthconfig "github.com/moby/moby/api/pkg/authconfig"+ "github.com/stretchr/testify/assert"+ "github.com/stretchr/testify/require"+)++func TestExtractRegistryHost(t *testing.T) {+ t.Run("explicit registry", func(t *testing.T) {+ assert.Equal(t, "ghcr.io", ExtractRegistryHost("ghcr.io/getarcaneapp/arcane:latest"))+ })++ t.Run("implicit docker hub", func(t *testing.T) {+ assert.Equal(t, "docker.io", ExtractRegistryHost("redis:latest"))+ })++ t.Run("digest reference", func(t *testing.T) {+ assert.Equal(t, "registry.example.com", ExtractRegistryHost("registry.example.com/team/app@sha256:abcdef"))+ })+}++func TestNormalizeRegistryForComparison(t *testing.T) {+ tests := []struct {+ in string+ want string+ }{+ {in: "https://ghcr.io", want: "ghcr.io"},+ {in: "ghcr.io/", want: "ghcr.io"},+ {in: "GHCR.IO", want: "ghcr.io"},+ {in: "https://ghcr.io/path", want: "ghcr.io"},+ {in: "registry-1.docker.io", want: "docker.io"},+ {in: "index.docker.io", want: "docker.io"},+ {in: "docker.io", want: "docker.io"},+ }++ for _, tt := range tests {+ assert.Equal(t, tt.want, NormalizeRegistryForComparison(tt.in))+ }+}++func TestNormalizeRegistryURL(t *testing.T) {+ assert.Equal(t, "https://index.docker.io/v1/", NormalizeRegistryURL("docker.io"))+ assert.Equal(t, "ghcr.io", NormalizeRegistryURL("https://ghcr.io/"))+}++func TestIsRegistryMatch(t *testing.T) {+ assert.True(t, IsRegistryMatch("https://index.docker.io/v1/", "registry-1.docker.io"))+ assert.True(t, IsRegistryMatch("https://ghcr.io", "ghcr.io"))+ assert.False(t, IsRegistryMatch("ghcr.io", "registry.example.com"))+}++func TestEncodeAuthHeader(t *testing.T) {+ encoded, err := EncodeAuthHeader("user", "token", "ghcr.io")+ require.NoError(t, err)+ require.NotEmpty(t, encoded)++ cfg, err := dockerauthconfig.Decode(encoded)+ require.NoError(t, err)+ assert.Equal(t, "user", cfg.Username)+ assert.Equal(t, "token", cfg.Password)+ assert.Equal(t, "ghcr.io", cfg.ServerAddress)+}++func TestDecodeAuthHeader(t *testing.T) {+ encoded, err := EncodeAuthHeader("decode-user", "decode-token", "registry.example.com")+ require.NoError(t, err)++ cfg, err := DecodeAuthHeader(encoded)+ require.NoError(t, err)+ assert.Equal(t, "decode-user", cfg.Username)+ assert.Equal(t, "decode-token", cfg.Password)+ assert.Equal(t, "registry.example.com", cfg.ServerAddress)+}++func TestDecodeAuthHeader_InvalidInput(t *testing.T) {+ _, err := DecodeAuthHeader("not-base64")+ require.Error(t, err)+}++func TestRegistryAuthLookupKeys(t *testing.T) {+ assert.Equal(t, []string{"ghcr.io"}, RegistryAuthLookupKeys("https://GHCR.IO/"))+ assert.Equal(t, []string{"docker.io", "index.docker.io", "registry-1.docker.io"}, RegistryAuthLookupKeys("https://index.docker.io/v1/"))+ assert.Nil(t, RegistryAuthLookupKeys(" "))+}diff --git a/backend/internal/utils/registry/test_connection.go b/backend/internal/utils/registry/test_connection.goindex 7f77d4774..f76e80fae 100644--- a/backend/internal/utils/registry/test_connection.go+++ b/backend/internal/utils/registry/test_connection.go@@ -66,7 +66,7 @@ func TestRegistryConnection(ctx context.Context, registryURL string, creds *Cred}func normalizeRegistry(registryURL string) string {- reg := trimScheme(registryURL)+ reg := NormalizeRegistryForComparison(registryURL)if reg == "docker.io" {return DefaultRegistry}@@ -226,10 +226,3 @@ func (t *registryConnectionTester) registryURL(path string) string {func (t *registryConnectionTester) addErrorf(format string, args ...any) {t.result.Errors = append(t.result.Errors, fmt.Sprintf(format, args...))}--func trimScheme(u string) string {- u = strings.TrimPrefix(u, "https://")- u = strings.TrimPrefix(u, "http://")- u = strings.TrimSuffix(u, "/")- return u-}diff --git a/backend/internal/utils/timeouts/timeouts.go b/backend/internal/utils/timeouts/timeouts.goindex 587db3f19..1fc74bbef 100644--- a/backend/internal/utils/timeouts/timeouts.go+++ b/backend/internal/utils/timeouts/timeouts.go@@ -13,6 +13,7 @@ const (DefaultHTTPClient = 30 * time.SecondDefaultRegistry = 30 * time.SecondDefaultProxyRequest = 60 * time.Second+ DefaultBuildTimeout = 30 * time.Minute)func GetDuration(settingSeconds int, defaultDuration time.Duration) time.Duration {diff --git a/backend/pkg/libarcane/libbuild/build_provider.go b/backend/pkg/libarcane/libbuild/build_provider.gonew file mode 100644index 000000000..e6ba44789--- /dev/null+++ b/backend/pkg/libarcane/libbuild/build_provider.go@@ -0,0 +1,102 @@+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"+ buildtypes "github.com/getarcaneapp/arcane/types/builds"+ "github.com/getarcaneapp/arcane/types/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, errors.New("settings provider not available")+ }++ settings := p.settings.BuildSettings()+ projectID := strings.TrimSpace(settings.DepotProjectId)+ token := strings.TrimSpace(settings.DepotToken)+ if projectID == "" || token == "" {+ return nil, errors.New("depot project ID and token are required")+ }++ 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.gonew file mode 100644index 000000000..8d2af007f--- /dev/null+++ b/backend/pkg/libarcane/libbuild/builder.go@@ -0,0 +1,3 @@+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.gonew file mode 100644index 000000000..4b27073ee--- /dev/null+++ b/backend/pkg/libarcane/libbuild/builder_buildkit.go@@ -0,0 +1,250 @@+package libbuild++import (+ "context"+ "errors"+ "fmt"+ "io"+ "path/filepath"+ "strings"++ dockerutils "github.com/getarcaneapp/arcane/backend/internal/utils/docker"+ imagetypes "github.com/getarcaneapp/arcane/types/image"+ buildkit "github.com/moby/buildkit/client"+)++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) (buildkit.SolveOpt, <-chan error, error) {+ contextDir := filepath.Clean(req.ContextDir)++ dockerfilePath := strings.TrimSpace(req.Dockerfile)+ if dockerfilePath == "" {+ dockerfilePath = "Dockerfile"+ }++ fullDockerfilePath := dockerfilePath+ if !filepath.IsAbs(dockerfilePath) {+ fullDockerfilePath = filepath.Join(contextDir, dockerfilePath)+ }++ frontendAttrs := map[string]string{+ "filename": filepath.Base(fullDockerfilePath),+ }+ 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[fmt.Sprintf("build-arg:%s", key)] = val+ }+ for key, val := range req.Labels {+ k := strings.TrimSpace(key)+ if k == "" {+ continue+ }+ frontendAttrs[fmt.Sprintf("label:%s", k)] = val+ }++ solveOpt := buildkit.SolveOpt{+ Frontend: "dockerfile.v0",+ FrontendAttrs: frontendAttrs,+ LocalDirs: map[string]string{+ "context": contextDir,+ "dockerfile": filepath.Dir(fullDockerfilePath),+ },+ 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 {+ exports = append(exports, buildkit.ExportEntry{+ Type: "image",+ Attrs: map[string]string{+ "name": strings.Join(req.Tags, ","),+ "push": "true",+ "oci-mediatypes": "true",+ },+ })+ }+ if req.Load {+ exportEntry, errCh, err := b.buildLoadExportInternal(ctx, req.Tags)+ if err != nil {+ return buildkit.SolveOpt{}, nil, err+ }+ loadErrCh = errCh+ exports = append(exports, exportEntry)+ }++ if len(exports) > 0 {+ solveOpt.Exports = exports+ }++ return solveOpt, loadErrCh, nil+}++func (b *builder) buildLoadExportInternal(ctx context.Context, tags []string) (buildkit.ExportEntry, chan error, error) {+ if b.dockerClientProvider == nil {+ return buildkit.ExportEntry{}, nil, errors.New("docker service not available")+ }++ dockerClient, err := b.dockerClientProvider.GetClient()+ 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_core.go b/backend/pkg/libarcane/libbuild/builder_core.gonew file mode 100644index 000000000..d757d6c71--- /dev/null+++ b/backend/pkg/libarcane/libbuild/builder_core.go@@ -0,0 +1,215 @@+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"+ utilsregistry "github.com/getarcaneapp/arcane/backend/internal/utils/registry"+ "github.com/getarcaneapp/arcane/backend/internal/utils/timeouts"+ buildtypes "github.com/getarcaneapp/arcane/types/builds"+ imagetypes "github.com/getarcaneapp/arcane/types/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, errors.New("settings provider not available")+ }++ if strings.TrimSpace(req.ContextDir) == "" {+ return nil, errors.New("contextDir is required")+ }++ 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" {+ return b.buildWithDockerInternal(buildCtx, req, progressWriter, serviceName)+ }++ if provider == nil {+ return nil, errors.New("build provider not available")+ }++ session, err := provider.NewSession(buildCtx, req)+ if err != nil {+ return nil, err+ }++ 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, err := b.buildSolveOptInternal(buildCtx, req)+ if err != nil {+ buildErr = err+ return nil, err+ }++ 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(buildCtx, statusCh, progressWriter, serviceName)+ }()++ writeProgressEventInternal(progressWriter, imagetypes.ProgressEvent{+ Type: "build",+ Phase: "begin",+ Service: serviceName,+ Status: "build started",+ })++ resp, err := session.Client.Solve(buildCtx, nil, solveOpt, statusCh)+ buildErr = err++ if err != nil {+ 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+ }+ }++ 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 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.gonew file mode 100644index 000000000..d53c18881--- /dev/null+++ b/backend/pkg/libarcane/libbuild/builder_core_test.go@@ -0,0 +1,100 @@+package libbuild++import (+ "context"+ "errors"+ "testing"++ configtypes "github.com/docker/cli/cli/config/types"+ utilsregistry "github.com/getarcaneapp/arcane/backend/internal/utils/registry"+ "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)+ })+}diff --git a/backend/pkg/libarcane/libbuild/builder_docker.go b/backend/pkg/libarcane/libbuild/builder_docker.gonew file mode 100644index 000000000..b090e411b--- /dev/null+++ b/backend/pkg/libarcane/libbuild/builder_docker.go@@ -0,0 +1,540 @@+package libbuild++import (+ "bufio"+ "context"+ "encoding/json"+ "errors"+ "fmt"+ "io"+ "os"+ "path/filepath"+ "strconv"+ "strings"++ dockerutils "github.com/getarcaneapp/arcane/backend/internal/utils/docker"+ imagetypes "github.com/getarcaneapp/arcane/types/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"+ ocispec "github.com/opencontainers/image-spec/specs-go/v1"+)++type dockerBuildInput struct {+ contextDir string+ fullDockerfilePath string+ relDockerfile string+ dockerfileOutsideCtx bool+ 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+}++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 prepareDockerBuildInputInternal(req imagetypes.BuildRequest) (dockerBuildInput, bool, error) {+ contextDir := filepath.Clean(req.ContextDir)+ if contextDir == "" {+ return dockerBuildInput{}, false, errors.New("contextDir is required")+ }++ if len(req.Platforms) > 1 {+ return dockerBuildInput{}, true, fmt.Errorf("docker build fallback does not support multi-platform builds")+ }++ platform := ""+ if len(req.Platforms) == 1 {+ platform = strings.TrimSpace(req.Platforms[0])+ }++ 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 {+ relDockerfile = filepath.Base(fullDockerfilePath)+ } else {+ relDockerfile = filepath.ToSlash(relDockerfile)+ }++ buildArgs := map[string]*string{}+ for key, val := range req.BuildArgs {+ v := val+ buildArgs[key] = &v+ }++ 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{+ contextDir: contextDir,+ fullDockerfilePath: fullDockerfilePath,+ relDockerfile: relDockerfile,+ dockerfileOutsideCtx: dockerfileOutsideCtx,+ 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 := readDockerignoreInternal(contextDir)+ return archive.TarWithOptions(contextDir, &archive.TarOptions{ExcludePatterns: excludes})+}++func copyFileWithModeInternal(src, dst string, mode os.FileMode) 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 out.Close()++ _, err = io.Copy(out, in)+ return err+}++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)+ }++ if err := os.MkdirAll(filepath.Dir(targetPath), 0o755); err != nil {+ return err+ }++ return copyFileWithModeInternal(path, targetPath, info.Mode())+ })+}++func prepareDockerBuildContextInternal(input dockerBuildInput) (string, string, func(), error) {+ if !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)+ }++ 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 (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: fmt.Sprintf("pushing %s", 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: fmt.Sprintf("registry auth unavailable for %s", 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, errors.New("docker service not available")+ }++ dockerClient, err := b.dockerClientProvider.GetClient()+ 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 {+ ignorePath := filepath.Join(contextDir, ".dockerignore")+ file, err := os.Open(ignorePath)+ if err != nil {+ return 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)+ }++ return patterns+}diff --git a/backend/pkg/libarcane/libbuild/builder_docker_test.go b/backend/pkg/libarcane/libbuild/builder_docker_test.gonew file mode 100644index 000000000..6a3971d27--- /dev/null+++ b/backend/pkg/libarcane/libbuild/builder_docker_test.go@@ -0,0 +1,67 @@+package libbuild++import (+ "testing"++ imagetypes "github.com/getarcaneapp/arcane/types/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)+ 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)+}diff --git a/backend/pkg/libarcane/libbuild/builder_progress.go b/backend/pkg/libarcane/libbuild/builder_progress.gonew file mode 100644index 000000000..90a5a36f7--- /dev/null+++ b/backend/pkg/libarcane/libbuild/builder_progress.go@@ -0,0 +1,24 @@+package libbuild++import (+ "encoding/json"+ "io"++ imagetypes "github.com/getarcaneapp/arcane/types/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.gonew file mode 100644index 000000000..c92ab45f2--- /dev/null+++ b/backend/pkg/libarcane/libbuild/builder_utils.go@@ -0,0 +1,131 @@+package libbuild++import (+ "errors"+ "fmt"+ "os"+ "path/filepath"+ "sort"+ "strings"++ imagetypes "github.com/getarcaneapp/arcane/types/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 errors.New("contextDir is required")+ }++ contextDir := filepath.Clean(req.ContextDir)+ if _, err := os.Stat(contextDir); err != nil {+ return fmt.Errorf("build context not found: %w", err)+ }++ if providerName == "depot" && !req.Push {+ return errors.New("depot builds must push images to a registry")+ }++ 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 errors.New("at least one tag is required when push/load is enabled")+ }++ dockerfilePath := strings.TrimSpace(req.Dockerfile)+ 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.gonew file mode 100644index 000000000..1e634b481--- /dev/null+++ b/backend/pkg/libarcane/libbuild/builder_utils_test.go@@ -0,0 +1,74 @@+package libbuild++import (+ "os"+ "path/filepath"+ "testing"++ imagetypes "github.com/getarcaneapp/arcane/types/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)+}diff --git a/backend/pkg/libarcane/libbuild/log_capture.go b/backend/pkg/libarcane/libbuild/log_capture.gonew file mode 100644index 000000000..668ae29c5--- /dev/null+++ b/backend/pkg/libarcane/libbuild/log_capture.go@@ -0,0 +1,47 @@+package libbuild++import (+ "bytes"++ buildtypes "github.com/getarcaneapp/arcane/types/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/backend/pkg/libarcane/settings.go b/backend/pkg/libarcane/settings.gonew file mode 100644index 000000000..f6815f687--- /dev/null+++ b/backend/pkg/libarcane/settings.go@@ -0,0 +1,61 @@+package libarcane++import (+ "slices"++ "github.com/robfig/cron/v3"+)++const DepotTokenSettingKey = "depotToken"++type SettingUpdate struct {+ Key string `json:"key"`+ Value string `json:"value"`+}++var timeoutSettingKeys = []string{+ "dockerApiTimeout",+ "dockerImagePullTimeout",+ "trivyScanTimeout",+ "gitOperationTimeout",+ "httpClientTimeout",+ "registryTimeout",+ "proxyRequestTimeout",+ "trivyResourceLimitsEnabled",+ "trivyCpuLimit",+ "trivyMemoryLimitMb",+ "trivyConcurrentScanContainers",+ "buildProvider",+ "buildsDirectory",+ "buildTimeout",+ "depotProjectId",+ DepotTokenSettingKey,+}++var cronSettingKeys = []string{+ "scheduledPruneInterval",+ "autoUpdateInterval",+ "pollingInterval",+ "environmentHealthInterval",+ "eventCleanupInterval",+ "analyticsHeartbeatInterval",+ "vulnerabilityScanInterval",+}++var cronParser = cron.NewParser(cron.Second | cron.Minute | cron.Hour | cron.Dom | cron.Month | cron.Dow)++func IsTimeoutSettingKey(key string) bool {+ return slices.Contains(timeoutSettingKeys, key)+}++func IsCronSettingKey(key string) bool {+ return slices.Contains(cronSettingKeys, key)+}++func ValidateCronSetting(key, value string) error {+ if value == "" || !IsCronSettingKey(key) {+ return nil+ }+ _, err := cronParser.Parse(value)+ return err+}diff --git a/backend/resources/migrations/postgres/037_add_image_builds.down.sql b/backend/resources/migrations/postgres/037_add_image_builds.down.sqlnew file mode 100644index 000000000..3327a4894--- /dev/null+++ b/backend/resources/migrations/postgres/037_add_image_builds.down.sql@@ -0,0 +1,2 @@+-- Drop image_builds table+DROP TABLE IF EXISTS image_builds;diff --git a/backend/resources/migrations/postgres/037_add_image_builds.up.sql b/backend/resources/migrations/postgres/037_add_image_builds.up.sqlnew file mode 100644index 000000000..531f780bd--- /dev/null+++ b/backend/resources/migrations/postgres/037_add_image_builds.up.sql@@ -0,0 +1,42 @@+-- Add image_builds table for storing build history+CREATE TABLE IF NOT EXISTS image_builds (+ id TEXT PRIMARY KEY,+ environment_id TEXT NOT NULL,+ user_id TEXT,+ username TEXT,+ status TEXT NOT NULL,+ provider TEXT,+ context_dir TEXT NOT NULL,+ dockerfile TEXT,+ target TEXT,+ tags TEXT,+ platforms TEXT,+ build_args TEXT,+ labels TEXT,+ cache_from TEXT,+ cache_to TEXT,+ no_cache BOOLEAN NOT NULL DEFAULT FALSE,+ pull BOOLEAN NOT NULL DEFAULT FALSE,+ build_network TEXT,+ isolation TEXT,+ shm_size BIGINT,+ ulimits TEXT,+ entitlements TEXT,+ privileged BOOLEAN NOT NULL DEFAULT FALSE,+ extra_hosts TEXT,+ push BOOLEAN NOT NULL DEFAULT FALSE,+ load BOOLEAN NOT NULL DEFAULT FALSE,+ digest TEXT,+ error_message TEXT,+ output TEXT,+ output_truncated BOOLEAN NOT NULL DEFAULT FALSE,+ completed_at TIMESTAMP,+ duration_ms BIGINT,+ created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,+ updated_at TIMESTAMP+);++-- Create indexes for efficient querying+CREATE INDEX IF NOT EXISTS idx_image_builds_env ON image_builds(environment_id);+CREATE INDEX IF NOT EXISTS idx_image_builds_status ON image_builds(status);+CREATE INDEX IF NOT EXISTS idx_image_builds_created_at ON image_builds(created_at);diff --git a/backend/resources/migrations/sqlite/037_add_image_builds.down.sql b/backend/resources/migrations/sqlite/037_add_image_builds.down.sqlnew file mode 100644index 000000000..3327a4894--- /dev/null+++ b/backend/resources/migrations/sqlite/037_add_image_builds.down.sql@@ -0,0 +1,2 @@+-- Drop image_builds table+DROP TABLE IF EXISTS image_builds;diff --git a/backend/resources/migrations/sqlite/037_add_image_builds.up.sql b/backend/resources/migrations/sqlite/037_add_image_builds.up.sqlnew file mode 100644index 000000000..05559a7cb--- /dev/null+++ b/backend/resources/migrations/sqlite/037_add_image_builds.up.sql@@ -0,0 +1,42 @@+-- Add image_builds table for storing build history+CREATE TABLE IF NOT EXISTS image_builds (+ id TEXT PRIMARY KEY,+ environment_id TEXT NOT NULL,+ user_id TEXT,+ username TEXT,+ status TEXT NOT NULL,+ provider TEXT,+ context_dir TEXT NOT NULL,+ dockerfile TEXT,+ target TEXT,+ tags TEXT,+ platforms TEXT,+ build_args TEXT,+ labels TEXT,+ cache_from TEXT,+ cache_to TEXT,+ no_cache BOOLEAN NOT NULL DEFAULT 0,+ pull BOOLEAN NOT NULL DEFAULT 0,+ build_network TEXT,+ isolation TEXT,+ shm_size INTEGER,+ ulimits TEXT,+ entitlements TEXT,+ privileged BOOLEAN NOT NULL DEFAULT 0,+ extra_hosts TEXT,+ push BOOLEAN NOT NULL DEFAULT 0,+ load BOOLEAN NOT NULL DEFAULT 0,+ digest TEXT,+ error_message TEXT,+ output TEXT,+ output_truncated BOOLEAN NOT NULL DEFAULT 0,+ completed_at DATETIME,+ duration_ms INTEGER,+ created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,+ updated_at DATETIME+);++-- Create indexes for efficient querying+CREATE INDEX IF NOT EXISTS idx_image_builds_env ON image_builds(environment_id);+CREATE INDEX IF NOT EXISTS idx_image_builds_status ON image_builds(status);+CREATE INDEX IF NOT EXISTS idx_image_builds_created_at ON image_builds(created_at);diff --git a/docker/Dockerfile b/docker/Dockerfileindex 3a20abf67..ddfb452b8 100644--- a/docker/Dockerfile+++ b/docker/Dockerfile@@ -90,7 +90,7 @@ ENV NVIDIA_VISIBLE_DEVICES=all \WORKDIR /app-RUN mkdir -p /app/data+RUN mkdir -p /app/data /buildsCOPY --from=backend-builder /build/arcane .EXPOSE 3552VOLUME ["/app/data"]diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.devindex 762cc54af..379ea0af9 100644--- a/docker/Dockerfile.dev+++ b/docker/Dockerfile.dev@@ -67,7 +67,7 @@ RUN --mount=type=cache,target=/go/pkg/mod \cd backend && go mod download && go mod verify# Create directories with proper permissions-RUN mkdir -p /app/data /app/.bin && \+RUN mkdir -p /app/data /app/.bin /builds && \chmod 755 /app/data /app/.binWORKDIR /app/backenddiff --git a/docker/compose.dev.yaml b/docker/compose.dev.yamlindex 3ee03d2e0..5fd38a68f 100644--- a/docker/compose.dev.yaml+++ b/docker/compose.dev.yaml@@ -49,6 +49,7 @@ services:- ${HOST_PROJECT_ROOT:-..}/backend/.air.toml:/app/backend/.air.toml:ro- /var/run/docker.sock:/var/run/docker.sock- arcane-dev-data:/app/backend/data+ - arcane-builds:/builds- go-build-cache:/go/cache- go-mod-cache:/go/pkg/modenvironment:@@ -104,6 +105,7 @@ services:volumes:- /var/run/docker.sock:/var/run/docker.sock- agent-dev-data:/app/backend/data+ - arcane-builds:/builds- ${HOST_PROJECT_ROOT:-..}/go.work:/app/go.work:ro- ${HOST_PROJECT_ROOT:-..}/types:/app/types:cached- ${HOST_PROJECT_ROOT:-..}/cli:/app/cli:cached@@ -146,3 +148,6 @@ volumes:pnpm-cache:name: arcane-pnpm-cache++ arcane-builds:+ name: arcane-buildsdiff --git a/docker/examples/compose.basic.yaml b/docker/examples/compose.basic.yamlindex 1f0fe6782..b944c79d9 100644--- a/docker/examples/compose.basic.yaml+++ b/docker/examples/compose.basic.yaml@@ -8,6 +8,7 @@ services:- /var/run/docker.sock:/var/run/docker.sock- arcane-data:/app/data- /host/path/to/projects:/app/data/projects+ - /host/path/to/builds:/buildsenvironment:- ENCRYPTION_KEY=xxxxxxxxxxxxxxxxxxxxxx- JWT_SECRET=xxxxxxxxxxxxxxxxxxxxxxxxxxdiff --git a/frontend/messages/en.json b/frontend/messages/en.jsonindex cedf985f3..7b621252f 100644--- a/frontend/messages/en.json+++ b/frontend/messages/en.json@@ -1505,7 +1505,7 @@"progress_deploy_completed": "Deployment Completed","progress_deploy_failed": "Deployment failed","progress_deploy_failed_with_error": "Deployment failed: {error}",- "progress_deploy_failed_to_start": "Failed to start project deployment ({status})",+ "progress_deploy_failed_to_start": "Failed to start project deployment: HTTP {status}","progress_deploy_waiting_for_service": "Waiting for {service} to be healthy","progress_deploy_waiting_for_service_with_health": "Waiting for {service} to be healthy ({health})","progress_deploy_service_healthy": "{service} is healthy",@@ -2029,5 +2029,130 @@"notifications_event_prune_report_description": "Receive a summary report when a scheduled prune operation completes","notifications_event_auto_heal_label": "Auto-Heal Restart","notifications_event_auto_heal_description": "Notify when an unhealthy container is automatically restarted",- "version_info_build_features": "Build Features"+ "version_info_build_features": "Build Features",+ "builds_and_deployments": "Builds and Deployments",+ "builds": "Builds",+ "manual_build_workspace": "Build Workspace",+ "manual_build_workspace_subtitle": "Build Container Images for local use or push to a registry",+ "build_workspace_files": "Build workspace files",+ "build_configuration": "Build configuration",+ "clear_output": "Clear output",+ "build_context": "Build context",+ "build_context_set_to": "Build context set to {path}",+ "build_use_current_folder": "Use current folder",+ "workspace_root_hint": "Workspace root: {buildsRoot}. Use the left panel to pick a folder.",+ "image_tags": "Image Tags",+ "image_tags_placeholder": "my-image:latest",+ "image_tags_description": "Comma-separated list of tags",+ "image_tags_required": "At least one tag is required",+ "dockerfile": "Dockerfile",+ "dockerfile_description": "Path to Dockerfile (relative to context)",+ "target_label": "Target",+ "target_placeholder": "builder",+ "target_description": "Target stage in the Dockerfile",+ "build_args": "Build Args",+ "build_args_placeholder": "KEY=value",+ "build_args_description": "One KEY=value per line",+ "platforms_label": "Platforms",+ "platforms_placeholder": "linux/amd64, linux/arm64",+ "platforms_description": "Comma-separated list of platforms",+ "build_provider": "Build Provider",+ "local_docker": "Local Docker",+ "local_docker_description": "Use the local Docker daemon",+ "depot": "Depot",+ "depot_description": "Use Depot hosted BuildKit",+ "push": "Push",+ "push_description": "Push built images to registry",+ "load": "Load",+ "load_description": "Load image into local Docker",+ "build": "Build",+ "build_output": "Build output",+ "auto_scroll": "Auto scroll",+ "build_output_placeholder": "Build output will appear here.",+ "idle": "Idle",+ "build_completed": "Build completed",+ "build_failed": "Build failed",+ "build_failed_with_error": "Build failed: {error}",+ "build_error_log": "ERROR: {error}",+ "build_context_required": "Select a build context from the workspace first.",+ "starting_build": "Starting build...",+ "finalizing_build": "Finalizing build...",+ "using_context": "Using context: {context}",+ "build_request_failed": "Build request failed",+ "build_request_failed_http": "Build request failed: HTTP {status}",+ "compose_build_and_deploy": "Build & Deploy",+ "progress_building": "Building",+ "progress_building_images": "Building images",+ "progress_building_images_starting": "Building images...",+ "build_phase_started": "build started",+ "build_phase_completed": "build completed",+ "build_duration_label": "Duration",+ "build_rebuild": "Rebuild",+ "build_output_truncated": "Output truncated",+ "build_no_cache_pull_base_label": "No cache / Pull base",+ "build_provider_unsupported_local": "Unsupported build options for provider local: {fields}",+ "build_provider_unsupported_depot": "Unsupported build options for provider depot: {fields}",+ "build_provider_warning_single_platform_local": "Only one platform is supported by local provider",+ "build_provider_warning_unsupported_local": "Not supported by local provider",+ "build_provider_warning_unsupported_depot": "Not supported by depot provider",+ "build_labels_placeholder": "com.example.key=value",+ "build_labels_description": "Image labels (KEY=VALUE, one per line)",+ "build_cache_from_label": "Cache From",+ "build_cache_from_placeholder": "myorg/myimage:cache",+ "build_cache_from_description": "Cache import sources (comma or newline separated)",+ "build_cache_to_label": "Cache To",+ "build_cache_to_placeholder": "type=registry,ref=myorg/myimage:cache",+ "build_cache_to_description": "Cache export targets (comma or newline separated)",+ "build_network_label": "Network",+ "build_network_placeholder": "host | none | custom",+ "build_network_description": "Build-time network mode for RUN instructions",+ "build_isolation_label": "Isolation",+ "build_isolation_placeholder": "process | hyperv",+ "build_isolation_description": "Build container isolation mode",+ "build_shm_size_label": "Shm Size (bytes)",+ "build_shm_size_short_label": "Shm size",+ "build_shm_size_placeholder": "67108864",+ "build_shm_size_description": "Build /dev/shm size in bytes",+ "build_ulimits_label": "Ulimits",+ "build_ulimits_placeholder": "nofile=1024:2048",+ "build_ulimits_description": "Build ulimits (NAME=SOFT:HARD, one per line)",+ "build_entitlements_label": "Entitlements",+ "build_entitlements_placeholder": "network.host",+ "build_entitlements_description": "BuildKit entitlements (comma or newline separated)",+ "build_extra_hosts_label": "Extra Hosts",+ "build_extra_hosts_placeholder": "registry.local=10.0.0.5",+ "build_extra_hosts_description": "Build-time host mappings (HOST=IP, one per line)",+ "build_privileged_label": "Privileged Build",+ "build_privileged_heading_label": "Privileged",+ "build_privileged_description": "Enable insecure build privileges",+ "build_no_cache_label": "No Cache",+ "build_no_cache_description": "Disable Dockerfile layer cache",+ "build_pull_base_images_label": "Pull Base Images",+ "build_pull_base_images_description": "Always pull referenced base images",+ "build_bytes": "{size} bytes",+ "build_settings_saved": "Build settings saved",+ "build_settings_page_title": "Build",+ "build_settings_page_description": "Configure local Docker and Depot build settings.",+ "build_settings_workspace_section_title": "Build Workspace",+ "build_settings_directory_label": "Builds Directory",+ "build_settings_directory_description": "Root directory for manual build workspaces.",+ "build_settings_directory_placeholder": "/builds",+ "build_settings_directory_help": "Absolute path inside the Arcane container",+ "build_settings_provider_section_title": "Build Provider",+ "build_settings_default_provider_label": "Default Provider",+ "build_settings_default_provider_description": "Select the default build provider.",+ "build_settings_depot_enable_hint": "Add a Depot Project ID and Token below to enable the Depot provider option.",+ "build_settings_timeout_label": "Build Timeout",+ "build_settings_timeout_description": "Timeout for image builds in seconds.",+ "build_settings_timeout_placeholder": "1800",+ "build_settings_timeout_help": "Timeout in seconds (60-14400)",+ "build_settings_depot_section_title": "Depot",+ "build_settings_depot_project_id_label": "Depot Project ID",+ "build_settings_depot_project_id_description": "Depot project identifier for hosted builds.",+ "build_settings_depot_project_id_placeholder": "proj_123456",+ "build_settings_depot_token_label": "Depot Token",+ "build_settings_depot_token_description": "Personal access token for Depot (leave blank to keep existing).",+ "build_settings_depot_token_placeholder": "******",+ "build_settings_depot_token_help": "Leave blank to preserve the existing token",+ "build_history": "Build History"}diff --git a/frontend/src/lib/components/action-buttons.svelte b/frontend/src/lib/components/action-buttons.svelteindex f0fc4d429..3e193917d 100644--- a/frontend/src/lib/components/action-buttons.svelte+++ b/frontend/src/lib/components/action-buttons.svelte@@ -9,10 +9,12 @@import ProgressPopover from '$lib/components/progress-popover.svelte';import * as DropdownMenu from '$lib/components/ui/dropdown-menu/index.js';import { m } from '$lib/paraglide/messages';+ import settingsStore from '$lib/stores/config-store';import { containerService } from '$lib/services/container-service';import { projectService } from '$lib/services/project-service';import { isDownloadingLine, calculateOverallProgress, areAllLayersComplete } from '$lib/utils/pull-progress';- import { EllipsisIcon, DownloadIcon } from '$lib/icons';+ import { sanitizeLogText } from '$lib/utils/log-text';+ import { EllipsisIcon, DownloadIcon, HammerIcon } from '$lib/icons';import { createMutation } from '@tanstack/svelte-query';type TargetType = 'container' | 'project';@@ -23,6 +25,7 @@pull?: boolean;deploy?: boolean;redeploy?: boolean;+ build?: boolean;remove?: boolean;validating?: boolean;refresh?: boolean;@@ -42,6 +45,7 @@removeLoading = $bindable(false),redeployLoading = $bindable(false),refreshLoading = $bindable(false),+ hasBuildDirective = false,onRefresh}: {id: string;@@ -57,6 +61,7 @@removeLoading?: boolean;redeployLoading?: boolean;refreshLoading?: boolean;+ hasBuildDirective?: boolean;onRefresh?: () => void | Promise<void>;} = $props();@@ -66,6 +71,7 @@restart: false,remove: false,pull: false,+ build: false,redeploy: false,validating: false,refresh: false@@ -89,6 +95,7 @@restart: !!(isLoading.restart || loading?.restart || restartLoading),remove: !!(isLoading.remove || loading?.remove || removeLoading),pulling: !!(isLoading.pull || loading?.pull),+ building: !!(isLoading.build || loading?.build),redeploy: !!(isLoading.redeploy || loading?.redeploy || redeployLoading),validating: !!(isLoading.validating || loading?.validating),refresh: !!(isLoading.refresh || loading?.refresh || refreshLoading)@@ -146,17 +153,47 @@}));let pullPopoverOpen = $state(false);+ let buildPopoverOpen = $state(false);let deployPullPopoverOpen = $state(false);let projectPulling = $state(false); // only for Project Pull button/popover+ let projectBuilding = $state(false); // only for Project Build button/popoverlet deployPulling = $state(false); // only for Deploy popoverlet pullProgress = $state(0);let pullStatusText = $state('');let pullError = $state('');let layerProgress = $state<Record<string, { current: number; total: number; status: string }>>({});+ let buildOutputLines = $state<string[]>([]);+ let deployProgressPhase = $state<'pull' | 'build' | 'deploy'>('deploy');let deployServiceProgress = $state<Record<string, { phase: string; health?: string; state?: string; status?: string }>>({});let deployLastNonWaitingStatus = $state('');const isRunning = $derived(itemState === 'running' || (type === 'project' && itemState === 'partially running'));+ const projectHasBuildDirective = $derived(type === 'project' && hasBuildDirective);+ const deployButtonLabel = $derived(projectHasBuildDirective ? m.compose_build_and_deploy() : m.common_up());+ const depotAvailable = $derived.by(() => {+ const projectId = ($settingsStore?.depotProjectId ?? '').trim();+ const token = ($settingsStore?.depotToken ?? '').trim();+ return Boolean($settingsStore?.depotConfigured) || (Boolean(projectId) && Boolean(token));+ });+ const projectBuildProvider = $derived.by<'local' | 'depot'>(() => {+ const configuredProvider = ($settingsStore?.buildProvider as 'local' | 'depot') ?? 'local';+ if (configuredProvider === 'depot' && !depotAvailable) {+ return 'local';+ }+ return configuredProvider;+ });+ const deployPopoverTitle = $derived.by(() => {+ switch (deployProgressPhase) {+ case 'build':+ return m.progress_building_images();+ case 'pull':+ return m.progress_pulling_images();+ default:+ return m.progress_deploying_project();+ }+ });+ const deployPopoverIcon = $derived(deployProgressPhase === 'build' ? HammerIcon : DownloadIcon);+ const deployPopoverLayers = $derived.by(() => (deployProgressPhase === 'pull' ? layerProgress : {}));// Tailwind xl breakpoint is 1280px. We use this to avoid mounting two desktop variants at once// (which would duplicate portaled popovers when the same `open` state is bound twice).@@ -199,10 +236,26 @@pullStatusText = '';pullError = '';layerProgress = {};+ buildOutputLines = [];+ deployProgressPhase = 'deploy';deployServiceProgress = {};deployLastNonWaitingStatus = '';}+ function appendBuildOutputLine(rawStatus: unknown, rawService?: unknown) {+ const status = sanitizeLogText(String(rawStatus ?? ''));+ if (!status) return;++ const service = sanitizeLogText(String(rawService ?? ''));+ const line = service ? `[${service}] ${status}` : status;++ if (buildOutputLines.length > 0 && buildOutputLines[buildOutputLines.length - 1] === line) {+ return;+ }++ buildOutputLines = [...buildOutputLines.slice(-149), line];+ }+function deriveDeployStatusText(): string {const entries = Object.entries(deployServiceProgress);if (entries.length === 0) return m.progress_deploy_starting();@@ -210,7 +263,7 @@const waiting = entries.filter(([_, v]) => v.phase === 'service_waiting_healthy').sort(([a], [b]) => a.localeCompare(b));if (waiting.length > 0) {const [service, v] = waiting[0];- const health = (v.health ?? '').trim();+ const health = String(v.health ?? '').trim();return health? m.progress_deploy_waiting_for_service_with_health({ service, health }): m.progress_deploy_waiting_for_service({ service });@@ -320,22 +373,75 @@let openedPopover = false;let hadError = false;let deployPhaseStarted = false;+ let buildPhaseStarted = false;// Always open the popover for deploy so we can show health-wait status even// when there is nothing to pull.deployPullPopoverOpen = true;deployPulling = true;+ deployProgressPhase = 'deploy';pullStatusText = m.progress_deploy_starting();openedPopover = true;try {- await projectService.deployProject(id, (deployData) => {+ const handleDeployLine = (deployData: any) => {if (!deployData) return;- // Pull progress lines are streamed by backend /up before deploy when+ if (deployData.type === 'build') {+ deployProgressPhase = 'build';+ if (!buildPhaseStarted) {+ buildPhaseStarted = true;+ pullProgress = 0;+ layerProgress = {};+ pullError = '';+ deployServiceProgress = {};+ deployLastNonWaitingStatus = '';+ }++ if (deployData.phase === 'begin') {+ pullStatusText = m.progress_building_images_starting();+ appendBuildOutputLine(m.build_phase_started(), deployData.service);+ } else if (deployData.phase === 'complete') {+ pullStatusText = m.build_completed();+ pullProgress = 100;+ appendBuildOutputLine(m.build_phase_completed(), deployData.service);+ }++ if (deployData.status) {+ pullStatusText = String(deployData.status);+ appendBuildOutputLine(deployData.status, deployData.service);+ }++ if (deployData.error) {+ const errMsg =+ typeof deployData.error === 'string' ? deployData.error : deployData.error.message || m.progress_deploy_failed();+ pullError = errMsg;+ pullStatusText = m.progress_deploy_failed_with_error({ error: errMsg });+ hadError = true;+ deployPulling = false;+ return;+ }++ if (deployData.id) {+ const currentLayer = layerProgress[deployData.id] || { current: 0, total: 0, status: '' };+ currentLayer.status = deployData.status || currentLayer.status;+ if (deployData.progressDetail) {+ const { current, total } = deployData.progressDetail;+ if (typeof current === 'number') currentLayer.current = current;+ if (typeof total === 'number') currentLayer.total = total;+ }+ layerProgress[deployData.id] = currentLayer;+ }++ updatePullProgress();+ return;+ }++ // Pull progress lines can be streamed by backend /up before deploy when// image policy requires pulling (missing/always/refresh).if (deployData.type !== 'deploy') {if (isDownloadingLine(deployData)) {+ deployProgressPhase = 'pull';pullStatusText = m.images_pull_initiating();}@@ -352,6 +458,7 @@if (deployData.status) pullStatusText = deployData.status;if (deployData.id) {+ deployProgressPhase = 'pull';const currentLayer = layerProgress[deployData.id] || { current: 0, total: 0, status: '' };currentLayer.status = deployData.status || currentLayer.status;if (deployData.progressDetail) {@@ -362,13 +469,16 @@layerProgress[deployData.id] = currentLayer;}- updatePullProgress();+ if (deployProgressPhase === 'pull') {+ updatePullProgress();+ }return;}- // First deploy status line initializes deploy-only progress state.+ // First deploy status line: switch UI from pull -> deploy.if (!deployPhaseStarted) {deployPhaseStarted = true;+ deployProgressPhase = 'deploy';pullProgress = 0;layerProgress = {};pullError = '';@@ -471,7 +581,9 @@deployPulling = false;pullProgress = 100;}- });+ };++ await projectService.deployProject(id, handleDeployLine);if (hadError) throw new Error(pullError || m.progress_deploy_failed());@@ -596,6 +708,65 @@}}}++ async function handleProjectBuild() {+ resetPullState();+ projectBuilding = true;+ buildPopoverOpen = true;+ pullStatusText = m.progress_building_images_starting();++ let wasSuccessful = false;++ try {+ const buildProvider = projectBuildProvider;+ await projectService.buildProjectImages(+ id,+ {+ provider: buildProvider,+ push: buildProvider === 'depot',+ load: buildProvider !== 'depot'+ },+ (data) => {+ if (!data) return;++ if (data.error) {+ const errMsg = typeof data.error === 'string' ? data.error : data.error.message || m.build_failed();+ pullError = errMsg;+ pullStatusText = m.build_failed_with_error({ error: errMsg });+ return;+ }++ if (data.status) {+ pullStatusText = data.status;+ appendBuildOutputLine(data.status, data.service);+ }+ }+ );++ if (pullError) throw new Error(pullError);++ wasSuccessful = true;+ pullProgress = 100;+ pullStatusText = m.build_completed();+ toast.success(m.build_completed());+ await invalidateAll();++ setTimeout(() => {+ buildPopoverOpen = false;+ projectBuilding = false;+ resetPullState();+ }, 2000);+ } catch (error: any) {+ const message = error?.message || m.build_failed();+ pullError = message;+ pullStatusText = m.build_failed_with_error({ error: message });+ toast.error(message);+ } finally {+ if (!wasSuccessful) {+ projectBuilding = false;+ }+ }+ }</script>{#if desktopVariant === 'adaptive'}@@ -617,18 +788,20 @@bind:open={deployPullPopoverOpen}bind:progress={pullProgress}mode="generic"- title={m.progress_deploying_project()}+ title={deployPopoverTitle}completeTitle={m.progress_deploy_completed()}statusText={pullStatusText}error={pullError}loading={deployPulling}- icon={DownloadIcon}- layers={layerProgress}+ icon={deployPopoverIcon}+ layers={deployPopoverLayers}+ outputLines={deployProgressPhase === 'build' ? buildOutputLines : []}><ArcaneButtonaction="deploy"size={adaptiveIconOnly ? 'icon' : 'default'}showLabel={!adaptiveIconOnly}+ customLabel={deployButtonLabel}onclick={() => handleDeploy()}loading={uiLoading.start}/>@@ -672,6 +845,29 @@/>{#if type === 'project'}+ {#if projectHasBuildDirective}+ <ProgressPopover+ bind:open={buildPopoverOpen}+ bind:progress={pullProgress}+ mode="generic"+ title={m.build_output()}+ completeTitle={m.build_completed()}+ statusText={pullStatusText}+ error={pullError}+ loading={projectBuilding}+ icon={HammerIcon}+ outputLines={buildOutputLines}+ >+ <ArcaneButton+ action="build"+ size={adaptiveIconOnly ? 'icon' : 'default'}+ showLabel={!adaptiveIconOnly}+ onclick={() => handleProjectBuild()}+ loading={projectBuilding}+ />+ </ProgressPopover>+ {/if}+<ProgressPopoverbind:open={pullPopoverOpen}bind:progress={pullProgress}@@ -732,7 +928,7 @@</DropdownMenu.Item>{:else}<DropdownMenu.Item onclick={handleDeploy} disabled={uiLoading.start}>- {m.common_up()}+ {deployButtonLabel}</DropdownMenu.Item>{/if}{:else}@@ -754,6 +950,11 @@</DropdownMenu.Item>{#if type === 'project'}+ {#if projectHasBuildDirective}+ <DropdownMenu.Item onclick={handleProjectBuild} disabled={projectBuilding || uiLoading.building}>+ {m.build()}+ </DropdownMenu.Item>+ {/if}<DropdownMenu.Item onclick={handleProjectPull} disabled={projectPulling || uiLoading.pulling}>{m.images_pull()}</DropdownMenu.Item>@@ -778,13 +979,30 @@bind:open={deployPullPopoverOpen}bind:progress={pullProgress}mode="generic"- title={m.progress_deploying_project()}+ title={deployPopoverTitle}completeTitle={m.progress_deploy_completed()}statusText={pullStatusText}error={pullError}loading={deployPulling}- icon={DownloadIcon}- layers={layerProgress}+ icon={deployPopoverIcon}+ layers={deployPopoverLayers}+ outputLines={deployProgressPhase === 'build' ? buildOutputLines : []}+ triggerClass="hidden"+ >+ <span class="hidden"></span>+ </ProgressPopover>++ <ProgressPopover+ bind:open={buildPopoverOpen}+ bind:progress={pullProgress}+ mode="generic"+ title={m.build_output()}+ completeTitle={m.build_completed()}+ statusText={pullStatusText}+ error={pullError}+ loading={projectBuilding}+ icon={HammerIcon}+ outputLines={buildOutputLines}triggerClass="hidden"><span class="hidden"></span>@@ -817,14 +1035,22 @@<ProgressPopoverbind:open={deployPullPopoverOpen}bind:progress={pullProgress}- title={m.progress_pulling_images()}+ mode="generic"+ title={deployPopoverTitle}+ completeTitle={m.progress_deploy_completed()}statusText={pullStatusText}error={pullError}loading={deployPulling}- icon={DownloadIcon}- layers={layerProgress}+ icon={deployPopoverIcon}+ layers={deployPopoverLayers}+ outputLines={deployProgressPhase === 'build' ? buildOutputLines : []}>- <ArcaneButton action="deploy" onclick={() => handleDeploy()} loading={uiLoading.start} />+ <ArcaneButton+ action="deploy"+ customLabel={deployButtonLabel}+ onclick={() => handleDeploy()}+ loading={uiLoading.start}+ /></ProgressPopover>{/if}{/if}@@ -845,6 +1071,23 @@<ArcaneButton action="redeploy" onclick={() => confirmAction('redeploy')} loading={uiLoading.redeploy} />{#if type === 'project'}+ {#if projectHasBuildDirective}+ <ProgressPopover+ bind:open={buildPopoverOpen}+ bind:progress={pullProgress}+ mode="generic"+ title={m.build_output()}+ completeTitle={m.build_completed()}+ statusText={pullStatusText}+ error={pullError}+ loading={projectBuilding}+ icon={HammerIcon}+ outputLines={buildOutputLines}+ >+ <ArcaneButton action="build" onclick={() => handleProjectBuild()} loading={projectBuilding} />+ </ProgressPopover>+ {/if}+<ProgressPopoverbind:open={pullPopoverOpen}bind:progress={pullProgress}@@ -891,7 +1134,7 @@</DropdownMenu.Item>{:else}<DropdownMenu.Item onclick={handleDeploy} disabled={uiLoading.start}>- {m.common_up()}+ {deployButtonLabel}</DropdownMenu.Item>{/if}{:else}@@ -913,6 +1156,11 @@</DropdownMenu.Item>{#if type === 'project'}+ {#if projectHasBuildDirective}+ <DropdownMenu.Item onclick={handleProjectBuild} disabled={projectBuilding || uiLoading.building}>+ {m.build()}+ </DropdownMenu.Item>+ {/if}<DropdownMenu.Item onclick={handleProjectPull} disabled={projectPulling || uiLoading.pulling}>{m.images_pull()}</DropdownMenu.Item>diff --git a/frontend/src/lib/components/arcane-button/variants.ts b/frontend/src/lib/components/arcane-button/variants.tsindex d4c52f578..6a2c25009 100644--- a/frontend/src/lib/components/arcane-button/variants.ts+++ b/frontend/src/lib/components/arcane-button/variants.ts@@ -21,7 +21,8 @@ import {LoginIcon,OpenIdIcon,RedeployIcon,- CodeIcon+ CodeIcon,+ HammerIcon} from '$lib/icons';export const arcaneButtonVariants = tv({@@ -54,6 +55,10 @@ export const arcaneButtonVariants = tv({'bg-sky-500/5 text-foreground! border-sky-500/20 hover:bg-sky-500/10 hover:border-sky-500/40 ' +'dark:bg-sky-500/10 dark:text-sky-400 dark:border-sky-500/30 dark:hover:bg-sky-500/20 ' +'shadow-sm hover:shadow-md',+ 'outline-build':+ 'bg-violet-500/5 text-foreground! border-violet-500/20 hover:bg-violet-500/10 hover:border-violet-500/40 ' ++ 'dark:bg-violet-500/10 dark:text-violet-300 dark:border-violet-500/30 dark:hover:bg-violet-500/20 ' ++ 'shadow-sm hover:shadow-md',outline: 'bg-background border-input hover:bg-accent hover:text-accent-foreground shadow-sm',@@ -113,6 +118,12 @@ export const actionConfigs = {tone: 'outline-primary',loadingLabel: m.common_action_deploying()},+ build: {+ defaultLabel: m.build(),+ IconComponent: HammerIcon,+ tone: 'outline-build',+ loadingLabel: m.starting_build()+ },stop: {defaultLabel: m.common_stop(),IconComponent: StopIcon,diff --git a/frontend/src/lib/components/file-browser/FileBreadcrumb.svelte b/frontend/src/lib/components/file-browser/FileBreadcrumb.svelteindex 5cfa6e736..74eea0931 100644--- a/frontend/src/lib/components/file-browser/FileBreadcrumb.svelte+++ b/frontend/src/lib/components/file-browser/FileBreadcrumb.svelte@@ -35,25 +35,29 @@</Breadcrumb.Separator><Breadcrumb.Item>{#if segments.length === 0}- <Breadcrumb.Page>{rootLabel}</Breadcrumb.Page>+ <Breadcrumb.Page>+ <span class="block max-w-[28ch] truncate" title={rootLabel}>{rootLabel}</span>+ </Breadcrumb.Page>{:else}- <Breadcrumb.Link onclick={() => onNavigate('/')} class="cursor-pointer">- {rootLabel}+ <Breadcrumb.Link onclick={() => onNavigate('/')} class="cursor-pointer" title={rootLabel}>+ <span class="block max-w-[28ch] truncate">{rootLabel}</span></Breadcrumb.Link>{/if}</Breadcrumb.Item>{/if}- {#each segments as segment, i}+ {#each segments as segment, i (segment.path)}<Breadcrumb.Separator><ArrowRightIcon class="h-4 w-4" /></Breadcrumb.Separator><Breadcrumb.Item>{#if i === segments.length - 1}- <Breadcrumb.Page>{segment.name}</Breadcrumb.Page>+ <Breadcrumb.Page>+ <span class="block max-w-[28ch] truncate" title={segment.name}>{segment.name}</span>+ </Breadcrumb.Page>{:else}- <Breadcrumb.Link onclick={() => onNavigate(segment.path)} class="cursor-pointer">- {segment.name}+ <Breadcrumb.Link onclick={() => onNavigate(segment.path)} class="cursor-pointer" title={segment.name}>+ <span class="block max-w-[28ch] truncate">{segment.name}</span></Breadcrumb.Link>{/if}</Breadcrumb.Item>diff --git a/frontend/src/lib/components/file-browser/FileList.svelte b/frontend/src/lib/components/file-browser/FileList.svelteindex a2c199b79..4d5a8e05f 100644--- a/frontend/src/lib/components/file-browser/FileList.svelte+++ b/frontend/src/lib/components/file-browser/FileList.svelte@@ -32,7 +32,8 @@onDelete,onDownload,onPreview,- onRestoreFromBackup+ onRestoreFromBackup,+ minimal = false}: {files: FileEntry[];currentPath: string;@@ -43,6 +44,7 @@onDownload: (file: FileEntry) => Promise<void>;onPreview: (file: FileEntry) => void;onRestoreFromBackup?: (file: FileEntry) => void;+ minimal?: boolean;} = $props();let requestOptions = $state<SearchPaginationSortRequest>({@@ -135,7 +137,7 @@{#snippet NameCell({ item }: { item: FileEntry })}<div class="flex items-center gap-2">{#if item.isDirectory}- <FolderOpenIcon class="size-4 text-blue-500" />+ <FolderOpenIcon class={minimal ? 'text-muted-foreground size-4' : 'size-4 text-blue-500'} /><button class="text-left font-medium hover:underline" onclick={() => onNavigate(item.path)}>{item.name}</button>@@ -255,7 +257,11 @@/>{/snippet}-<div class="file-browser-table bg-card overflow-hidden rounded-lg border shadow-sm">+<div+ class={`file-browser-table overflow-hidden ${+ minimal ? 'file-browser-table--minimal' : 'file-browser-table--card bg-card rounded-lg border shadow-sm'+ }`}+><ArcaneTable{persistKey}items={itemsPaginated}@@ -276,15 +282,31 @@<style>@reference "../../../app.css";- :global(.file-browser-table thead tr) {+ :global(.file-browser-table--card thead tr) {@apply bg-muted/30 hover:bg-muted/30;}- :global(.file-browser-table tbody tr) {+ :global(.file-browser-table--card tbody tr) {@apply hover:bg-muted/50 cursor-default border-none transition-colors;}- :global(.file-browser-table td) {+ :global(.file-browser-table--card td) {@apply py-2;}++ :global(.file-browser-table--minimal thead tr) {+ @apply bg-transparent;+ }++ :global(.file-browser-table--minimal tbody tr) {+ @apply border-border/40 border-b hover:bg-transparent;+ }++ :global(.file-browser-table--minimal th) {+ @apply text-muted-foreground/80 text-[11px] font-medium tracking-[0.08em] uppercase;+ }++ :global(.file-browser-table--minimal td) {+ @apply py-2.5;+ }</style>diff --git a/frontend/src/lib/components/form/labeled-switch.svelte b/frontend/src/lib/components/form/labeled-switch.svelteindex 8f764904a..1a35f48a7 100644--- a/frontend/src/lib/components/form/labeled-switch.svelte+++ b/frontend/src/lib/components/form/labeled-switch.svelte@@ -21,7 +21,7 @@} = $props();</script>-<div class="items-top flex space-x-2">+<div class="flex items-center space-x-2"><Switch {id} {disabled} onCheckedChange={(v) => onCheckedChange && onCheckedChange(v == true)} bind:checked /><div class="grid gap-1.5 leading-none"><Label for={id} class="mb-0 text-sm leading-none font-medium">diff --git a/frontend/src/lib/components/logs/log-viewer.svelte b/frontend/src/lib/components/logs/log-viewer.svelteindex a88793454..23bc8a62b 100644--- a/frontend/src/lib/components/logs/log-viewer.svelte+++ b/frontend/src/lib/components/logs/log-viewer.svelte@@ -5,6 +5,7 @@import { ReconnectingWebSocket } from '$lib/utils/ws';import { cn } from '$lib/utils';import { ansiToHtml } from '$lib/utils/ansi';+ import { stripAnsi } from '$lib/utils/log-text';import { onDestroy } from 'svelte';import StructuredLogEntry from './structured-log-entry.svelte';@@ -365,7 +366,7 @@}function tryParseJson(message: string): { isJson: boolean; parsed?: any } {- const trimmed = message.trim();+ const trimmed = stripAnsi(message).trim();if (!trimmed.startsWith('{') && !trimmed.startsWith('[')) {return { isJson: false };}diff --git a/frontend/src/lib/components/mobile-nav/mobile-nav-sheet.svelte b/frontend/src/lib/components/mobile-nav/mobile-nav-sheet.svelteindex 7b2a0997e..0d589f9cb 100644--- a/frontend/src/lib/components/mobile-nav/mobile-nav-sheet.svelte+++ b/frontend/src/lib/components/mobile-nav/mobile-nav-sheet.svelte@@ -1,10 +1,11 @@<script lang="ts">- import { navigationItems } from '$lib/config/navigation-config';+ import { navigationItems, getBuildAndDeploymentItems } from '$lib/config/navigation-config';import type { NavigationItem } from '$lib/config/navigation-config';import { cn } from '$lib/utils';import { page } from '$app/state';import userStore from '$lib/stores/user-store';import { m } from '$lib/paraglide/messages';+ import { environmentStore } from '$lib/stores/environment.store.svelte';import MobileUserCard from './mobile-user-card.svelte';import * as Drawer from '$lib/components/ui/drawer/index.js';import { ArcaneButton } from '$lib/components/arcane-button/index.js';@@ -38,6 +39,8 @@const currentPath = $derived(page.url.pathname);const memoizedUser = $derived.by(() => user ?? storeUser);+ const currentEnvId = $derived(environmentStore.selected?.id || '0');+ const buildDeploymentItems = $derived(getBuildAndDeploymentItems(currentEnvId));let upgrading = $state(false);let showConfirmDialog = $state(false);@@ -193,6 +196,32 @@</div></section>+ <section>+ <h4 class="text-muted-foreground/70 mb-4 px-3 text-[11px] font-bold tracking-widest uppercase">+ {m.builds_and_deployments()}+ </h4>+ <div class="space-y-2">+ {#each buildDeploymentItems as item (item.url)}+ {@const IconComponent = item.icon}+ <a+ href={item.url}+ onclick={handleItemClick}+ class={cn(+ 'flex items-center gap-3 rounded-2xl px-4 py-3 text-sm font-medium transition-all duration-200 ease-out',+ 'focus-visible:ring-muted-foreground/50 hover:scale-[1.01] focus-visible:ring-1 focus-visible:ring-offset-1 focus-visible:ring-offset-transparent',+ isActiveItem(item)+ ? 'bg-muted text-foreground hover:bg-muted/70 shadow-sm'+ : 'text-foreground hover:bg-muted/50'+ )}+ aria-current={isActiveItem(item) ? 'page' : undefined}+ >+ <IconComponent size={20} />+ <span>{item.title}</span>+ </a>+ {/each}+ </div>+ </section>+<section><h4 class="text-muted-foreground/70 mb-4 px-3 text-[11px] font-bold tracking-widest uppercase">{m.security_title()}diff --git a/frontend/src/lib/components/progress-popover.svelte b/frontend/src/lib/components/progress-popover.svelteindex 9cea8dfbd..4ae660999 100644--- a/frontend/src/lib/components/progress-popover.svelte+++ b/frontend/src/lib/components/progress-popover.svelte@@ -9,6 +9,7 @@import { ArcaneButton } from '$lib/components/arcane-button/index.js';import type { Snippet } from 'svelte';import { m } from '$lib/paraglide/messages';+ import { sanitizeLogText } from '$lib/utils/log-text';import {type LayerProgress,type PullPhase,@@ -40,6 +41,7 @@preventCloseWhileLoading?: boolean;onCancel?: () => void;layers?: Record<string, LayerProgress>;+ outputLines?: string[];triggerClass?: string;children: Snippet;}@@ -62,10 +64,21 @@preventCloseWhileLoading = true,onCancel,layers = {},+ outputLines = [],triggerClass,children}: Props = $props();+ let outputContainer = $state<HTMLElement | null>(null);++ $effect(() => {+ if (!open || !outputContainer || outputLines.length === 0) return;+ queueMicrotask(() => {+ if (!outputContainer) return;+ outputContainer.scrollTop = outputContainer.scrollHeight;+ });+ });+const isMobile = new IsMobile();const percent = $derived(Math.round(progress));@@ -91,16 +104,17 @@// Check if we're in an indeterminate phase (extracting with no byte progress)const isIndeterminate = $derived(isIndeterminatePhase(layers, progress));const isIndeterminateGeneric = $derived(mode !== 'pull' && loading && !isComplete && !error);+ const cleanStatusText = $derived(sanitizeLogText(statusText));// Derive aggregate status for display- const aggregateStatus = $derived(getAggregateStatus(layers, statusText, hasReachedComplete || isComplete));+ const aggregateStatus = $derived(getAggregateStatus(layers, cleanStatusText, hasReachedComplete || isComplete));// Derive the current phase from status text using utility (pull-mode only)const currentPhase = $derived.by((): PullPhase => {if (Object.keys(layers).length > 0) {return getAggregatePullPhase(layers, hasReachedComplete || isComplete, !!error);}- return getPullPhase(statusText, hasReachedComplete || isComplete, !!error);+ return getPullPhase(cleanStatusText, hasReachedComplete || isComplete, !!error);});// Get localized title based on phase@@ -210,7 +224,8 @@<Collapsible.Content><div class="mt-2 max-h-48 space-y-1.5 overflow-y-auto">{#each Object.entries(layers) as [id, layer] (id)}- {@const phase = hasReachedComplete ? 'complete' : getLayerPhase(layer.status)}+ {@const layerStatus = sanitizeLogText(layer.status || '')}+ {@const phase = hasReachedComplete ? 'complete' : getLayerPhase(layerStatus)}{@const layerPercent =phase === 'complete' ? 100 : layer.total > 0 ? Math.round((layer.current / layer.total) * 100) : 0}<div class="bg-muted/30 rounded-md px-2 py-1.5">@@ -229,7 +244,7 @@{:else if layer.total > 0}{layerPercent}%{:else}- {layer.status}+ {layerStatus}{/if}</span></div>@@ -240,6 +255,20 @@</Collapsible.Content></Collapsible.Root>{/if}++ {#if outputLines.length > 0 && !error}+ <div class="mt-2 overflow-hidden rounded-md border border-white/10 bg-black/80">+ <div class="flex items-center justify-between border-b border-white/10 px-2 py-1">+ <span class="text-[10px] font-medium tracking-wide text-emerald-300/80 uppercase">{m.build_output()}</span>+ <span class="text-[10px] text-emerald-300/60">{outputLines.length}</span>+ </div>+ <pre+ bind:this={outputContainer}+ class="max-h-40 overflow-y-auto px-2 py-2 font-mono text-[11px] leading-relaxed whitespace-pre-wrap text-emerald-200">{#each outputLines as line, i (i)}<span+ class="block break-words">{line}</span+ >{/each}</pre>+ </div>+ {/if}{/snippet}{#if isMobile.current}diff --git a/frontend/src/lib/components/sidebar/sidebar.svelte b/frontend/src/lib/components/sidebar/sidebar.svelteindex 0c45b716e..d6c8519be 100644--- a/frontend/src/lib/components/sidebar/sidebar.svelte+++ b/frontend/src/lib/components/sidebar/sidebar.svelte@@ -1,5 +1,5 @@<script lang="ts" module>- import { navigationItems, getManagementItems } from '$lib/config/navigation-config';+ import { navigationItems, getBuildAndDeploymentItems } from '$lib/config/navigation-config';</script><script lang="ts">@@ -63,7 +63,7 @@}) ?? [];const currentEnvId = $derived(environmentStore.selected?.id || '0');- const managementItems = $derived(getManagementItems(currentEnvId));+ const buildDeploymentItems = $derived(getBuildAndDeploymentItems(currentEnvId));</script><VersionInfoDialog@@ -98,8 +98,9 @@{/if}</Sidebar.Header><Sidebar.Content class={!isCollapsed ? '-mt-2' : ''}>- <SidebarItemGroup label={m.sidebar_management()} items={managementItems} />+ <SidebarItemGroup label={m.sidebar_management()} items={navigationItems.managementItems} /><SidebarItemGroup label={m.sidebar_resources()} items={navigationItems.resourceItems} />+ <SidebarItemGroup label={m.builds_and_deployments()} items={buildDeploymentItems} /><SidebarItemGroup label={m.security_title()} items={navigationItems.securityItems} />{#if isAdmin}<SidebarItemGroup label={m.sidebar_administration()} items={desktopSettingsItems} />diff --git a/frontend/src/lib/config/navigation-config.ts b/frontend/src/lib/config/navigation-config.tsindex eee178702..0f96ea894 100644--- a/frontend/src/lib/config/navigation-config.ts+++ b/frontend/src/lib/config/navigation-config.ts@@ -16,7 +16,8 @@ import {EventsIcon,SettingsIcon,GitBranchIcon,- ShieldAlertIcon+ ShieldAlertIcon,+ HammerIcon} from '$lib/icons';import { m } from '$lib/paraglide/messages';import type { ShortcutKey } from '$lib/utils/keyboard-shortcut.utils';@@ -42,6 +43,7 @@ export const navigationItems: Record<string, NavigationItem[]> = {{ title: m.networks_title(), url: '/networks', icon: NetworksIcon, shortcut: ['mod', '7'] },{ title: m.volumes_title(), url: '/volumes', icon: VolumesIcon, shortcut: ['mod', '8'] }],+ deploymentItems: [{ title: m.builds(), url: '/images/builds', icon: HammerIcon, shortcut: ['mod', 'b'] }],securityItems: [{ title: m.vuln_title(), url: '/security', icon: ShieldAlertIcon, shortcut: ['mod', 's'] }],settingsItems: [{@@ -65,8 +67,9 @@ export const navigationItems: Record<string, NavigationItem[]> = {shortcut: ['mod', 'shift', '3']},{ title: m.security_title(), url: '/settings/security', icon: SecurityIcon, shortcut: ['mod', 'shift', '4'] },- { title: m.timeouts_settings(), url: '/settings/timeouts', icon: JobsIcon, shortcut: ['mod', 'shift', '5'] },- { title: m.users_title(), url: '/settings/users', icon: UsersIcon, shortcut: ['mod', 'shift', '6'] }+ { title: m.builds(), url: '/settings/builds', icon: HammerIcon, shortcut: ['mod', 'shift', '5'] },+ { title: m.timeouts_settings(), url: '/settings/timeouts', icon: JobsIcon, shortcut: ['mod', 'shift', '6'] },+ { title: m.users_title(), url: '/settings/users', icon: UsersIcon, shortcut: ['mod', 'shift', '7'] }]}]@@ -97,6 +100,10 @@ export function getAvailableMobileNavItems(): NavigationItem[] {flatItems.push(...navigationItems.resourceItems);}+ if (navigationItems.deploymentItems) {+ flatItems.push(...navigationItems.deploymentItems);+ }+if (navigationItems.securityItems) {flatItems.push(...navigationItems.securityItems);}@@ -122,9 +129,9 @@ export const defaultMobileNavigationSettings: MobileNavigationSettings = {scrollToHide: true};-export function getManagementItems(environmentId: string): NavigationItem[] {+export function getBuildAndDeploymentItems(environmentId: string): NavigationItem[] {return [- ...navigationItems.managementItems,+ ...navigationItems.deploymentItems,{title: m.git_syncs_title(),url: `/environments/${environmentId}/gitops`,diff --git a/frontend/src/lib/icons/index.ts b/frontend/src/lib/icons/index.tsindex 30f7ec4a0..9447fa8fc 100644--- a/frontend/src/lib/icons/index.ts+++ b/frontend/src/lib/icons/index.ts@@ -114,3 +114,4 @@ export { default as ShieldAlertIcon } from 'virtual:icons/solar/shield-warning-lexport { default as ShieldXIcon } from 'virtual:icons/solar/shield-cross-linear';export { default as ScanIcon } from 'virtual:icons/solar/magnifer-linear';export { default as AlertTriangleIcon } from 'virtual:icons/solar/danger-triangle-linear';+export { default as HammerIcon } from 'virtual:icons/gravity-ui/hammer';diff --git a/frontend/src/lib/query/query-keys.ts b/frontend/src/lib/query/query-keys.tsindex faea51192..5e3fd1194 100644--- a/frontend/src/lib/query/query-keys.ts+++ b/frontend/src/lib/query/query-keys.ts@@ -93,7 +93,12 @@ export const queryKeys = {['images', environmentId, stableSerialize(options)] as const,usageCounts: (environmentId: string) => ['images', 'usage-counts', environmentId] as const,detail: (environmentId: string, imageId: string) => ['image', environmentId, imageId] as const,- updateCheck: (environmentId: string, imageId: string) => ['image-update', environmentId, imageId] as const+ updateCheck: (environmentId: string, imageId: string) => ['image-update', environmentId, imageId] as const,+ builds: (environmentId: string) => ['images', environmentId, 'builds'] as const,+ buildsList: (environmentId: string, options: SearchPaginationSortRequest) =>+ ['images', environmentId, 'builds', stableSerialize(options)] as const,+ buildRecord: (environmentId: string, buildId: string) => ['images', environmentId, 'builds', buildId] as const,+ buildRun: (environmentId: string) => ['images', environmentId, 'build-run'] as const},projects: {all: ['projects'] as const,@@ -130,5 +135,12 @@ export const queryKeys = {['vulnerabilities', 'all', environmentId, stableSerialize(request)] as const,imageRows: (imageId: string, request: SearchPaginationSortRequest) =>['vulnerabilities', 'image', imageId, stableSerialize(request)] as const+ },+ buildWorkspace: {+ all: ['build-workspace'] as const,+ listPrefix: (environmentId: string) => ['build-workspace', environmentId, 'list'] as const,+ list: (environmentId: string, path: string) => ['build-workspace', environmentId, 'list', path] as const,+ contentPrefix: (environmentId: string) => ['build-workspace', environmentId, 'content'] as const,+ content: (environmentId: string, path: string) => ['build-workspace', environmentId, 'content', path] as const}} as const;diff --git a/frontend/src/lib/services/build-workspace-service.ts b/frontend/src/lib/services/build-workspace-service.tsnew file mode 100644index 000000000..a071d927f--- /dev/null+++ b/frontend/src/lib/services/build-workspace-service.ts@@ -0,0 +1,72 @@+import BaseAPIService from './api-service';+import { environmentStore } from '$lib/stores/environment.store.svelte';+import type { FileEntry, FileContentResponse } from '$lib/types/file-browser.type';++export class BuildWorkspaceService extends BaseAPIService {+ async listDirectory(path: string = '/'): Promise<FileEntry[]> {+ const envId = await environmentStore.getCurrentEnvironmentId();+ const res = await this.api.get(`/environments/${envId}/builds/browse`, {+ params: { path }+ });+ return res.data.data;+ }++ async getFileContent(path: string): Promise<FileContentResponse> {+ const envId = await environmentStore.getCurrentEnvironmentId();+ const res = await this.api.get(`/environments/${envId}/builds/browse/content`, {+ params: { path }+ });+ return res.data.data;+ }++ async downloadFile(path: string): Promise<void> {+ const envId = await environmentStore.getCurrentEnvironmentId();+ const res = await this.api.get(`/environments/${envId}/builds/browse/download`, {+ params: { path },+ responseType: 'blob'+ });++ const url = window.URL.createObjectURL(new Blob([res.data]));+ const link = document.createElement('a');+ link.href = url;+ const fileName = path.split('/').pop() || 'download';+ link.setAttribute('download', fileName);+ document.body.appendChild(link);+ link.click();+ link.remove();+ }++ async uploadFile(path: string, file: File): Promise<void> {+ const envId = await environmentStore.getCurrentEnvironmentId();+ const formData = new FormData();+ formData.append('file', file);+ return this.handleResponse(+ this.api.post(`/environments/${envId}/builds/browse/upload`, formData, {+ params: { path },+ headers: {+ 'Content-Type': 'multipart/form-data'+ }+ })+ );+ }++ async createDirectory(path: string): Promise<void> {+ const envId = await environmentStore.getCurrentEnvironmentId();+ return this.handleResponse(+ this.api.post(`/environments/${envId}/builds/browse/mkdir`, null, {+ params: { path }+ })+ );+ }++ async deleteFile(path: string): Promise<void> {+ const envId = await environmentStore.getCurrentEnvironmentId();+ return this.handleResponse(+ this.api.delete(`/environments/${envId}/builds/browse`, {+ params: { path }+ })+ );+ }+}++export const buildWorkspaceService = new BuildWorkspaceService();diff --git a/frontend/src/lib/services/image-service.ts b/frontend/src/lib/services/image-service.tsindex 350710abb..e1b67a233 100644--- a/frontend/src/lib/services/image-service.ts+++ b/frontend/src/lib/services/image-service.ts@@ -1,6 +1,6 @@import BaseAPIService from './api-service';import { environmentStore } from '$lib/stores/environment.store.svelte';-import type { ImageSummaryDto, ImageUsageCounts, ImageUpdateInfoDto } from '$lib/types/image.type';+import type { ImageSummaryDto, ImageUsageCounts, ImageUpdateInfoDto, ImageBuildRecord } from '$lib/types/image.type';import type { SearchPaginationSortRequest, Paginated } from '$lib/types/pagination.type';import type { AutoUpdateCheck, AutoUpdateResult } from '$lib/types/auto-update.type';import { transformPaginationParams } from '$lib/utils/params.util';@@ -86,6 +86,18 @@ export class ImageService extends BaseAPIService {}));}++ async getImageBuilds(options?: SearchPaginationSortRequest): Promise<Paginated<ImageBuildRecord>> {+ const envId = await environmentStore.getCurrentEnvironmentId();+ const params = transformPaginationParams(options);+ const res = await this.api.get(`/environments/${envId}/images/builds`, { params });+ return res.data;+ }++ async getImageBuild(buildId: string): Promise<ImageBuildRecord> {+ const envId = await environmentStore.getCurrentEnvironmentId();+ return this.handleResponse(this.api.get(`/environments/${envId}/images/builds/${buildId}`));+ }}export const imageService = new ImageService();diff --git a/frontend/src/lib/services/project-service.ts b/frontend/src/lib/services/project-service.tsindex 8cb08eb54..40eb16806 100644--- a/frontend/src/lib/services/project-service.ts+++ b/frontend/src/lib/services/project-service.ts@@ -172,6 +172,62 @@ export class ProjectService extends BaseAPIService {}}+ buildProjectImages(+ projectId: string,+ options?: { services?: string[]; provider?: 'local' | 'depot'; push?: boolean; load?: boolean }+ ): Promise<void>;+ buildProjectImages(+ projectId: string,+ options: { services?: string[]; provider?: 'local' | 'depot'; push?: boolean; load?: boolean } | undefined,+ onLine: (data: any) => void+ ): Promise<void>;+ async buildProjectImages(+ projectId: string,+ options?: { services?: string[]; provider?: 'local' | 'depot'; push?: boolean; load?: boolean },+ onLine?: (data: any) => void+ ): Promise<void> {+ const envId = await environmentStore.getCurrentEnvironmentId();+ const url = `/api/environments/${envId}/projects/${projectId}/build`;++ const res = await fetch(url, {+ method: 'POST',+ headers: {+ 'Content-Type': 'application/json'+ },+ body: JSON.stringify(options || {})+ });+ if (!res.ok || !res.body) {+ throw new Error(`Failed to start project build (${res.status})`);+ }++ const reader = res.body.getReader();+ const decoder = new TextDecoder();+ let buffer = '';++ while (true) {+ const { value, done } = await reader.read();+ if (done) break;++ buffer += decoder.decode(value, { stream: true });+ const lines = buffer.split('\n');+ buffer = lines.pop() || '';++ for (const line of lines) {+ const trimmed = line.trim();+ if (!trimmed) continue;+ try {+ const obj = JSON.parse(trimmed);+ onLine?.(obj);+ if (obj?.error) {+ throw new Error(typeof obj.error === 'string' ? obj.error : obj.error?.message || m.build_failed());+ }+ } catch (err) {+ if (err instanceof Error) throw err;+ }+ }+ }+ }+pullProjectImages(projectId: string): Promise<void>;pullProjectImages(projectId: string, onLine: (data: any) => void): Promise<void>;async pullProjectImages(projectId: string, onLine?: (data: any) => void): Promise<void> {diff --git a/frontend/src/lib/types/image.type.ts b/frontend/src/lib/types/image.type.tsindex 7a0503280..38b5b5556 100644--- a/frontend/src/lib/types/image.type.ts+++ b/frontend/src/lib/types/image.type.ts@@ -84,3 +84,41 @@ export interface ImageDetailSummaryDto {}export type ImageUpdateData = ImageUpdateInfoDto;++export type ImageBuildStatus = 'running' | 'success' | 'failed';++export interface ImageBuildRecord {+ id: string;+ environmentId: string;+ userId?: string;+ username?: string;+ status: ImageBuildStatus;+ provider?: string;+ contextDir: string;+ dockerfile?: string;+ target?: string;+ tags?: string[];+ platforms?: string[];+ buildArgs?: Record<string, string>;+ labels?: Record<string, string>;+ cacheFrom?: string[];+ cacheTo?: string[];+ noCache: boolean;+ pull: boolean;+ network?: string;+ isolation?: string;+ shmSize?: number;+ ulimits?: Record<string, string>;+ entitlements?: string[];+ privileged: boolean;+ extraHosts?: string[];+ push: boolean;+ load: boolean;+ digest?: string;+ errorMessage?: string;+ output?: string;+ outputTruncated: boolean;+ completedAt?: string;+ durationMs?: number;+ createdAt: string;+}diff --git a/frontend/src/lib/types/project.type.ts b/frontend/src/lib/types/project.type.tsindex 4973ad076..03ad24512 100644--- a/frontend/src/lib/types/project.type.ts+++ b/frontend/src/lib/types/project.type.ts@@ -28,6 +28,7 @@ export interface ServiceVolume {export interface ProjectService {name?: string;image?: string;+ build?: string | Record<string, any>;container_name?: string;command?: string[] | string | null;entrypoint?: string[] | string | null;@@ -78,6 +79,7 @@ export interface Project {gitOpsManagedBy?: string;lastSyncCommit?: string;gitRepositoryURL?: string;+ hasBuildDirective?: boolean;services?: ProjectService[];runtimeServices?: RuntimeService[];composeContent?: string;diff --git a/frontend/src/lib/types/settings.type.ts b/frontend/src/lib/types/settings.type.tsindex 3b7a9c85d..d378056b9 100644--- a/frontend/src/lib/types/settings.type.ts+++ b/frontend/src/lib/types/settings.type.ts@@ -67,6 +67,12 @@ export type Settings = {httpClientTimeout: number;registryTimeout: number;proxyRequestTimeout: number;+ buildProvider: 'local' | 'depot';+ buildsDirectory: string;+ buildTimeout: number;+ depotProjectId: string;+ depotToken?: string;+ depotConfigured?: boolean;registryCredentials: RegistryCredential[];templateRegistries: TemplateRegistryConfig[];diff --git a/frontend/src/lib/utils/log-text.ts b/frontend/src/lib/utils/log-text.tsnew file mode 100644index 000000000..b1dd3e037--- /dev/null+++ b/frontend/src/lib/utils/log-text.ts@@ -0,0 +1,11 @@+const ANSI_ESCAPE_SEQUENCE = /\x1B\[[0-?]*[ -/]*[@-~]/g;+const ANSI_OSC_SEQUENCE = /\x1B\][^\x07]*(?:\x07|\x1B\\)/g;+const LOOSE_ANSI_MARKER_SEQUENCE = /\[(?:\d{1,3}(?:;\d{1,3})*)m/g;++export function stripAnsi(input: string): string {+ return input.replace(ANSI_ESCAPE_SEQUENCE, '').replace(ANSI_OSC_SEQUENCE, '').replace(LOOSE_ANSI_MARKER_SEQUENCE, '');+}++export function sanitizeLogText(input: string): string {+ return stripAnsi(input.replace(/\r/g, '')).trimEnd();+}diff --git a/frontend/src/routes/(app)/+layout.svelte b/frontend/src/routes/(app)/+layout.svelteindex 4b47f1612..d478e63f7 100644--- a/frontend/src/routes/(app)/+layout.svelte+++ b/frontend/src/routes/(app)/+layout.svelte@@ -10,7 +10,7 @@import { getEffectiveNavigationSettings, navigationSettingsOverridesStore } from '$lib/utils/navigation.utils';import { browser } from '$app/environment';import { environmentStore } from '$lib/stores/environment.store.svelte';- import { navigationItems, getManagementItems, type NavigationItem } from '$lib/config/navigation-config';+ import { navigationItems, getBuildAndDeploymentItems, type NavigationItem } from '$lib/config/navigation-config';import { isEditableTarget, matchesShortcutEvent } from '$lib/utils/keyboard-shortcut.utils';import { cn } from '$lib/utils';import type { Snippet } from 'svelte';@@ -39,10 +39,16 @@const navigationMode = $derived(navigationSettings.mode);const isAdmin = $derived(!!user?.roles?.includes('admin'));const currentEnvId = $derived(environmentStore.selected?.id || '0');- const managementItems = $derived(getManagementItems(currentEnvId));+ const managementItems = $derived(navigationItems.managementItems);+ const buildDeploymentItems = $derived(getBuildAndDeploymentItems(currentEnvId));const settingsShortcutItems = $derived.by(() => (isAdmin ? (navigationItems.settingsItems ?? []) : []));const shortcutItems = $derived.by(() => {- const items: NavigationItem[] = [...managementItems, ...navigationItems.resourceItems, ...settingsShortcutItems];+ const items: NavigationItem[] = [+ ...managementItems,+ ...navigationItems.resourceItems,+ ...buildDeploymentItems,+ ...settingsShortcutItems+ ];return flattenNavigationItems(items).filter((item) => item.shortcut?.length);});diff --git a/frontend/src/routes/(app)/images/+page.svelte b/frontend/src/routes/(app)/images/+page.svelteindex 36681fa6d..7ffd8dfc0 100644--- a/frontend/src/routes/(app)/images/+page.svelte+++ b/frontend/src/routes/(app)/images/+page.svelte@@ -14,8 +14,8 @@import type { ImageUsageCounts } from '$lib/types/image.type';import { untrack } from 'svelte';import { ResourcePageLayout, type ActionButton, type StatCardConfig } from '$lib/layouts/index.js';+ import { CloseIcon, VolumesIcon, LocalFolderComputerIcon, CodeIcon } from '$lib/icons';import { createMutation, createQuery } from '@tanstack/svelte-query';- import { CloseIcon, VolumesIcon, LocalFolderComputerIcon } from '$lib/icons';let { data } = $props();diff --git a/frontend/src/routes/(app)/images/builds/+page.svelte b/frontend/src/routes/(app)/images/builds/+page.sveltenew file mode 100644index 000000000..4e9c3491f--- /dev/null+++ b/frontend/src/routes/(app)/images/builds/+page.svelte@@ -0,0 +1,1426 @@+<script lang="ts">+ import { onMount } from 'svelte';+ import { z } from 'zod/v4';+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';+ import * as Tabs from '$lib/components/ui/tabs/index.js';+ import * as DropdownMenu from '$lib/components/ui/dropdown-menu/index.js';+ import { m } from '$lib/paraglide/messages';+ import settingsStore from '$lib/stores/config-store';+ import { createForm } from '$lib/utils/form.utils';+ import { toast } from 'svelte-sonner';+ import { environmentStore } from '$lib/stores/environment.store.svelte';+ import { ResourceDetailLayout } from '$lib/layouts/index.js';+ import TabbedPageLayout from '$lib/layouts/tabbed-page-layout.svelte';+ import { sanitizeLogText } from '$lib/utils/log-text';+ import {+ CodeIcon,+ TerminalIcon,+ ArrowDownIcon,+ ClockIcon,+ TagIcon,+ SettingsIcon,+ InfoIcon,+ EllipsisIcon,+ RedeployIcon+ } from '$lib/icons';+ import * as Card from '$lib/components/ui/card';+ import { Spinner } from '$lib/components/ui/spinner/index.js';+ import ArcaneTable from '$lib/components/arcane-table/arcane-table.svelte';+ import type { ColumnSpec, MobileFieldVisibility } from '$lib/components/arcane-table';+ import { UniversalMobileCard } from '$lib/components/arcane-table';+ import StatusBadge from '$lib/components/badges/status-badge.svelte';+ import { ResponsiveDialog } from '$lib/components/ui/responsive-dialog/index.js';+ import {+ type LayerProgress,+ calculateOverallProgress,+ areAllLayersComplete,+ updateLayerFromStreamData,+ extractErrorMessage,+ getLayerStats,+ isIndeterminatePhase,+ getAggregateStatus+ } from '$lib/utils/pull-progress';+ import ResizableSplit from '$lib/components/resizable-split.svelte';+ import BuildControls from './components/build-controls.svelte';+ import BuildWorkspacePanel from './components/build-workspace-panel.svelte';+ import BuildConfigPanel from './components/build-config-panel.svelte';+ import BuildOutputPanel from './components/build-output-panel.svelte';+ import type { BuildProviderOption } from './components/build-form.types';+ import { imageService } from '$lib/services/image-service';+ import type { ImageBuildRecord, ImageBuildStatus } from '$lib/types/image.type';+ import type { Paginated, SearchPaginationSortRequest } from '$lib/types/pagination.type';+ import { queryKeys } from '$lib/query/query-keys';+ import { createMutation, createQuery, useQueryClient } from '@tanstack/svelte-query';+ import { format } from 'date-fns';++ const buildsRoot = $derived((($settingsStore?.buildsDirectory ?? '/builds') as string).trim() || '/builds');+ const buildsRootLabel = $derived.by(() => {+ const raw = buildsRoot.trim();+ if (!raw) return '/builds';+ if (raw.length <= 36) return raw;+ const parts = raw.split('/').filter(Boolean);+ if (parts.length === 0) return raw;+ const tail = parts.slice(-2).join('/');+ return `…/${tail}`;+ });++ const depotAvailable = $derived.by(() => {+ const projectId = ($settingsStore?.depotProjectId ?? '').trim();+ const token = ($settingsStore?.depotToken ?? '').trim();+ return Boolean($settingsStore?.depotConfigured) || (Boolean(projectId) && Boolean(token));+ });++ const providerOptions = $derived.by<BuildProviderOption[]>(() => {+ const options: BuildProviderOption[] = [+ { label: m.local_docker(), value: 'local', description: m.local_docker_description() }+ ];+ if (depotAvailable) {+ options.push({ label: m.depot(), value: 'depot', description: m.depot_description() });+ }+ return options;+ });++ let selectedContextPath = $state('/');++ const contextDir = $derived.by(() => {+ const root = buildsRoot.endsWith('/') ? buildsRoot.slice(0, -1) : buildsRoot;+ if (selectedContextPath === '/' || selectedContextPath === '') return root;+ return `${root}${selectedContextPath.startsWith('/') ? '' : '/'}${selectedContextPath}`;+ });++ const formSchema = z.object({+ dockerfile: z.string().optional().default(''),+ tags: z.string().min(1, m.image_tags_required()),+ target: z.string().optional().default(''),+ buildArgs: z.string().optional().default(''),+ labels: z.string().optional().default(''),+ cacheFrom: z.string().optional().default(''),+ cacheTo: z.string().optional().default(''),+ network: z.string().optional().default(''),+ isolation: z.string().optional().default(''),+ shmSize: z.string().optional().default(''),+ ulimits: z.string().optional().default(''),+ entitlements: z.string().optional().default(''),+ privileged: z.boolean().default(false),+ extraHosts: z.string().optional().default(''),+ platforms: z.string().optional().default(''),+ noCache: z.boolean().default(false),+ pull: z.boolean().default(false),+ provider: z.enum(['local', 'depot']).default('local'),+ push: z.boolean().default(false),+ load: z.boolean().default(true)+ });++ const { inputs, ...form } = createForm<typeof formSchema>(formSchema, {+ dockerfile: '',+ tags: '',+ target: '',+ buildArgs: '',+ labels: '',+ cacheFrom: '',+ cacheTo: '',+ network: '',+ isolation: '',+ shmSize: '',+ ulimits: '',+ entitlements: '',+ privileged: false,+ extraHosts: '',+ platforms: '',+ noCache: false,+ pull: false,+ provider: ($settingsStore?.buildProvider as 'local' | 'depot') ?? 'local',+ push: false,+ load: true+ });++ let isBuilding = $state(false);+ let isDesktop = $state(true);+ let buildProgress = $state(0);+ let buildStatusText = $state('');+ let buildError = $state('');+ let layerProgress = $state<Record<string, LayerProgress>>({});+ let hasReachedComplete = $state(false);+ let logLines = $state<string[]>([]);+ let autoScroll = $state(true);+ let mainTab = $state<'build' | 'history'>('build');+ let buildTab = $state('workspace');+ let rightPanelTab = $state<'config' | 'output'>('config');+ let showAdvanced = $state(false);+ let buildHistoryItems = $state<Paginated<ImageBuildRecord>>({+ data: [],+ pagination: { totalPages: 1, totalItems: 0, currentPage: 1, itemsPerPage: 20 }+ });+ let buildHistoryRequestOptions = $state<SearchPaginationSortRequest>({+ pagination: { page: 1, limit: 20 },+ sort: { column: 'createdAt', direction: 'desc' }+ });+ let buildHistorySelectedIds = $state<string[]>([]);+ let buildHistoryMobileFieldVisibility = $state<Record<string, boolean>>({});+ let buildHistorySelected = $state<ImageBuildRecord | null>(null);+ let buildHistorySelectedId = $state<string | null>(null);+ let buildHistoryDetailsOpen = $state(false);++ const selectedEnvId = $derived(environmentStore.selected?.id || '0');+ const queryClient = useQueryClient();++ const buildHistoryQuery = createQuery(() => ({+ queryKey: queryKeys.images.buildsList(selectedEnvId, buildHistoryRequestOptions),+ queryFn: () => imageService.getImageBuilds(buildHistoryRequestOptions),+ onSuccess: (data: Paginated<ImageBuildRecord>) => {+ buildHistoryItems = data;+ },+ onError: (err: unknown) => {+ const anyErr = err as any;+ const message = anyErr?.message ? String(anyErr.message) : m.common_error();+ if (message && message !== buildHistoryQueryLastError) {+ buildHistoryQueryLastError = message;+ toast.error(message);+ }+ }+ }));++ let buildHistoryQueryLastError = $state<string | null>(null);++ const buildHistoryDetailQuery = createQuery(() => ({+ queryKey: buildHistorySelectedId+ ? queryKeys.images.buildRecord(selectedEnvId, buildHistorySelectedId)+ : (['images', selectedEnvId, 'builds', 'none'] as const),+ queryFn: () => imageService.getImageBuild(buildHistorySelectedId!),+ enabled: !!buildHistorySelectedId && buildHistoryDetailsOpen,+ onSuccess: (data: ImageBuildRecord) => {+ buildHistorySelected = data;+ },+ onError: (err: unknown) => {+ const anyErr = err as any;+ const message = anyErr?.message ? String(anyErr.message) : m.common_error();+ if (message && message !== buildHistoryDetailLastError) {+ buildHistoryDetailLastError = message;+ toast.error(message);+ }+ }+ }));++ let buildHistoryDetailLastError = $state<string | null>(null);+ const buildHistoryDetailsLoading = $derived(buildHistoryDetailQuery.isPending || buildHistoryDetailQuery.isFetching);++ type ImageBuildRequest = {+ envId: string;+ contextDir: string;+ dockerfile?: string;+ tags: string[];+ target?: string;+ buildArgs?: Record<string, string>;+ labels?: Record<string, string>;+ cacheFrom?: string[];+ cacheTo?: string[];+ noCache?: boolean;+ pull?: boolean;+ network?: string;+ isolation?: string;+ shmSize?: number;+ ulimits?: Record<string, string>;+ entitlements?: string[];+ privileged?: boolean;+ extraHosts?: string[];+ platforms?: string[];+ provider: 'local' | 'depot';+ push: boolean;+ load: boolean;+ };++ const buildMutation = createMutation(() => ({+ mutationKey: queryKeys.images.buildRun(selectedEnvId),+ mutationFn: async (request: ImageBuildRequest) => {+ const { envId, ...payload } = request;+ const response = await fetch(`/api/environments/${envId}/images/build`, {+ method: 'POST',+ headers: {+ 'Content-Type': 'application/json'+ },+ body: JSON.stringify(payload)+ });++ if (!response.ok || !response.body) {+ const errorData = await response.json().catch(() => ({+ data: { message: m.build_request_failed() }+ }));+ const errorMessage =+ errorData.data?.message ||+ errorData.error ||+ errorData.message ||+ m.build_request_failed_http({ status: response.status });+ throw new Error(String(errorMessage));+ }++ const reader = response.body.getReader();+ const decoder = new TextDecoder();+ let buffer = '';++ while (true) {+ const { done, value } = await reader.read();+ if (done) {+ buildStatusText = m.finalizing_build();+ appendLog(m.finalizing_build());+ break;+ }++ buffer += decoder.decode(value, { stream: true });+ const lines = buffer.split('\n');+ buffer = lines.pop() || '';++ for (const line of lines) {+ if (line.trim() === '') continue;+ try {+ const event = JSON.parse(line);+ const errorMsg = extractErrorMessage(event, m.build_failed());+ if (errorMsg) {+ const cleanErrorMsg = sanitizeLogText(errorMsg);+ buildError = cleanErrorMsg;+ buildStatusText = cleanErrorMsg.toLowerCase().startsWith(m.build_failed().toLowerCase())+ ? cleanErrorMsg+ : m.build_failed_with_error({ error: cleanErrorMsg });+ appendLog(m.build_error_log({ error: cleanErrorMsg }));+ continue;+ }++ if (event.status) {+ const idSuffix = event.id ? ` ${event.id}` : '';+ appendLog(`${sanitizeLogText(String(event.status))}${idSuffix}`);+ buildStatusText = sanitizeLogText(String(event.status));+ }++ layerProgress = updateLayerFromStreamData(layerProgress, event);+ updateProgress();+ } catch {+ appendLog(line);+ }+ }+ }++ updateProgress();+ if (!buildError && buildProgress < 100 && areAllLayersComplete(layerProgress)) {+ buildProgress = 100;+ }++ if (buildError) {+ throw new Error(buildError);+ }++ hasReachedComplete = true;+ buildProgress = 100;+ buildStatusText = m.build_completed();+ appendLog(m.build_completed());+ },+ onSettled: async (_data, _error, variables) => {+ await queryClient.invalidateQueries({ queryKey: queryKeys.images.builds(variables.envId) });+ }+ }));++ const layerStats = $derived(getLayerStats(layerProgress, hasReachedComplete));+ const aggregateStatus = $derived.by(() => {+ const status = getAggregateStatus(layerProgress, buildStatusText, hasReachedComplete);+ if (!isBuilding) return status;+ if (!status) return m.progress_building();+ const normalized = status.toLowerCase();+ if (normalized === 'pulling' || normalized === 'preparing') return m.progress_building();+ return status;+ });+ const isIndeterminate = $derived(isIndeterminatePhase(layerProgress, buildProgress));+ const progressValue = $derived(Math.round(hasReachedComplete ? 100 : buildProgress));+ const selectedProviderLabel = $derived.by(+ () => providerOptions.find((option) => option.value === $inputs.provider.value)?.label ?? m.local_docker()+ );+ const statusLabel = $derived.by(() => {+ if (buildError) return m.common_error();+ if (hasReachedComplete) return m.build_completed();+ if (isBuilding) return m.common_live();+ return m.idle();+ });+ const buildMobileTabItems = $derived([+ { value: 'workspace', label: m.build_workspace_files() },+ { value: 'configuration', label: m.build_configuration() },+ { value: 'output', label: m.build_output() }+ ]);++ const mainTabItems = $derived([+ { value: 'build', label: m.manual_build_workspace() },+ { value: 'history', label: m.builds() }+ ]);++ type BuildOutputEntry = {+ raw: string;+ isJson: boolean;+ type?: string;+ status?: string;+ id?: string;+ phase?: string;+ error?: string;+ progress?: {+ current?: number;+ total?: number;+ };+ };++ const buildHistoryOutputEntries = $derived.by(() => parseBuildOutput(buildHistorySelected?.output ?? ''));++ function getBuildTitle(build: ImageBuildRecord) {+ return build.tags?.[0] || build.contextDir.split('/').pop() || build.contextDir;+ }++ const buildHistoryColumns = [+ {+ accessorKey: 'status',+ title: m.common_status(),+ sortable: true,+ cell: BuildHistoryStatusCell+ },+ {+ id: 'tags',+ title: m.common_tags(),+ cell: BuildHistoryTagsCell+ },+ {+ accessorKey: 'provider',+ title: m.build_provider(),+ sortable: true,+ cell: BuildHistoryProviderCell+ },+ {+ accessorKey: 'createdAt',+ title: m.common_created(),+ sortable: true,+ cell: BuildHistoryTimeCell+ },+ {+ accessorKey: 'durationMs',+ title: m.build_duration_label(),+ cell: BuildHistoryDurationCell+ }+ ] satisfies ColumnSpec<ImageBuildRecord>[];++ const buildHistoryMobileFields = [+ { id: 'status', label: m.common_status(), defaultVisible: true },+ { id: 'tags', label: m.common_tags(), defaultVisible: true },+ { id: 'context', label: m.build_context(), defaultVisible: true },+ { id: 'provider', label: m.build_provider(), defaultVisible: true },+ { id: 'createdAt', label: m.common_created(), defaultVisible: true },+ { id: 'durationMs', label: m.build_duration_label(), defaultVisible: false }+ ];++ onMount(() => {+ const mq = window.matchMedia('(min-width: 1024px)');+ const update = () => {+ isDesktop = mq.matches;+ };++ update();++ if ('addEventListener' in mq) {+ mq.addEventListener('change', update);+ return () => mq.removeEventListener('change', update);+ }++ // @ts-expect-error legacy MediaQueryList API+ mq.addListener(update);+ return () => {+ // @ts-expect-error legacy MediaQueryList API+ mq.removeListener(update);+ };+ });++ $effect(() => {+ if (!depotAvailable && $inputs.provider.value === 'depot') {+ $inputs.provider.value = 'local';+ }+ });++ function resetState() {+ isBuilding = false;+ buildProgress = 0;+ buildStatusText = '';+ buildError = '';+ layerProgress = {};+ hasReachedComplete = false;+ logLines = [];+ }++ function appendLog(line: string) {+ const sanitized = sanitizeLogText(line);+ // Some tools output standalone reset codes (which become empty after sanitizing).+ if (sanitized.trim() === '') return;+ logLines = [...logLines, sanitized];+ }++ function updateProgress() {+ buildProgress = calculateOverallProgress(layerProgress);+ }++ function parseTags(raw: string): string[] {+ return raw+ .split(/[\n,]/)+ .map((t) => t.trim())+ .filter(Boolean);+ }++ function parsePlatforms(raw: string): string[] {+ return raw+ .split(/[\n,]/)+ .map((t) => t.trim())+ .filter(Boolean);+ }++ function parseBuildArgs(raw: string): Record<string, string> {+ const result: Record<string, string> = {};+ for (const line of raw.split('\n')) {+ const trimmed = line.trim();+ if (!trimmed) continue;+ const idx = trimmed.indexOf('=');+ if (idx === -1) continue;+ const key = trimmed.slice(0, idx).trim();+ const value = trimmed.slice(idx + 1).trim();+ if (!key) continue;+ result[key] = value;+ }+ return result;+ }++ function parseList(raw: string): string[] {+ return raw+ .split(/[\n,]/)+ .map((value) => value.trim())+ .filter(Boolean);+ }++ function parseOptionalBytes(raw: string): number | undefined {+ const trimmed = raw.trim();+ if (!trimmed) return undefined;+ const parsed = Number.parseInt(trimmed, 10);+ if (!Number.isFinite(parsed) || parsed <= 0) return undefined;+ return parsed;+ }++ function validateProviderCompatibility(+ provider: 'local' | 'depot',+ values: {+ cacheTo: string[];+ entitlements: string[];+ privileged: boolean;+ platforms: string[];+ network?: string;+ isolation?: string;+ shmSize?: number;+ ulimits: Record<string, string>;+ extraHosts: string[];+ }+ ): string | null {+ if (provider === 'local') {+ const unsupported: string[] = [];+ if (values.cacheTo.length > 0) unsupported.push('cacheTo');+ if (values.entitlements.length > 0) unsupported.push('entitlements');+ if (values.privileged) unsupported.push('privileged');+ if (values.platforms.length > 1) unsupported.push('platforms');+ if (unsupported.length > 0) {+ return m.build_provider_unsupported_local({ fields: unsupported.sort().join(', ') });+ }+ return null;+ }++ const unsupported: string[] = [];+ if (values.network) unsupported.push('network');+ if (values.isolation) unsupported.push('isolation');+ if (values.shmSize) unsupported.push('shmSize');+ if (Object.keys(values.ulimits).length > 0) unsupported.push('ulimits');+ if (values.extraHosts.length > 0) unsupported.push('extraHosts');+ if (unsupported.length > 0) {+ return m.build_provider_unsupported_depot({ fields: unsupported.sort().join(', ') });+ }+ return null;+ }++ function formatKeyValueMap(values?: Record<string, string>) {+ if (!values || Object.keys(values).length === 0) return '';+ return Object.entries(values)+ .map(([key, value]) => `${key}=${value}`)+ .join('\n');+ }++ function formatStringList(values?: string[]) {+ if (!values || values.length === 0) return '';+ return values.join('\n');+ }++ function formatTimestamp(value?: string) {+ if (!value) return '-';+ try {+ return format(new Date(value), 'PP p');+ } catch {+ return value;+ }+ }++ function formatDuration(ms?: number) {+ if (!ms || ms <= 0) return '-';+ const totalSeconds = Math.round(ms / 1000);+ const minutes = Math.floor(totalSeconds / 60);+ const seconds = totalSeconds % 60;+ if (minutes > 0) return `${minutes}m ${seconds}s`;+ return `${seconds}s`;+ }++ function formatBytes(value: number) {+ if (!Number.isFinite(value) || value <= 0) return '0 B';+ const units = ['B', 'KB', 'MB', 'GB', 'TB'];+ let size = value;+ let unitIndex = 0;+ while (size >= 1024 && unitIndex < units.length - 1) {+ size /= 1024;+ unitIndex += 1;+ }+ const precision = size >= 10 || unitIndex === 0 ? 0 : 1;+ return `${size.toFixed(precision)} ${units[unitIndex]}`;+ }++ function getProgressPercent(current?: number, total?: number) {+ if (current === undefined || total === undefined || total <= 0) return 0;+ return Math.min(100, Math.max(0, Math.round((current / total) * 100)));+ }++ function formatProgress(current?: number, total?: number) {+ if (current === undefined || total === undefined || total <= 0) return '-';+ return `${formatBytes(current)} / ${formatBytes(total)}`;+ }++ function formatBuildArgs(buildArgs?: Record<string, string>) {+ return formatKeyValueMap(buildArgs);+ }++ function getContextPathFromBuild(build: ImageBuildRecord) {+ const root = buildsRoot.endsWith('/') ? buildsRoot.slice(0, -1) : buildsRoot;+ if (!build.contextDir || build.contextDir === root) return '/';+ if (build.contextDir.startsWith(`${root}/`)) {+ return build.contextDir.slice(root.length);+ }+ return '/';+ }++ function parseBuildOutput(output: string): BuildOutputEntry[] {+ if (!output) return [];+ return output+ .split('\n')+ .map((line) => line.trim())+ .filter(Boolean)+ .map((line) => {+ try {+ const data = JSON.parse(line) as Record<string, unknown>;+ if (!data || typeof data !== 'object') {+ return { raw: sanitizeLogText(line), isJson: false } satisfies BuildOutputEntry;+ }+ const progressDetail = data.progressDetail as Record<string, unknown> | undefined;+ const progress = progressDetail+ ? {+ current: typeof progressDetail.current === 'number' ? progressDetail.current : undefined,+ total: typeof progressDetail.total === 'number' ? progressDetail.total : undefined+ }+ : undefined;+ return {+ raw: sanitizeLogText(line),+ isJson: true,+ type: typeof data.type === 'string' ? data.type : undefined,+ status: data.status ? sanitizeLogText(String(data.status)) : undefined,+ id: data.id ? String(data.id) : undefined,+ phase: typeof data.phase === 'string' ? data.phase : undefined,+ error: data.error ? sanitizeLogText(String(data.error)) : undefined,+ progress+ } satisfies BuildOutputEntry;+ } catch {+ return { raw: sanitizeLogText(line), isJson: false } satisfies BuildOutputEntry;+ }+ });+ }++ function buildHistoryStatusLabel(status?: ImageBuildStatus) {+ switch (status) {+ case 'running':+ return m.common_running();+ case 'success':+ return m.common_success();+ case 'failed':+ return m.common_failed();+ default:+ return m.common_unknown();+ }+ }++ function getStatusBadgeVariant(status?: ImageBuildStatus) {+ switch (status) {+ case 'success':+ return 'green';+ case 'failed':+ return 'red';+ case 'running':+ return 'blue';+ default:+ return 'gray';+ }+ }++ async function loadBuildHistory(options: SearchPaginationSortRequest = buildHistoryRequestOptions) {+ buildHistoryRequestOptions = options;+ const result = await buildHistoryQuery.refetch();+ return result.data ?? buildHistoryItems;+ }++ function openBuildDetails(build: ImageBuildRecord) {+ buildHistorySelectedId = build.id;+ buildHistorySelected = build;+ buildHistoryDetailsOpen = true;+ }++ function applyBuildConfig(build: ImageBuildRecord) {+ form.setValue('tags', build.tags?.join(', ') ?? '');+ form.setValue('dockerfile', build.dockerfile ?? '');+ form.setValue('target', build.target ?? '');+ form.setValue('platforms', build.platforms?.join(', ') ?? '');+ form.setValue('buildArgs', formatBuildArgs(build.buildArgs));+ form.setValue('labels', formatKeyValueMap(build.labels));+ form.setValue('cacheFrom', formatStringList(build.cacheFrom));+ form.setValue('cacheTo', formatStringList(build.cacheTo));+ form.setValue('network', build.network ?? '');+ form.setValue('isolation', build.isolation ?? '');+ form.setValue('shmSize', build.shmSize ? String(build.shmSize) : '');+ form.setValue('ulimits', formatKeyValueMap(build.ulimits));+ form.setValue('entitlements', formatStringList(build.entitlements));+ form.setValue('privileged', build.privileged ?? false);+ form.setValue('extraHosts', formatStringList(build.extraHosts));+ form.setValue('noCache', build.noCache ?? false);+ form.setValue('pull', build.pull ?? false);+ form.setValue('provider', (build.provider as 'local' | 'depot') ?? 'local');+ form.setValue('push', build.push ?? false);+ form.setValue('load', build.load ?? true);++ showAdvanced = Boolean(+ build.dockerfile ||+ build.target ||+ (build.platforms && build.platforms.length > 0) ||+ (build.buildArgs && Object.keys(build.buildArgs).length > 0) ||+ (build.labels && Object.keys(build.labels).length > 0) ||+ (build.cacheFrom && build.cacheFrom.length > 0) ||+ (build.cacheTo && build.cacheTo.length > 0) ||+ build.network ||+ build.isolation ||+ (build.shmSize && build.shmSize > 0) ||+ (build.ulimits && Object.keys(build.ulimits).length > 0) ||+ (build.entitlements && build.entitlements.length > 0) ||+ build.privileged ||+ (build.extraHosts && build.extraHosts.length > 0) ||+ build.noCache ||+ build.pull+ );+ selectedContextPath = getContextPathFromBuild(build);+ mainTab = 'build';+ rightPanelTab = 'config';+ buildTab = 'configuration';+ buildHistoryDetailsOpen = false;+ }++ async function handleSubmit() {+ const data = form.validate();+ if (!data) return;++ if (!contextDir || contextDir.trim() === '') {+ toast.error(m.build_context_required());+ return;+ }++ resetState();+ // Prefer showing progress immediately once a build begins.+ rightPanelTab = 'output';+ buildTab = 'output';+ isBuilding = true;+ buildStatusText = m.starting_build();+ appendLog(m.using_context({ context: contextDir }));++ const tags = parseTags(data.tags);+ const parsedCacheTo = parseList(data.cacheTo || '');+ const parsedEntitlements = parseList(data.entitlements || '');+ const parsedPlatforms = parsePlatforms(data.platforms || '');+ const parsedExtraHosts = parseList(data.extraHosts || '');+ const parsedUlimits = parseBuildArgs(data.ulimits || '');+ const parsedShmSize = parseOptionalBytes(data.shmSize || '');++ const resolvedProvider = depotAvailable ? data.provider : 'local';+ const push = resolvedProvider === 'depot' ? true : data.push;+ const load = resolvedProvider === 'depot' ? false : data.load;+ const network = data.network?.trim() || undefined;+ const isolation = data.isolation?.trim() || undefined;++ const providerValidationError = validateProviderCompatibility(resolvedProvider, {+ cacheTo: parsedCacheTo,+ entitlements: parsedEntitlements,+ privileged: data.privileged,+ platforms: parsedPlatforms,+ network,+ isolation,+ shmSize: parsedShmSize,+ ulimits: parsedUlimits,+ extraHosts: parsedExtraHosts+ });+ if (providerValidationError) {+ toast.error(providerValidationError);+ isBuilding = false;+ return;+ }++ const payload = {+ contextDir: contextDir.trim(),+ dockerfile: data.dockerfile?.trim() || undefined,+ tags,+ target: data.target?.trim() || undefined,+ buildArgs: parseBuildArgs(data.buildArgs || ''),+ labels: parseBuildArgs(data.labels || ''),+ cacheFrom: parseList(data.cacheFrom || ''),+ cacheTo: parsedCacheTo,+ noCache: data.noCache,+ pull: data.pull,+ network,+ isolation,+ shmSize: parsedShmSize,+ ulimits: parsedUlimits,+ entitlements: parsedEntitlements,+ privileged: data.privileged,+ extraHosts: parsedExtraHosts,+ platforms: parsedPlatforms,+ provider: resolvedProvider,+ push,+ load+ };++ try {+ const resolvedEnvId = await environmentStore.getCurrentEnvironmentId();+ await buildMutation.mutateAsync({ envId: resolvedEnvId, ...payload });+ toast.success(m.build_completed());+ } catch (error: any) {+ const message = sanitizeLogText(String(error?.message || m.build_failed()));+ buildError = message;+ buildStatusText = message.toLowerCase().startsWith(m.build_failed().toLowerCase())+ ? message+ : m.build_failed_with_error({ error: message });+ appendLog(m.build_error_log({ error: message }));+ toast.error(message);+ } finally {+ isBuilding = false;+ }+ }++ function onBuildTabChange(value: string) {+ buildTab = value;+ }++ function onMainTabChange(value: string) {+ mainTab = value as 'build' | 'history';+ }+</script>++{#snippet BuildHistoryStatusCell({ value }: { value: unknown })}+ <StatusBadge+ variant={getStatusBadgeVariant(value as ImageBuildStatus)}+ text={buildHistoryStatusLabel(value as ImageBuildStatus)}+ size="sm"+ />+{/snippet}++{#snippet BuildHistoryTagsCell({ item }: { item: ImageBuildRecord })}+ <div class="space-y-1">+ <div class="text-sm font-medium">{getBuildTitle(item)}</div>+ <div class="text-muted-foreground truncate text-xs">{item.contextDir}</div>+ </div>+{/snippet}++{#snippet BuildHistoryProviderCell({ value }: { value: unknown })}+ <span class="text-sm">{String(value ?? '-') || '-'}</span>+{/snippet}++{#snippet BuildHistoryTimeCell({ value }: { value: unknown })}+ <span class="text-sm">{formatTimestamp(String(value ?? ''))}</span>+{/snippet}++{#snippet BuildHistoryDurationCell({ value }: { value: unknown })}+ <span class="text-sm">{formatDuration(Number(value ?? 0))}</span>+{/snippet}++{#snippet BuildHistoryRowActions({ item }: { item: ImageBuildRecord })}+ <DropdownMenu.Root>+ <DropdownMenu.Trigger data-row-select-ignore>+ <ArcaneButton action="inspect" tone="ghost" size="icon" showLabel={false} icon={EllipsisIcon} />+ </DropdownMenu.Trigger>+ <DropdownMenu.Content align="end">+ <DropdownMenu.Item onclick={() => openBuildDetails(item)}>+ <InfoIcon class="size-4" />+ {m.common_view_details()}+ </DropdownMenu.Item>+ </DropdownMenu.Content>+ </DropdownMenu.Root>+{/snippet}++{#snippet BuildHistoryMobileCard({+ item,+ mobileFieldVisibility+}: {+ item: ImageBuildRecord;+ mobileFieldVisibility: MobileFieldVisibility;+})}+ <UniversalMobileCard+ {item}+ icon={(item: ImageBuildRecord) => ({+ component: TerminalIcon,+ variant:+ item.status === 'success' ? 'emerald' : item.status === 'failed' ? 'red' : item.status === 'running' ? 'blue' : 'gray'+ })}+ title={(item: ImageBuildRecord) => getBuildTitle(item)}+ subtitle={(item: ImageBuildRecord) => ((mobileFieldVisibility.context ?? true) ? item.contextDir : null)}+ badges={[+ (item: ImageBuildRecord) => ({+ variant: getStatusBadgeVariant(item.status),+ text: buildHistoryStatusLabel(item.status)+ })+ ]}+ fields={[+ {+ label: m.common_tags(),+ getValue: (item: ImageBuildRecord) => item.tags?.join(', ') || '-',+ icon: TagIcon,+ iconVariant: 'gray' as const,+ show: mobileFieldVisibility.tags ?? true+ },+ {+ label: m.build_provider(),+ getValue: (item: ImageBuildRecord) => item.provider || '-',+ icon: SettingsIcon,+ iconVariant: 'gray' as const,+ show: mobileFieldVisibility.provider ?? true+ },+ {+ label: m.common_created(),+ getValue: (item: ImageBuildRecord) => formatTimestamp(item.createdAt),+ icon: ClockIcon,+ iconVariant: 'gray' as const,+ show: mobileFieldVisibility.createdAt ?? true+ },+ {+ label: m.build_duration_label(),+ getValue: (item: ImageBuildRecord) => formatDuration(item.durationMs ?? 0),+ icon: ArrowDownIcon,+ iconVariant: 'gray' as const,+ show: mobileFieldVisibility.durationMs ?? false+ }+ ]}+ onclick={(item: ImageBuildRecord) => openBuildDetails(item)}+ />+{/snippet}++{#snippet historyContent()}+ <div class="flex h-full flex-col p-6">+ <ArcaneTable+ persistKey="arcane-build-history-table"+ items={buildHistoryItems}+ bind:requestOptions={buildHistoryRequestOptions}+ bind:selectedIds={buildHistorySelectedIds}+ bind:mobileFieldVisibility={buildHistoryMobileFieldVisibility}+ onRefresh={loadBuildHistory}+ selectionDisabled={true}+ columns={buildHistoryColumns}+ mobileFields={buildHistoryMobileFields}+ rowActions={BuildHistoryRowActions}+ mobileCard={BuildHistoryMobileCard}+ />++ <ResponsiveDialog+ bind:open={buildHistoryDetailsOpen}+ title={buildHistorySelected ? (buildHistorySelected.tags?.[0] ?? m.build_output()) : m.build_output()}+ description={buildHistorySelected ? buildHistorySelected.contextDir : undefined}+ contentClass="sm:max-w-[1100px]"+ class="min-h-0 lg:overflow-hidden"+ >+ <div class="space-y-4 pb-4">+ {#if buildHistorySelected}+ <div class="flex flex-wrap items-center justify-between gap-3 text-sm">+ <div class="flex flex-wrap items-center gap-2">+ <StatusBadge+ variant={getStatusBadgeVariant(buildHistorySelected.status)}+ text={buildHistoryStatusLabel(buildHistorySelected.status)}+ size="sm"+ />+ {#if buildHistorySelected.provider}+ <span class="text-muted-foreground">{buildHistorySelected.provider}</span>+ {/if}+ {#if buildHistorySelected.durationMs}+ <span class="text-muted-foreground">{formatDuration(buildHistorySelected.durationMs)}</span>+ {/if}+ <span class="text-muted-foreground">{formatTimestamp(buildHistorySelected.createdAt)}</span>+ </div>+ <ArcaneButton+ action="base"+ tone="outline"+ size="sm"+ icon={RedeployIcon}+ customLabel={m.build_rebuild()}+ onclick={() => buildHistorySelected && applyBuildConfig(buildHistorySelected)}+ />+ </div>+ {#if buildHistorySelected.errorMessage}+ <div class="border-destructive/20 bg-destructive/10 text-destructive rounded-lg border p-3 text-sm">+ {buildHistorySelected.errorMessage}+ </div>+ {/if}+ {/if}++ <div class="grid gap-4 lg:h-[70vh] lg:grid-cols-[360px_minmax(0,1fr)] lg:items-stretch">+ <div class="min-h-0 space-y-3 lg:overflow-auto lg:overscroll-contain lg:pr-1">+ {#if buildHistorySelected}+ <div class="grid gap-3">+ <div class="border-border/60 rounded-lg border bg-zinc-950/40 p-3">+ <div class="text-muted-foreground text-[10px] font-semibold tracking-[0.12em] uppercase">+ {m.build_context()}+ </div>+ <div class="mt-2 font-mono text-xs break-all">{buildHistorySelected.contextDir}</div>+ </div>+ <div class="border-border/60 rounded-lg border bg-zinc-950/40 p-3">+ <div class="text-muted-foreground text-[10px] font-semibold tracking-[0.12em] uppercase">+ {m.common_tags()}+ </div>+ <div class="mt-2 text-xs">+ {buildHistorySelected.tags?.join(', ') || '-'}+ </div>+ </div>+ <div class="border-border/60 rounded-lg border bg-zinc-950/40 p-3">+ <div class="text-muted-foreground text-[10px] font-semibold tracking-[0.12em] uppercase">+ {m.dockerfile()}+ </div>+ <div class="mt-2 text-xs">{buildHistorySelected.dockerfile || '-'}</div>+ </div>+ <div class="border-border/60 rounded-lg border bg-zinc-950/40 p-3">+ <div class="text-muted-foreground text-[10px] font-semibold tracking-[0.12em] uppercase">+ {m.target_label()}+ </div>+ <div class="mt-2 text-xs">{buildHistorySelected.target || '-'}</div>+ </div>+ <div class="border-border/60 rounded-lg border bg-zinc-950/40 p-3">+ <div class="text-muted-foreground text-[10px] font-semibold tracking-[0.12em] uppercase">+ {m.platforms_label()}+ </div>+ <div class="mt-2 text-xs">{buildHistorySelected.platforms?.join(', ') || '-'}</div>+ </div>+ <div class="border-border/60 rounded-lg border bg-zinc-950/40 p-3">+ <div class="text-muted-foreground text-[10px] font-semibold tracking-[0.12em] uppercase">+ {m.build_provider()}+ </div>+ <div class="mt-2 text-xs">{buildHistorySelected.provider || '-'}</div>+ </div>+ <div class="border-border/60 rounded-lg border bg-zinc-950/40 p-3">+ <div class="text-muted-foreground text-[10px] font-semibold tracking-[0.12em] uppercase">+ {m.push()} / {m.load()}+ </div>+ <div class="mt-2 text-xs">+ {buildHistorySelected.push ? m.common_yes() : m.common_no()} / {buildHistorySelected.load+ ? m.common_yes()+ : m.common_no()}+ </div>+ </div>+ <div class="border-border/60 rounded-lg border bg-zinc-950/40 p-3">+ <div class="text-muted-foreground text-[10px] font-semibold tracking-[0.12em] uppercase">+ {m.build_no_cache_pull_base_label()}+ </div>+ <div class="mt-2 text-xs">+ {buildHistorySelected.noCache ? m.common_yes() : m.common_no()} / {buildHistorySelected.pull+ ? m.common_yes()+ : m.common_no()}+ </div>+ </div>+ <div class="border-border/60 rounded-lg border bg-zinc-950/40 p-3">+ <div class="text-muted-foreground text-[10px] font-semibold tracking-[0.12em] uppercase">+ {m.build_network_label()}+ </div>+ <div class="mt-2 text-xs">{buildHistorySelected.network || '-'}</div>+ </div>+ <div class="border-border/60 rounded-lg border bg-zinc-950/40 p-3">+ <div class="text-muted-foreground text-[10px] font-semibold tracking-[0.12em] uppercase">+ {m.build_args()}+ </div>+ {#if buildHistorySelected.buildArgs && Object.keys(buildHistorySelected.buildArgs).length > 0}+ <pre class="mt-2 font-mono text-[11px] break-words whitespace-pre-wrap">+ {formatBuildArgs(buildHistorySelected.buildArgs)}+ </pre>+ {:else}+ <div class="mt-2 text-xs">-</div>+ {/if}+ </div>+ <div class="border-border/60 rounded-lg border bg-zinc-950/40 p-3">+ <div class="text-muted-foreground text-[10px] font-semibold tracking-[0.12em] uppercase">+ {m.common_labels()}+ </div>+ {#if buildHistorySelected.labels && Object.keys(buildHistorySelected.labels).length > 0}+ <pre class="mt-2 font-mono text-[11px] break-words whitespace-pre-wrap">+ {formatKeyValueMap(buildHistorySelected.labels)}+ </pre>+ {:else}+ <div class="mt-2 text-xs">-</div>+ {/if}+ </div>+ <div class="border-border/60 rounded-lg border bg-zinc-950/40 p-3">+ <div class="text-muted-foreground text-[10px] font-semibold tracking-[0.12em] uppercase">+ {m.build_cache_from_label()}+ </div>+ <div class="mt-2 text-xs">{buildHistorySelected.cacheFrom?.join(', ') || '-'}</div>+ </div>+ <div class="border-border/60 rounded-lg border bg-zinc-950/40 p-3">+ <div class="text-muted-foreground text-[10px] font-semibold tracking-[0.12em] uppercase">+ {m.build_cache_to_label()}+ </div>+ <div class="mt-2 text-xs">{buildHistorySelected.cacheTo?.join(', ') || '-'}</div>+ </div>+ <div class="border-border/60 rounded-lg border bg-zinc-950/40 p-3">+ <div class="text-muted-foreground text-[10px] font-semibold tracking-[0.12em] uppercase">+ {m.build_isolation_label()}+ </div>+ <div class="mt-2 text-xs">{buildHistorySelected.isolation || '-'}</div>+ </div>+ <div class="border-border/60 rounded-lg border bg-zinc-950/40 p-3">+ <div class="text-muted-foreground text-[10px] font-semibold tracking-[0.12em] uppercase">+ {m.build_shm_size_short_label()}+ </div>+ <div class="mt-2 text-xs">+ {buildHistorySelected.shmSize ? m.build_bytes({ size: String(buildHistorySelected.shmSize) }) : '-'}+ </div>+ </div>+ <div class="border-border/60 rounded-lg border bg-zinc-950/40 p-3">+ <div class="text-muted-foreground text-[10px] font-semibold tracking-[0.12em] uppercase">+ {m.build_ulimits_label()}+ </div>+ {#if buildHistorySelected.ulimits && Object.keys(buildHistorySelected.ulimits).length > 0}+ <pre class="mt-2 font-mono text-[11px] break-words whitespace-pre-wrap">+ {formatKeyValueMap(buildHistorySelected.ulimits)}+ </pre>+ {:else}+ <div class="mt-2 text-xs">-</div>+ {/if}+ </div>+ <div class="border-border/60 rounded-lg border bg-zinc-950/40 p-3">+ <div class="text-muted-foreground text-[10px] font-semibold tracking-[0.12em] uppercase">+ {m.build_entitlements_label()}+ </div>+ <div class="mt-2 text-xs">{buildHistorySelected.entitlements?.join(', ') || '-'}</div>+ </div>+ <div class="border-border/60 rounded-lg border bg-zinc-950/40 p-3">+ <div class="text-muted-foreground text-[10px] font-semibold tracking-[0.12em] uppercase">+ {m.build_privileged_heading_label()}+ </div>+ <div class="mt-2 text-xs">{buildHistorySelected.privileged ? m.common_yes() : m.common_no()}</div>+ </div>+ <div class="border-border/60 rounded-lg border bg-zinc-950/40 p-3">+ <div class="text-muted-foreground text-[10px] font-semibold tracking-[0.12em] uppercase">+ {m.build_extra_hosts_label()}+ </div>+ <div class="mt-2 text-xs">{buildHistorySelected.extraHosts?.join(', ') || '-'}</div>+ </div>+ </div>+ {/if}+ </div>+ <div class="border-border/60 bg-card/30 flex min-h-0 flex-col overflow-hidden rounded-xl border">+ <div class="border-border/60 flex items-center justify-between border-b px-4 py-3">+ <div class="text-sm font-medium">{m.build_output()}</div>+ {#if buildHistorySelected?.outputTruncated}+ <span class="text-xs text-amber-400">{m.build_output_truncated()}</span>+ {/if}+ </div>+ <div class="max-h-[60vh] min-h-[260px] overflow-auto overscroll-contain p-4 lg:max-h-none lg:min-h-0 lg:flex-1">+ {#if buildHistoryDetailsLoading}+ <div class="flex h-full items-center justify-center">+ <Spinner class="text-muted-foreground size-6" />+ </div>+ {:else if buildHistorySelected?.output}+ {#if buildHistoryOutputEntries.length > 0}+ <div class="space-y-2">+ {#each buildHistoryOutputEntries as entry, entryIndex (entry.raw + entryIndex)}+ <div+ class={`border-border/50 rounded-lg border px-3 py-2 ${+ entry.error ? 'bg-destructive/10 border-destructive/40' : 'bg-zinc-950/40'+ }`}+ >+ <div class="flex items-start justify-between gap-3">+ <div class="min-w-0">+ <div+ class="text-muted-foreground flex flex-wrap items-center gap-2 text-[10px] tracking-wide uppercase"+ >+ {#if entry.type}+ <span class="rounded bg-zinc-800/60 px-1.5 py-0.5">{entry.type}</span>+ {/if}+ {#if entry.phase}+ <span class="rounded bg-zinc-800/60 px-1.5 py-0.5">{entry.phase}</span>+ {/if}+ {#if entry.id}+ <span class="font-mono text-[10px] break-all">{entry.id}</span>+ {/if}+ </div>+ <div class={`mt-1 text-xs break-all ${entry.error ? 'text-destructive' : 'text-foreground'}`}>+ {entry.error ?? entry.status ?? entry.raw}+ </div>+ </div>+ {#if entry.progress?.total}+ <div class="flex shrink-0 flex-col items-end gap-1">+ <span class="text-muted-foreground text-[10px] tabular-nums">+ {formatProgress(entry.progress.current, entry.progress.total)}+ </span>+ <div class="h-1 w-24 overflow-hidden rounded-full bg-zinc-800/70">+ <div+ class="h-full rounded-full bg-emerald-400"+ style={`width: ${getProgressPercent(entry.progress.current, entry.progress.total)}%`}+ ></div>+ </div>+ </div>+ {/if}+ </div>+ </div>+ {/each}+ </div>+ {:else}+ <div class="text-muted-foreground text-sm">{m.build_output_placeholder()}</div>+ {/if}+ {:else}+ <div class="text-muted-foreground text-sm">{m.build_output_placeholder()}</div>+ {/if}+ </div>+ </div>+ </div>+ </div>+ </ResponsiveDialog>+ </div>+{/snippet}++<!-- Right panel with tabs (config + output) -->+{#snippet rightPanel()}+ <div class="flex h-full flex-col">+ <Tabs.Root bind:value={rightPanelTab} class="flex h-full flex-col">+ <!-- Tabs header with refined styling -->+ <div class="flex shrink-0 items-center justify-between border-b border-zinc-800/50 bg-zinc-950/40 px-3 py-2">+ <Tabs.List class="flex items-center gap-1 rounded-lg border border-zinc-800/60 bg-zinc-950/60 p-1">+ <Tabs.Trigger+ value="config"+ class="data-[state=active]:text-foreground text-muted-foreground hover:text-foreground rounded-md px-3 py-1.5 text-xs font-medium transition-colors data-[state=active]:bg-blue-500/10"+ >+ <CodeIcon class="mr-2 size-3.5" />+ {m.build_configuration()}+ </Tabs.Trigger>+ <Tabs.Trigger+ value="output"+ class="data-[state=active]:text-foreground text-muted-foreground hover:text-foreground rounded-md px-3 py-1.5 text-xs font-medium transition-colors data-[state=active]:bg-emerald-500/10"+ >+ <TerminalIcon class="mr-2 size-3.5" />+ {m.build_output()}+ {#if logLines.length > 0}+ <span+ class="ml-1.5 rounded-full bg-emerald-500/15 px-1.5 py-0.5 text-[10px] font-semibold text-emerald-300 ring-1 ring-emerald-400/20"+ >+ {logLines.length}+ </span>+ {/if}+ </Tabs.Trigger>+ </Tabs.List>++ <div class="flex items-center gap-3 pr-2">+ <BuildControls {inputs} {providerOptions} {selectedProviderLabel} {isBuilding} onBuild={handleSubmit} />+ <div class="bg-border hidden h-4 w-px xl:block"></div>+ <div class="flex items-center gap-2">+ <div class="relative flex items-center">+ <div+ class={`size-2 rounded-full transition-all ${+ buildError+ ? 'bg-red-500 shadow-lg shadow-red-500/50'+ : hasReachedComplete+ ? 'bg-green-500 shadow-lg shadow-green-500/50'+ : isBuilding+ ? 'animate-pulse bg-blue-500 shadow-lg shadow-blue-500/50'+ : 'bg-zinc-600'+ }`}+ ></div>+ {#if isBuilding}+ <div class="absolute inset-0 size-2 animate-ping rounded-full bg-blue-500 opacity-75"></div>+ {/if}+ </div>+ <span class="text-muted-foreground text-xs font-medium">{statusLabel}</span>+ </div>+ </div>+ </div>++ <Tabs.Content value="config" class="mt-0 min-h-0 flex-1 overflow-auto">+ <BuildConfigPanel {inputs} provider={$inputs.provider.value} bind:showAdvanced onSubmit={handleSubmit} />+ </Tabs.Content>+ <Tabs.Content value="output" class="mt-0 min-h-0 flex-1 overflow-hidden">+ <BuildOutputPanel+ {logLines}+ {layerStats}+ {aggregateStatus}+ {progressValue}+ {isIndeterminate}+ {hasReachedComplete}+ {buildError}+ {isBuilding}+ bind:autoScroll+ onReset={resetState}+ />+ </Tabs.Content>+ </Tabs.Root>+ </div>+{/snippet}++{#if isDesktop}+ <ResourceDetailLayout+ backUrl="/images"+ backLabel={m.images_title()}+ title={m.manual_build_workspace()}+ subtitle={m.manual_build_workspace_subtitle()}+ >+ <Tabs.Root bind:value={mainTab} class="flex h-[calc(100vh-12rem)] flex-col">+ <Tabs.List class="mb-3 flex w-fit gap-2 rounded-lg border border-zinc-800/60 bg-zinc-950/60 p-1">+ <Tabs.Trigger+ value="build"+ class="data-[state=active]:text-foreground text-muted-foreground hover:text-foreground rounded-md px-3 py-1.5 text-sm font-medium data-[state=active]:bg-blue-500/10"+ >+ {m.manual_build_workspace()}+ </Tabs.Trigger>+ <Tabs.Trigger+ value="history"+ class="data-[state=active]:text-foreground text-muted-foreground hover:text-foreground rounded-md px-3 py-1.5 text-sm font-medium data-[state=active]:bg-amber-500/10"+ >+ {m.build_history()}+ </Tabs.Trigger>+ </Tabs.List>++ <Tabs.Content value="build" class="min-h-0 flex-1">+ <div class="relative flex h-full">+ <ResizableSplit+ class="flex h-full w-full gap-3"+ firstClass="h-full"+ secondClass="h-full"+ minSize={300}+ minSecondSize={520}+ defaultRatio={0.28}+ handleSize={10}+ handleClass="bg-zinc-950/50 rounded-full"+ allowCollapse={true}+ persistKey="arcane.build.workspace.split"+ >+ {#snippet first()}+ <Card.Root class="flex h-full flex-col overflow-hidden">+ <BuildWorkspacePanel+ rootLabel={buildsRootLabel}+ rootPath={buildsRoot}+ {contextDir}+ onSelectContext={(path: string) => (selectedContextPath = path)}+ />+ </Card.Root>+ {/snippet}+ {#snippet second()}+ <Card.Root class="flex h-full flex-col overflow-hidden">+ {@render rightPanel()}+ </Card.Root>+ {/snippet}+ </ResizableSplit>+ </div>+ </Tabs.Content>++ <Tabs.Content value="history" class="min-h-0 flex-1">+ <Card.Root class="flex h-full flex-col overflow-hidden">+ {@render historyContent()}+ </Card.Root>+ </Tabs.Content>+ </Tabs.Root>+ </ResourceDetailLayout>+{:else}+ <TabbedPageLayout+ backUrl="/images"+ backLabel={m.images_title()}+ tabItems={mainTabItems}+ selectedTab={mainTab}+ onTabChange={onMainTabChange}+ class="min-h-[calc(100vh-10rem)]"+ >+ {#snippet headerInfo()}+ <div class="flex flex-col gap-1">+ {#if mainTab === 'history'}+ <h1 class="text-2xl font-bold tracking-tight">{m.builds()}</h1>+ <p class="text-muted-foreground text-sm">{m.build_output()}</p>+ {:else}+ <h1 class="text-2xl font-bold tracking-tight">{m.manual_build_workspace()}</h1>+ <p class="text-muted-foreground text-sm">{m.manual_build_workspace_subtitle()}</p>+ {/if}+ </div>+ {/snippet}++ {#snippet headerActions()}+ {#if mainTab === 'build'}+ <BuildControls {inputs} {providerOptions} {selectedProviderLabel} {isBuilding} onBuild={handleSubmit} />+ {/if}+ {/snippet}++ {#snippet tabContent(tab)}+ <div class="min-h-[60vh]">+ {#if tab === 'build'}+ <TabbedPageLayout+ backUrl="/images"+ backLabel={m.images_title()}+ tabItems={buildMobileTabItems}+ selectedTab={buildTab}+ onTabChange={onBuildTabChange}+ class="min-h-[60vh]"+ >+ {#snippet headerInfo()}+ <div class="flex flex-col gap-1">+ <h2 class="text-lg font-semibold">{m.manual_build_workspace()}</h2>+ <p class="text-muted-foreground text-xs">{m.manual_build_workspace_subtitle()}</p>+ </div>+ {/snippet}+ {#snippet headerActions()}+ <BuildControls {inputs} {providerOptions} {selectedProviderLabel} {isBuilding} onBuild={handleSubmit} />+ {/snippet}+ {#snippet tabContent(buildTabValue)}+ {#if buildTabValue === 'workspace'}+ <Card.Root class="flex h-full flex-col overflow-hidden">+ <BuildWorkspacePanel+ rootLabel={buildsRootLabel}+ rootPath={buildsRoot}+ {contextDir}+ onSelectContext={(path: string) => (selectedContextPath = path)}+ />+ </Card.Root>+ {:else if buildTabValue === 'configuration'}+ <Card.Root class="overflow-hidden">+ <BuildConfigPanel {inputs} provider={$inputs.provider.value} bind:showAdvanced onSubmit={handleSubmit} />+ </Card.Root>+ {:else}+ <Card.Root class="flex h-full min-h-[500px] flex-col overflow-hidden">+ <BuildOutputPanel+ {logLines}+ {layerStats}+ {aggregateStatus}+ {progressValue}+ {isIndeterminate}+ {hasReachedComplete}+ {buildError}+ {isBuilding}+ bind:autoScroll+ onReset={resetState}+ />+ </Card.Root>+ {/if}+ {/snippet}+ </TabbedPageLayout>+ {:else}+ <Card.Root class="flex h-full min-h-[500px] flex-col overflow-hidden">+ {@render historyContent()}+ </Card.Root>+ {/if}+ </div>+ {/snippet}+ </TabbedPageLayout>+{/if}diff --git a/frontend/src/routes/(app)/images/builds/build-workspace-browser.svelte b/frontend/src/routes/(app)/images/builds/build-workspace-browser.sveltenew file mode 100644index 000000000..661f21683--- /dev/null+++ b/frontend/src/routes/(app)/images/builds/build-workspace-browser.svelte@@ -0,0 +1,307 @@+<script lang="ts">+ import FileList from '$lib/components/file-browser/FileList.svelte';+ import FileBreadcrumb from '$lib/components/file-browser/FileBreadcrumb.svelte';+ import CreateFolderDialog from '$lib/components/file-browser/CreateFolderDialog.svelte';+ import FileUploadDialog from '$lib/components/file-browser/FileUploadDialog.svelte';+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';+ import { UploadIcon, MoveToFolderIcon, EllipsisIcon, CopyIcon } from '$lib/icons';+ import { Spinner } from '$lib/components/ui/spinner/index.js';+ import * as DropdownMenu from '$lib/components/ui/dropdown-menu/index.js';+ import * as Dialog from '$lib/components/ui/dialog/index.js';+ import { Textarea } from '$lib/components/ui/textarea';+ import { Label } from '$lib/components/ui/label';+ import { m } from '$lib/paraglide/messages';+ import { toast } from 'svelte-sonner';+ import { UseClipboard } from '$lib/hooks/use-clipboard.svelte';+ import { environmentStore } from '$lib/stores/environment.store.svelte';+ import { queryKeys } from '$lib/query/query-keys';+ import type { FileContentResponse, FileEntry } from '$lib/types/file-browser.type';+ import type { FileProvider } from '$lib/components/file-browser';+ import { createMutation, createQuery, useQueryClient } from '@tanstack/svelte-query';++ let {+ provider,+ rootLabel = '/builds',+ rootPath,+ persistKey = 'arcane-build-workspace-table',+ onSelectContext+ }: {+ provider: FileProvider;+ rootLabel?: string;+ rootPath?: string;+ persistKey?: string;+ onSelectContext?: (path: string) => void;+ } = $props();++ let currentPath = $state('/');+ const envId = $derived(environmentStore.selected?.id || '0');+ const queryClient = useQueryClient();++ const filesQuery = createQuery(() => ({+ queryKey: queryKeys.buildWorkspace.list(envId, currentPath),+ queryFn: () => provider.list(currentPath)+ }));++ const files = $derived.by<FileEntry[]>(() => {+ const result = (filesQuery.data ?? []).slice();+ return result.sort((a, b) => {+ if (a.isDirectory && !b.isDirectory) return -1;+ if (!a.isDirectory && b.isDirectory) return 1;+ return a.name.localeCompare(b.name);+ });+ });++ const loading = $derived(filesQuery.isPending);+ const error = $derived.by(() => {+ const err = filesQuery.error as any;+ if (!err) return null;+ return err.message || 'Failed to load files';+ });++ let showCreateFolder = $state(false);+ let showUpload = $state(false);++ let editorOpen = $state(false);+ let editorFile = $state<FileEntry | null>(null);+ let editorContent = $state('');+ let editorSaving = $state(false);++ const editorContentQuery = createQuery(() => ({+ queryKey: editorFile+ ? queryKeys.buildWorkspace.content(envId, editorFile.path)+ : (['build-workspace', envId, 'content', 'none'] as const),+ queryFn: () => provider.getContent(editorFile!.path),+ enabled: !!editorFile && editorOpen,+ onSuccess: (data: FileContentResponse) => {+ editorContent = b64DecodeUnicode(data.content);+ }+ }));++ const editorLoading = $derived(editorContentQuery.isPending || editorContentQuery.isFetching);+ const editorError = $derived.by(() => {+ const err = editorContentQuery.error as any;+ if (!err) return null;+ return err.message || 'Failed to load file';+ });++ const mkdirMutation = createMutation(() => ({+ mutationKey: ['build-workspace', 'mkdir', envId],+ mutationFn: (path: string) => provider.mkdir(path),+ onSuccess: async () => {+ await queryClient.invalidateQueries({ queryKey: queryKeys.buildWorkspace.listPrefix(envId) });+ }+ }));++ const uploadMutation = createMutation(() => ({+ mutationKey: ['build-workspace', 'upload', envId],+ mutationFn: ({ path, file }: { path: string; file: File }) => provider.upload(path, file),+ onSuccess: async () => {+ await queryClient.invalidateQueries({ queryKey: queryKeys.buildWorkspace.listPrefix(envId) });+ }+ }));++ const deleteMutation = createMutation(() => ({+ mutationKey: ['build-workspace', 'delete', envId],+ mutationFn: (path: string) => provider.delete(path),+ onSuccess: async () => {+ await queryClient.invalidateQueries({ queryKey: queryKeys.buildWorkspace.listPrefix(envId) });+ }+ }));++ const downloadMutation = createMutation(() => ({+ mutationKey: ['build-workspace', 'download', envId],+ mutationFn: (path: string) => provider.download(path)+ }));++ const clipboard = new UseClipboard();++ const absoluteCurrentPath = $derived.by(() => {+ const root = (rootPath ?? '').trim();+ if (!root) return currentPath;+ const normalizedRoot = root.endsWith('/') ? root.slice(0, -1) : root;+ if (currentPath === '/' || currentPath === '') return normalizedRoot;+ return `${normalizedRoot}${currentPath.startsWith('/') ? '' : '/'}${currentPath}`;+ });++ function b64DecodeUnicode(str: string) {+ try {+ return decodeURIComponent(+ atob(str)+ .split('')+ .map((c) => '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2))+ .join('')+ );+ } catch {+ return atob(str);+ }+ }++ function handleNavigate(path: string) {+ currentPath = path;+ onSelectContext?.(path);+ }++ async function handleCopyPath() {+ const status = await clipboard.copy(absoluteCurrentPath);+ if (status === 'success') {+ toast.success('Copied current path');+ return;+ }+ toast.error('Failed to copy path');+ }++ async function openEditor(file: FileEntry) {+ if (file.isDirectory) return;+ editorFile = file;+ editorOpen = true;+ editorContent = '';+ }++ async function handleSaveFile() {+ if (!editorFile) return;+ editorSaving = true;+ try {+ const dirPath = editorFile.path.split('/').slice(0, -1).join('/') || '/';+ const file = new File([editorContent], editorFile.name, { type: 'text/plain' });+ await uploadMutation.mutateAsync({ path: dirPath, file });+ await queryClient.invalidateQueries({ queryKey: queryKeys.buildWorkspace.content(envId, editorFile.path) });+ toast.success('File saved');+ editorOpen = false;+ await filesQuery.refetch();+ } catch (e: any) {+ toast.error(e.message || 'Failed to save file');+ } finally {+ editorSaving = false;+ }+ }+</script>++<div class="flex h-full min-h-0 flex-col gap-5">+ <div class="border-border/40 flex flex-wrap items-start justify-between gap-4 border-b pt-1 pb-4">+ <div class="min-w-0 flex-1 space-y-3">+ <FileBreadcrumb path={currentPath} {rootLabel} onNavigate={handleNavigate} />+ <div class="flex min-w-0 items-center gap-3">+ <div class="text-muted-foreground min-w-0 flex-1 truncate font-mono text-[11px]" title={absoluteCurrentPath}>+ {absoluteCurrentPath}+ </div>+ </div>+ </div>++ <div class="flex shrink-0 flex-wrap items-center justify-end gap-3">+ <DropdownMenu.Root>+ <DropdownMenu.Trigger>+ {#snippet child({ props })}+ <ArcaneButton+ {...props}+ action="base"+ tone="outline"+ size="icon"+ class="size-9"+ icon={EllipsisIcon}+ customLabel={m.common_actions()}+ />+ {/snippet}+ </DropdownMenu.Trigger>+ <DropdownMenu.Content align="end" class="min-w-[180px]">+ <DropdownMenu.Item onclick={handleCopyPath}>+ <CopyIcon class="size-4" />+ Copy current path+ </DropdownMenu.Item>+ <DropdownMenu.Separator />+ <DropdownMenu.Item onclick={() => (showCreateFolder = true)}>+ <MoveToFolderIcon class="size-4" />+ {m.volumes_browser_new_folder()}+ </DropdownMenu.Item>+ <DropdownMenu.Item onclick={() => (showUpload = true)}>+ <UploadIcon class="size-4" />+ {m.volumes_browser_upload_files()}+ </DropdownMenu.Item>+ </DropdownMenu.Content>+ </DropdownMenu.Root>+ </div>+ </div>++ {#if loading}+ <div class="flex flex-1 items-center justify-center p-8">+ <Spinner class="text-muted-foreground size-8" />+ </div>+ {:else if error}+ <div class="border-destructive/20 bg-destructive/10 text-destructive rounded-lg border p-6 text-sm">+ {error}+ </div>+ {:else}+ <div class="min-h-0 flex-1 overflow-hidden">+ <FileList+ {files}+ {currentPath}+ {persistKey}+ minimal+ onNavigate={handleNavigate}+ onRefresh={() => filesQuery.refetch()}+ onDelete={async (file) => {+ await deleteMutation.mutateAsync(file.path);+ await filesQuery.refetch();+ }}+ onDownload={async (file) => {+ await downloadMutation.mutateAsync(file.path);+ }}+ onPreview={openEditor}+ />+ </div>+ {/if}+</div>++<CreateFolderDialog+ bind:open={showCreateFolder}+ {currentPath}+ onCreate={async (name) => {+ const fullPath = currentPath === '/' ? `/${name}` : `${currentPath}/${name}`;+ await mkdirMutation.mutateAsync(fullPath);+ await filesQuery.refetch();+ }}+/>++<FileUploadDialog+ bind:open={showUpload}+ {currentPath}+ onUpload={async (file) => {+ await uploadMutation.mutateAsync({ path: currentPath, file });+ await filesQuery.refetch();+ }}+/>++<Dialog.Root bind:open={editorOpen}>+ <Dialog.Content class="max-w-3xl">+ <Dialog.Header>+ <Dialog.Title>{editorFile?.name ?? 'File'}</Dialog.Title>+ <Dialog.Description class="break-all">{editorFile?.path}</Dialog.Description>+ </Dialog.Header>+ <div class="space-y-4 py-2">+ {#if editorLoading}+ <div class="flex items-center justify-center py-8">+ <Spinner class="text-muted-foreground size-8" />+ </div>+ {:else if editorError}+ <div class="border-destructive/20 bg-destructive/10 text-destructive rounded-lg border p-4 text-sm">+ {editorError}+ </div>+ {:else}+ <div class="space-y-2">+ <Label>File contents</Label>+ <Textarea rows={18} bind:value={editorContent} class="font-mono text-xs" />+ <p class="text-muted-foreground text-xs">Saving will overwrite the file contents.</p>+ </div>+ {/if}+ </div>+ <Dialog.Footer class="flex flex-col-reverse gap-2 sm:flex-row sm:justify-end">+ <ArcaneButton action="cancel" tone="outline" type="button" onclick={() => (editorOpen = false)} />+ <ArcaneButton+ action="save"+ type="button"+ onclick={handleSaveFile}+ disabled={editorLoading || editorSaving || !!editorError}+ loading={editorSaving}+ />+ </Dialog.Footer>+ </Dialog.Content>+</Dialog.Root>diff --git a/frontend/src/routes/(app)/images/builds/components/build-config-panel.svelte b/frontend/src/routes/(app)/images/builds/components/build-config-panel.sveltenew file mode 100644index 000000000..05e271b69--- /dev/null+++ b/frontend/src/routes/(app)/images/builds/components/build-config-panel.svelte@@ -0,0 +1,207 @@+<script lang="ts">+ import * as Collapsible from '$lib/components/ui/collapsible/index.js';+ import { ArrowDownIcon } from '$lib/icons';+ import FormInput from '$lib/components/form/form-input.svelte';+ import { preventDefault } from '$lib/utils/form.utils';+ import { m } from '$lib/paraglide/messages';+ import type { BuildFormInputsStore } from './build-form.types';++ let {+ inputs,+ provider,+ showAdvanced = $bindable(false),+ onSubmit+ }: {+ inputs: BuildFormInputsStore;+ provider: 'local' | 'depot';+ showAdvanced?: boolean;+ onSubmit?: () => void;+ } = $props();++ const providerIsLocal = $derived(provider === 'local');+ const providerIsDepot = $derived(provider === 'depot');+</script>++<div class="space-y-7 p-8">+ <form onsubmit={preventDefault(() => onSubmit?.())} class="space-y-7">+ <div class="space-y-4">+ <FormInput+ label={m.image_tags()}+ type="text"+ placeholder={m.image_tags_placeholder()}+ description={m.image_tags_description()}+ bind:input={$inputs.tags}+ />++ <Collapsible.Root bind:open={showAdvanced}>+ <Collapsible.Trigger+ class="text-muted-foreground hover:text-foreground hover:bg-accent flex w-full items-center justify-between rounded-md px-2 py-1.5 text-xs transition-colors"+ >+ {m.tabs_advanced()}+ <ArrowDownIcon class={showAdvanced ? 'size-4 rotate-180 transition-transform' : 'size-4 transition-transform'} />+ </Collapsible.Trigger>+ <Collapsible.Content>+ <div class="mt-4 grid gap-6">+ <!-- Advanced build options -->+ <div class="grid gap-4 sm:grid-cols-2">+ <FormInput+ label={m.dockerfile()}+ type="text"+ placeholder={m.dockerfile()}+ description={m.dockerfile_description()}+ bind:input={$inputs.dockerfile}+ />++ <FormInput+ label={m.target_label()}+ type="text"+ placeholder={m.target_placeholder()}+ description={m.target_description()}+ bind:input={$inputs.target}+ />+ </div>++ <FormInput+ label={m.platforms_label()}+ type="text"+ placeholder={m.platforms_placeholder()}+ description={m.platforms_description()}+ bind:input={$inputs.platforms}+ warningText={providerIsLocal ? m.build_provider_warning_single_platform_local() : undefined}+ />++ <FormInput+ label={m.build_args()}+ type="textarea"+ rows={3}+ placeholder={m.build_args_placeholder()}+ description={m.build_args_description()}+ bind:input={$inputs.buildArgs}+ />++ <FormInput+ label={m.common_labels()}+ type="textarea"+ rows={3}+ placeholder={m.build_labels_placeholder()}+ description={m.build_labels_description()}+ bind:input={$inputs.labels}+ />++ <FormInput+ label={m.build_cache_from_label()}+ type="textarea"+ rows={2}+ placeholder={m.build_cache_from_placeholder()}+ description={m.build_cache_from_description()}+ bind:input={$inputs.cacheFrom}+ />++ <FormInput+ label={m.build_cache_to_label()}+ type="textarea"+ rows={2}+ placeholder={m.build_cache_to_placeholder()}+ description={m.build_cache_to_description()}+ bind:input={$inputs.cacheTo}+ disabled={providerIsLocal}+ warningText={providerIsLocal ? m.build_provider_warning_unsupported_local() : undefined}+ />++ <div class="grid gap-4 sm:grid-cols-2">+ <FormInput+ label={m.build_network_label()}+ type="text"+ placeholder={m.build_network_placeholder()}+ description={m.build_network_description()}+ bind:input={$inputs.network}+ disabled={providerIsDepot}+ warningText={providerIsDepot ? m.build_provider_warning_unsupported_depot() : undefined}+ />++ <FormInput+ label={m.build_isolation_label()}+ type="text"+ placeholder={m.build_isolation_placeholder()}+ description={m.build_isolation_description()}+ bind:input={$inputs.isolation}+ disabled={providerIsDepot}+ warningText={providerIsDepot ? m.build_provider_warning_unsupported_depot() : undefined}+ />+ </div>++ <div class="grid gap-4 sm:grid-cols-2">+ <FormInput+ label={m.build_shm_size_label()}+ type="text"+ placeholder={m.build_shm_size_placeholder()}+ description={m.build_shm_size_description()}+ bind:input={$inputs.shmSize}+ disabled={providerIsDepot}+ warningText={providerIsDepot ? m.build_provider_warning_unsupported_depot() : undefined}+ />++ <FormInput+ label={m.build_entitlements_label()}+ type="textarea"+ rows={2}+ placeholder={m.build_entitlements_placeholder()}+ description={m.build_entitlements_description()}+ bind:input={$inputs.entitlements}+ disabled={providerIsLocal}+ warningText={providerIsLocal ? m.build_provider_warning_unsupported_local() : undefined}+ />+ </div>++ <FormInput+ label={m.build_ulimits_label()}+ type="textarea"+ rows={2}+ placeholder={m.build_ulimits_placeholder()}+ description={m.build_ulimits_description()}+ bind:input={$inputs.ulimits}+ disabled={providerIsDepot}+ warningText={providerIsDepot ? m.build_provider_warning_unsupported_depot() : undefined}+ />++ <FormInput+ label={m.build_extra_hosts_label()}+ type="textarea"+ rows={2}+ placeholder={m.build_extra_hosts_placeholder()}+ description={m.build_extra_hosts_description()}+ bind:input={$inputs.extraHosts}+ disabled={providerIsDepot}+ warningText={providerIsDepot ? m.build_provider_warning_unsupported_depot() : undefined}+ />++ <div class="grid gap-4 sm:grid-cols-2">+ <FormInput+ label={m.build_privileged_label()}+ type="switch"+ description={m.build_privileged_description()}+ bind:input={$inputs.privileged}+ disabled={providerIsLocal}+ warningText={providerIsLocal ? m.build_provider_warning_unsupported_local() : undefined}+ />++ <FormInput+ label={m.build_no_cache_label()}+ type="switch"+ description={m.build_no_cache_description()}+ bind:input={$inputs.noCache}+ />+ </div>++ <FormInput+ label={m.build_pull_base_images_label()}+ type="switch"+ description={m.build_pull_base_images_description()}+ bind:input={$inputs.pull}+ />+ </div>+ </Collapsible.Content>+ </Collapsible.Root>+ </div>+ </form>+</div>diff --git a/frontend/src/routes/(app)/images/builds/components/build-controls.svelte b/frontend/src/routes/(app)/images/builds/components/build-controls.sveltenew file mode 100644index 000000000..2debefcba--- /dev/null+++ b/frontend/src/routes/(app)/images/builds/components/build-controls.svelte@@ -0,0 +1,70 @@+<script lang="ts">+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';+ import { Label } from '$lib/components/ui/label';+ import * as Select from '$lib/components/ui/select/index.js';+ import { Switch } from '$lib/components/ui/switch/index.js';+ import { m } from '$lib/paraglide/messages';+ import type { BuildFormInputsStore, BuildProviderOption } from './build-form.types';++ let {+ inputs,+ providerOptions,+ selectedProviderLabel,+ isBuilding = false,+ onBuild+ }: {+ inputs: BuildFormInputsStore;+ providerOptions: BuildProviderOption[];+ selectedProviderLabel: string;+ isBuilding?: boolean;+ onBuild?: () => void;+ } = $props();+</script>++<div class="flex flex-wrap items-center justify-end gap-3">+ <Select.Root type="single" bind:value={$inputs.provider.value}>+ <Select.Trigger size="sm" class="w-[160px]">+ <span class="truncate">{selectedProviderLabel}</span>+ </Select.Trigger>+ <Select.Content>+ {#each providerOptions as option (option.value)}+ <Select.Item value={option.value}>+ <div class="flex flex-col items-start gap-0.5">+ <span class="font-medium">{option.label}</span>+ {#if option.description}+ <span class="text-muted-foreground text-xs">{option.description}</span>+ {/if}+ </div>+ </Select.Item>+ {/each}+ </Select.Content>+ </Select.Root>++ <div class="bg-border hidden h-6 w-px lg:block"></div>++ <div class="flex items-center gap-2">+ <Switch id="build-push" checked={$inputs.push.value} onCheckedChange={(v) => ($inputs.push.value = v === true)} />+ <Label for="build-push" class="text-sm">{m.push()}</Label>+ </div>++ <div class="flex items-center gap-2">+ <Switch+ id="build-load"+ checked={$inputs.load.value}+ onCheckedChange={(v) => ($inputs.load.value = v === true)}+ disabled={$inputs.provider.value === 'depot'}+ />+ <Label for="build-load" class="text-sm">{m.load()}</Label>+ </div>++ <ArcaneButton+ action="start_all"+ type="button"+ size="sm"+ hoverEffect="lift"+ customLabel={m.build()}+ onclick={() => onBuild?.()}+ loading={isBuilding}+ disabled={isBuilding}+ />+</div>diff --git a/frontend/src/routes/(app)/images/builds/components/build-form.types.ts b/frontend/src/routes/(app)/images/builds/components/build-form.types.tsnew file mode 100644index 000000000..6c6bb448b--- /dev/null+++ b/frontend/src/routes/(app)/images/builds/components/build-form.types.ts@@ -0,0 +1,33 @@+import type { FormInput } from '$lib/utils/form.utils';+import type { Writable } from 'svelte/store';++export type BuildProviderOption = {+ label: string;+ value: 'local' | 'depot';+ description?: string;+};++export type BuildFormInputs = {+ dockerfile: FormInput<string>;+ tags: FormInput<string>;+ target: FormInput<string>;+ buildArgs: FormInput<string>;+ labels: FormInput<string>;+ cacheFrom: FormInput<string>;+ cacheTo: FormInput<string>;+ network: FormInput<string>;+ isolation: FormInput<string>;+ shmSize: FormInput<string>;+ ulimits: FormInput<string>;+ entitlements: FormInput<string>;+ privileged: FormInput<boolean>;+ extraHosts: FormInput<string>;+ platforms: FormInput<string>;+ noCache: FormInput<boolean>;+ pull: FormInput<boolean>;+ provider: FormInput<'local' | 'depot'>;+ push: FormInput<boolean>;+ load: FormInput<boolean>;+};++export type BuildFormInputsStore = Writable<BuildFormInputs>;diff --git a/frontend/src/routes/(app)/images/builds/components/build-output-panel.svelte b/frontend/src/routes/(app)/images/builds/components/build-output-panel.sveltenew file mode 100644index 000000000..282a719c4--- /dev/null+++ b/frontend/src/routes/(app)/images/builds/components/build-output-panel.svelte@@ -0,0 +1,149 @@+<script lang="ts">+ import { Progress } from '$lib/components/ui/progress/index.js';+ import SwitchWithLabel from '$lib/components/form/labeled-switch.svelte';+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';+ import { TerminalIcon } from '$lib/icons';+ import { m } from '$lib/paraglide/messages';++ type LayerStats = {+ total: number;+ completed: number;+ downloading: number;+ extracting: number;+ };++ type AutoScrollParams = {+ enabled: boolean;+ key: number;+ };++ let {+ logLines,+ layerStats,+ aggregateStatus,+ progressValue,+ isIndeterminate,+ hasReachedComplete,+ buildError,+ autoScroll = $bindable(true),+ isBuilding = false,+ onReset+ }: {+ logLines: string[];+ layerStats: LayerStats;+ aggregateStatus: string;+ progressValue: number;+ isIndeterminate: boolean;+ hasReachedComplete: boolean;+ buildError: string;+ autoScroll?: boolean;+ isBuilding?: boolean;+ onReset?: () => void;+ } = $props();++ function autoScrollToBottom(node: HTMLElement, params: AutoScrollParams) {+ let current = params;+ const scroll = () => {+ if (!current.enabled) return;+ node.scrollTop = node.scrollHeight;+ };+ scroll();+ return {+ update(next: AutoScrollParams) {+ current = next;+ scroll();+ }+ };+ }+</script>++<div class="flex h-full flex-col p-8">+ <!-- Progress section with enhanced styling -->+ <div+ class="mb-6 shrink-0 space-y-4 rounded-2xl border border-zinc-800/50 bg-gradient-to-br from-zinc-900/50 to-zinc-900/30 p-5"+ >+ <div class="flex items-center justify-between">+ <div class="flex items-center gap-3">+ <div+ class={`size-2 rounded-full ${+ buildError+ ? 'bg-destructive'+ : hasReachedComplete+ ? 'bg-green-500'+ : isBuilding+ ? 'animate-pulse bg-blue-500'+ : 'bg-muted-foreground/30'+ }`}+ ></div>+ <span class="text-sm font-medium">+ {#if hasReachedComplete}+ {m.build_completed()}+ {:else if layerStats.total > 0}+ {aggregateStatus} · {m.progress_layers_status({ completed: layerStats.completed, total: layerStats.total })}+ {:else}+ {aggregateStatus || m.idle()}+ {/if}+ </span>+ </div>+ <div class="flex items-center gap-3">+ {#if !isIndeterminate || hasReachedComplete}+ <span class="text-muted-foreground text-sm font-medium">{progressValue}%</span>+ {/if}+ <SwitchWithLabel+ id="auto-scroll"+ checked={autoScroll}+ label={m.auto_scroll()}+ onCheckedChange={(v) => (autoScroll = v)}+ />+ </div>+ </div>+ <Progress+ value={hasReachedComplete || isIndeterminate ? 100 : progressValue}+ max={100}+ class="h-1.5 w-full"+ indeterminate={isIndeterminate && !hasReachedComplete}+ />+ </div>++ <!-- Terminal output with refined styling -->+ <div+ use:autoScrollToBottom={{ enabled: autoScroll, key: logLines.length }}+ class="group relative min-h-0 flex-1 overflow-auto rounded-2xl border border-zinc-900/50 bg-gradient-to-br from-zinc-950 via-zinc-950 to-black p-5 font-mono text-[13px] leading-[1.7] text-zinc-50 shadow-2xl shadow-black/50"+ >+ <!-- Subtle scanline effect overlay -->+ <div+ class="pointer-events-none absolute inset-0 bg-gradient-to-b from-transparent via-white/[0.02] to-transparent opacity-40"+ ></div>++ <div class="relative">+ {#if logLines.length === 0}+ <div class="flex min-h-[200px] items-center justify-center">+ <div class="text-center">+ <TerminalIcon class="mx-auto mb-3 size-8 text-zinc-700" />+ <p class="text-sm text-zinc-500">{m.build_output_placeholder()}</p>+ </div>+ </div>+ {:else}+ {#each logLines as line, idx (idx)}+ <div class="rounded px-1 py-0.5 break-words whitespace-pre-wrap transition-colors hover:bg-white/[0.03]">{line}</div>+ {/each}+ {/if}+ </div>+ </div>++ <!-- Error display -->+ {#if buildError}+ <div class="border-destructive/30 bg-destructive/10 text-destructive mt-4 shrink-0 rounded-xl border p-4 text-sm">+ {buildError}+ </div>+ {/if}++ <!-- Clear button -->+ {#if logLines.length > 0 && !isBuilding}+ <div class="mt-4 shrink-0">+ <ArcaneButton action="base" tone="outline" size="sm" onclick={() => onReset?.()}>+ {m.clear_output()}+ </ArcaneButton>+ </div>+ {/if}+</div>diff --git a/frontend/src/routes/(app)/images/builds/components/build-workspace-panel.svelte b/frontend/src/routes/(app)/images/builds/components/build-workspace-panel.sveltenew file mode 100644index 000000000..aac001f5d--- /dev/null+++ b/frontend/src/routes/(app)/images/builds/components/build-workspace-panel.svelte@@ -0,0 +1,63 @@+<script lang="ts">+ import { goto } from '$app/navigation';+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';+ import BuildWorkspaceBrowser from '../build-workspace-browser.svelte';+ import { buildWorkspaceService } from '$lib/services/build-workspace-service';+ import { m } from '$lib/paraglide/messages';+ import { FolderOpenIcon, SettingsIcon } from '$lib/icons';+ import type { FileProvider } from '$lib/components/file-browser';++ let {+ rootLabel,+ rootPath,+ contextDir,+ onSelectContext+ }: {+ rootLabel: string;+ rootPath: string;+ contextDir: string;+ onSelectContext?: (path: string) => void;+ } = $props();++ const provider: FileProvider = {+ list: (path: string) => buildWorkspaceService.listDirectory(path),+ mkdir: (path: string) => buildWorkspaceService.createDirectory(path),+ upload: (path: string, file: File) => buildWorkspaceService.uploadFile(path, file),+ delete: (path: string) => buildWorkspaceService.deleteFile(path),+ download: (path: string) => buildWorkspaceService.downloadFile(path),+ getContent: (path: string) => buildWorkspaceService.getFileContent(path)+ };+</script>++<div class="flex h-full flex-col">+ <div class="relative border-b border-zinc-800/50 bg-gradient-to-r from-zinc-900/50 to-transparent px-4 py-3">+ <div class="absolute inset-0 bg-gradient-to-br from-blue-500/5 via-transparent to-transparent"></div>+ <div class="relative flex items-center justify-between">+ <div class="flex items-center gap-3">+ <div+ class="flex size-9 items-center justify-center rounded-lg bg-gradient-to-br from-blue-500/20 to-cyan-500/10 ring-1 ring-blue-400/20"+ >+ <FolderOpenIcon class="size-4 text-blue-400" />+ </div>+ <div>+ <h2 class="text-sm font-semibold tracking-tight">{m.build_workspace_files()}</h2>+ <p+ class="text-muted-foreground mt-0.5 max-w-[220px] truncate text-xs sm:max-w-[280px] lg:max-w-[360px]"+ title={contextDir}+ >+ {m.build_context()}: {contextDir}+ </p>+ </div>+ </div>+ <ArcaneButton action="base" tone="ghost" size="sm" onclick={() => goto('/settings/builds')} class="hover:bg-white/5">+ <SettingsIcon class="size-4" />+ </ArcaneButton>+ </div>+ </div>++ <div class="flex min-h-0 flex-1 flex-col overflow-hidden">+ <div class="flex min-h-0 flex-1 flex-col p-4">+ <BuildWorkspaceBrowser {provider} {rootLabel} {rootPath} onSelectContext={(path: string) => onSelectContext?.(path)} />+ </div>+ </div>+</div>diff --git a/frontend/src/routes/(app)/projects/[projectId]/+page.svelte b/frontend/src/routes/(app)/projects/[projectId]/+page.svelteindex a9d2abcda..50ee56f34 100644--- a/frontend/src/routes/(app)/projects/[projectId]/+page.svelte+++ b/frontend/src/routes/(app)/projects/[projectId]/+page.svelte@@ -89,6 +89,7 @@);let isGitOpsManaged = $derived(!!project?.gitOpsManagedBy);+ let hasBuildDirective = $derived(!!project?.hasBuildDirective);let canEditName = $derived(!isGitOpsManaged && !isLoading.saving && project?.status !== 'running' && project?.status !== 'partially running');@@ -439,6 +440,7 @@name={project.name}type="project"itemState={project.status}+ {hasBuildDirective}desktopVariant="adaptive"bind:startLoading={isLoading.deploying}bind:stopLoading={isLoading.stopping}diff --git a/frontend/src/routes/(app)/settings/+layout.svelte b/frontend/src/routes/(app)/settings/+layout.svelteindex 69223075e..3388185fd 100644--- a/frontend/src/routes/(app)/settings/+layout.svelte+++ b/frontend/src/routes/(app)/settings/+layout.svelte@@ -147,6 +147,8 @@return m.notifications_title();case 'api-keys':return m.api_key_page_title();+ case 'build':+ return 'Build';default:return m.sidebar_settings();}diff --git a/frontend/src/routes/(app)/settings/+page.svelte b/frontend/src/routes/(app)/settings/+page.svelteindex 195bbed00..2eb27902b 100644--- a/frontend/src/routes/(app)/settings/+page.svelte+++ b/frontend/src/routes/(app)/settings/+page.svelte@@ -12,7 +12,8 @@ApiKeyIcon,ApperanceIcon,CloseIcon,- JobsIcon+ JobsIcon,+ CodeIcon} from '$lib/icons';import { ArcaneButton } from '$lib/components/arcane-button/index.js';import { Card } from '$lib/components/ui/card';@@ -39,7 +40,8 @@bell: NotificationsIcon,user: UserIcon,apikey: ApiKeyIcon,- jobs: JobsIcon+ jobs: JobsIcon,+ code: CodeIcon};onMount(async () => {diff --git a/frontend/src/routes/(app)/settings/builds/+page.svelte b/frontend/src/routes/(app)/settings/builds/+page.sveltenew file mode 100644index 000000000..a372155d3--- /dev/null+++ b/frontend/src/routes/(app)/settings/builds/+page.svelte@@ -0,0 +1,205 @@+<script lang="ts">+ import { onMount } from 'svelte';+ import { z } from 'zod/v4';+ import settingsStore from '$lib/stores/config-store';+ import { SettingsPageLayout } from '$lib/layouts';+ import { Label } from '$lib/components/ui/label';+ import { CodeIcon } from '$lib/icons';+ import TextInputWithLabel from '$lib/components/form/text-input-with-label.svelte';+ import SelectWithLabel from '$lib/components/form/select-with-label.svelte';+ import { m } from '$lib/paraglide/messages';+ import { createSettingsForm } from '$lib/utils/settings-form.util';+ import { settingsService } from '$lib/services/settings-service';++ let { data } = $props();++ const currentSettings = $derived($settingsStore || data.settings!);+ const isReadOnly = $derived.by(() => $settingsStore?.uiConfigDisabled);++ const formSchema = z.object({+ buildProvider: z.enum(['local', 'depot']).default('local'),+ buildsDirectory: z.string().default(''),+ buildTimeout: z.coerce.number().int().min(60).max(14400),+ depotProjectId: z.string().default(''),+ depotToken: z.string().optional().default('')+ });++ const getFormDefaults = () => {+ const settings = $settingsStore || data.settings!;+ return {+ buildProvider: settings.buildProvider,+ buildsDirectory: settings.buildsDirectory,+ buildTimeout: settings.buildTimeout,+ depotProjectId: settings.depotProjectId,+ depotToken: ''+ };+ };++ const { formInputs, registerOnMount } = createSettingsForm({+ schema: formSchema,+ currentSettings: getFormDefaults(),+ getCurrentSettings: getFormDefaults,+ onSave: async (payload) => {+ const updated = { ...payload } as Record<string, unknown>;+ if (!updated.depotToken) {+ delete updated.depotToken;+ }+ await settingsService.updateSettings(updated);+ },+ onSuccess: () => {+ $formInputs.depotToken.value = '';+ },+ onReset: () => {+ $formInputs.depotToken.value = '';+ },+ successMessage: m.build_settings_saved()+ });++ const existingDepotProjectId = $derived((currentSettings.depotProjectId ?? '').trim());+ const existingDepotToken = $derived((currentSettings.depotToken ?? '').trim());+ const depotConfigured = $derived(Boolean(currentSettings.depotConfigured));++ const depotCredentialsPresent = $derived.by(() => {+ const projectId = ($formInputs.depotProjectId.value ?? '').trim() || existingDepotProjectId;+ const token = ($formInputs.depotToken.value ?? '').trim() || existingDepotToken;+ return (Boolean(projectId) && Boolean(token)) || depotConfigured;+ });++ const providerOptions = $derived.by(() => {+ const options = [{ label: m.local_docker(), value: 'local', description: m.local_docker_description() }];+ if (depotCredentialsPresent) {+ options.push({ label: m.depot(), value: 'depot', description: m.depot_description() });+ }+ return options;+ });++ $effect(() => {+ if (!depotCredentialsPresent && $formInputs.buildProvider.value === 'depot') {+ $formInputs.buildProvider.value = 'local';+ }+ });++ onMount(() => registerOnMount());+</script>++<SettingsPageLayout+ title={m.build_settings_page_title()}+ description={m.build_settings_page_description()}+ icon={CodeIcon}+ pageType="form"+ showReadOnlyTag={isReadOnly}+>+ {#snippet mainContent()}+ <fieldset disabled={isReadOnly} class="relative space-y-8">+ <div class="space-y-4">+ <h3 class="text-lg font-medium">{m.build_settings_workspace_section_title()}</h3>+ <div class="bg-card rounded-lg border shadow-sm">+ <div class="space-y-6 p-6">+ <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">+ <div>+ <Label class="text-base">{m.build_settings_directory_label()}</Label>+ <p class="text-muted-foreground mt-1 text-sm">{m.build_settings_directory_description()}</p>+ </div>+ <div class="max-w-xl">+ <TextInputWithLabel+ bind:value={$formInputs.buildsDirectory.value}+ error={$formInputs.buildsDirectory.error}+ label={m.build_settings_directory_label()}+ placeholder={m.build_settings_directory_placeholder()}+ helpText={m.build_settings_directory_help()}+ />+ </div>+ </div>+ </div>+ </div>+ </div>++ <div class="space-y-4">+ <h3 class="text-lg font-medium">{m.build_settings_provider_section_title()}</h3>+ <div class="bg-card rounded-lg border shadow-sm">+ <div class="space-y-6 p-6">+ <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">+ <div>+ <Label class="text-base">{m.build_settings_default_provider_label()}</Label>+ <p class="text-muted-foreground mt-1 text-sm">{m.build_settings_default_provider_description()}</p>+ </div>+ <div class="max-w-xs">+ <SelectWithLabel+ id="build-provider"+ name="buildProvider"+ bind:value={$formInputs.buildProvider.value}+ error={$formInputs.buildProvider.error}+ label={m.build_settings_provider_section_title()}+ options={providerOptions}+ />+ {#if !depotCredentialsPresent && !depotConfigured}+ <p class="text-muted-foreground mt-2 text-xs">{m.build_settings_depot_enable_hint()}</p>+ {/if}+ </div>+ </div>++ <div class="border-t pt-6">+ <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">+ <div>+ <Label class="text-base">{m.build_settings_timeout_label()}</Label>+ <p class="text-muted-foreground mt-1 text-sm">{m.build_settings_timeout_description()}</p>+ </div>+ <div class="max-w-xs">+ <TextInputWithLabel+ bind:value={$formInputs.buildTimeout.value}+ error={$formInputs.buildTimeout.error}+ label={m.build_settings_timeout_label()}+ placeholder={m.build_settings_timeout_placeholder()}+ helpText={m.build_settings_timeout_help()}+ type="number"+ />+ </div>+ </div>+ </div>+ </div>+ </div>+ </div>++ <div class="space-y-4">+ <h3 class="text-lg font-medium">{m.build_settings_depot_section_title()}</h3>+ <div class="bg-card rounded-lg border shadow-sm">+ <div class="space-y-6 p-6">+ <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">+ <div>+ <Label class="text-base">{m.build_settings_depot_project_id_label()}</Label>+ <p class="text-muted-foreground mt-1 text-sm">{m.build_settings_depot_project_id_description()}</p>+ </div>+ <div class="max-w-xl">+ <TextInputWithLabel+ bind:value={$formInputs.depotProjectId.value}+ error={$formInputs.depotProjectId.error}+ label={m.build_settings_depot_project_id_label()}+ placeholder={m.build_settings_depot_project_id_placeholder()}+ />+ </div>+ </div>++ <div class="border-t pt-6">+ <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">+ <div>+ <Label class="text-base">{m.build_settings_depot_token_label()}</Label>+ <p class="text-muted-foreground mt-1 text-sm">{m.build_settings_depot_token_description()}</p>+ </div>+ <div class="max-w-xl">+ <TextInputWithLabel+ bind:value={$formInputs.depotToken.value}+ error={$formInputs.depotToken.error}+ label={m.build_settings_depot_token_label()}+ placeholder={m.build_settings_depot_token_placeholder()}+ type="password"+ helpText={m.build_settings_depot_token_help()}+ />+ </div>+ </div>+ </div>+ </div>+ </div>+ </div>+ </fieldset>+ {/snippet}+</SettingsPageLayout>diff --git a/frontend/src/routes/(app)/settings/timeouts/+page.svelte b/frontend/src/routes/(app)/settings/timeouts/+page.svelteindex be8c59827..eda8a9878 100644--- a/frontend/src/routes/(app)/settings/timeouts/+page.svelte+++ b/frontend/src/routes/(app)/settings/timeouts/+page.svelte@@ -24,14 +24,25 @@proxyRequestTimeout: z.coerce.number().int().min(10).max(600)});- let { formInputs, registerOnMount } = $derived(- createSettingsForm({- schema: formSchema,- currentSettings,- getCurrentSettings: () => $settingsStore || data.settings!,- successMessage: m.timeouts_save()- })- );+ const getFormDefaults = () => {+ const settings = $settingsStore || data.settings!;+ return {+ dockerApiTimeout: settings.dockerApiTimeout,+ dockerImagePullTimeout: settings.dockerImagePullTimeout,+ trivyScanTimeout: settings.trivyScanTimeout,+ gitOperationTimeout: settings.gitOperationTimeout,+ httpClientTimeout: settings.httpClientTimeout,+ registryTimeout: settings.registryTimeout,+ proxyRequestTimeout: settings.proxyRequestTimeout+ };+ };++ const { formInputs, registerOnMount } = createSettingsForm({+ schema: formSchema,+ currentSettings: getFormDefaults(),+ getCurrentSettings: getFormDefaults,+ successMessage: m.timeouts_save()+ });onMount(() => registerOnMount());</script>diff --git a/go.work.sum b/go.work.sumindex 643fb0279..459bb891f 100644--- a/go.work.sum+++ b/go.work.sum@@ -61,6 +61,7 @@ github.com/AzureAD/microsoft-authentication-library-for-go v1.4.2 h1:oygO0locgZJgithub.com/AzureAD/microsoft-authentication-library-for-go v1.4.2/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI=github.com/AzureAD/microsoft-authentication-library-for-go v1.6.0 h1:XRzhVemXdgvJqCH0sFfrBUTnUJSBrBf7++ypk+twtRs=github.com/AzureAD/microsoft-authentication-library-for-go v1.6.0/go.mod h1:HKpQxkWaGLJ+D/5H8QRpyQXA1eKjxkFlOMwck5+33Jk=+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=github.com/BurntSushi/toml v1.5.0 h1:W5quZX/G/csjUnuI8SUYlsHs9M38FC7znL0lIO+DvMg=github.com/BurntSushi/toml v1.5.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=github.com/ClickHouse/clickhouse-go v1.4.3 h1:iAFMa2UrQdR5bHJ2/yaSLffZkxpcOYQMCUuKeNXGdqc=@@ -80,6 +81,8 @@ github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d h1:G0m3OIz70MZUWgithub.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=github.com/VividCortex/ewma v1.2.0 h1:f58SaIzcDXrSy3kWaHNvuJgJ3Nmz59Zji6XoJR/q1ow=github.com/VividCortex/ewma v1.2.0/go.mod h1:nz4BbCtbLyFDeC9SUHbtcT5644juEuWfUAUnGx7j5l4=+github.com/adrg/xdg v0.4.0 h1:RzRqFcjH4nE5C6oTAxhBtoE2IRyjBSa62SCbyPidvls=+github.com/adrg/xdg v0.4.0/go.mod h1:N6ag73EX4wyxeaoeHctc1mas01KZgsj5tYiAIwqJE/E=github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo=github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=github.com/agnivade/levenshtein v1.2.1 h1:EHBY3UOn1gwdy/VbFwgo4cxecRznFk7fKWN1KOX7eoM=@@ -87,6 +90,8 @@ github.com/agnivade/levenshtein v1.2.1/go.mod h1:QVVI16kDrtSuwcpd0p1+xMC6Z/VfhtCgithub.com/alecthomas/kingpin/v2 v2.4.0 h1:f48lwail6p8zpO1bC4TxtqACaGqHYA22qkHjHpqDjYY=github.com/alecthomas/kingpin/v2 v2.4.0/go.mod h1:0gyi0zQnjuFk8xrkNKamJoyUo382HRL7ATRpFZCw6tE=github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc h1:cAKDfWh5VpdgMhJosfJnn5/FoN2SRZ4p7fJNX58YPaU=+github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=+github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 h1:s6gZFSlWYmbqAuRjVTiNNhvNRfY2Wxp9nhfyel4rklc=github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE=github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=@@ -184,6 +189,8 @@ github.com/aws/smithy-go v1.22.5/go.mod h1:t1ufH5HMublsJYulve2RKmHDC15xu1f26kHCpgithub.com/aws/smithy-go v1.23.2 h1:Crv0eatJUQhaManss33hS5r40CG3ZFH+21XSkqMrIUM=github.com/aws/smithy-go v1.23.2/go.mod h1:LEj2LM3rBRQJxPZTB4KuzZkaZYnZPnvgIhb4pu07mx0=github.com/aymanbagabas/go-udiff v0.4.0/go.mod h1:0L9PGwj20lrtmEMeyw4WKJ/TMyDtvAoK9bf2u/mNo3w=+github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=+github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=github.com/bitly/go-hostpool v0.1.0 h1:XKmsF6k5el6xHG3WPJ8U0Ku/ye7njX7W81Ng7O2ioR0=github.com/bitly/go-simplejson v0.5.0 h1:6IH+V8/tVMab511d5bn4M7EwGXZf9Hj6i2xSwkNEM+Y=github.com/bits-and-blooms/bitset v1.24.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8=@@ -239,6 +246,8 @@ github.com/containerd/accelerated-container-image v1.3.0/go.mod h1:EvKVWor6ZQNUygithub.com/containerd/btrfs/v2 v2.0.0 h1:FN4wsx7KQrYoLXN7uLP0vBV4oVWHOIKDRQ1G2Z0oL5M=github.com/containerd/btrfs/v2 v2.0.0/go.mod h1:swkD/7j9HApWpzl8OHfrHNxppPd9l44DFZdF94BUj9k=github.com/containerd/containerd v1.7.23 h1:H2CClyUkmpKAGlhQp95g2WXHfLYc7whAuvZGBNYOOwQ=+github.com/containerd/containerd v1.7.27 h1:yFyEyojddO3MIGVER2xJLWoCIn+Up4GaHFquP7hsFII=+github.com/containerd/containerd v1.7.27/go.mod h1:xZmPnl75Vc+BLGt4MIfu6bp+fy03gdHAn9bz+FreFR0=github.com/containerd/containerd/v2 v2.2.0-rc.0/go.mod h1:X7H17UATRidzfNzb5vS/l30qEJk0ktoTEU1thMh0Nbk=github.com/containerd/continuity v0.4.1/go.mod h1:F6PTNCKepoxEaXLQp3wDAjygEnImnZ/7o4JzpodfroQ=github.com/containerd/fuse-overlayfs-snapshotter/v2 v2.1.6 h1:gfW1JsN//B97zhsQ84Kkar7WJqod1fmWf8zKHmz+ieY=@@ -258,6 +267,7 @@ github.com/containerd/nri v0.11.0/go.mod h1:bjGTLdUA58WgghKHg8azFMGXr05n1wDHrt3Ngithub.com/containerd/otelttrpc v0.1.0 h1:UOX68eVTE8H/T45JveIg+I22Ev2aFj4qPITCmXsskjw=github.com/containerd/otelttrpc v0.1.0/go.mod h1:XhoA2VvaGPW1clB2ULwrBZfXVuEWuyOd2NUD1IM0yTg=github.com/containerd/platforms v1.0.0-rc.1/go.mod h1:J71L7B+aiM5SdIEqmd9wp6THLVRzJGXfNuWCZCllLA4=+github.com/containerd/stargz-snapshotter v0.17.0 h1:djNS4KU8ztFhLdEDZ1bsfzOiYuVHT6TgSU5qwRk+cNc=github.com/containerd/stargz-snapshotter v0.17.0/go.mod h1:ySEul1ck7jCE4jqsuFCo8FFLrHU20UWQeI9g7mdsanI=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=@@ -277,8 +287,12 @@ github.com/coreos/go-systemd/v22 v22.6.0 h1:aGVa/v8B7hpb0TKl0MWoAavPDmHvobFe5R5zgithub.com/coreos/go-systemd/v22 v22.6.0/go.mod h1:iG+pp635Fo7ZmV/j14KUcmEyWF+0X7Lua8rrTWzYgWU=github.com/cpuguy83/go-md2man/v2 v2.0.7 h1:zbFlGlXEAKlwXpmvle3d8Oe3YnkKIK4xSRTd3sHPnBo=github.com/cpuguy83/go-md2man/v2 v2.0.7/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=+github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=github.com/cznic/mathutil v0.0.0-20180504122225-ca4c9f2c1369 h1:XNT/Zf5l++1Pyg08/HV04ppB0gKxAqtZQBRYiYrUuYk=github.com/cznic/mathutil v0.0.0-20180504122225-ca4c9f2c1369/go.mod h1:e6NPNENfs9mPDVNRekM7lKScauxd5kXTr1Mfyig6TDM=+github.com/danielgtaylor/huma/v2 v2.35.0 h1:FRg3FgVKcMogVhbNY7FjyTwk+p/orLBR3hQBvXXg7dw=+github.com/danielgtaylor/huma/v2 v2.35.0/go.mod h1:3elp5brzdyyZsPlDVvf6w8RLnklKp3abolr+5op3fP0=github.com/danielgtaylor/mexpr v1.9.1 h1:nA9bsGRmNlJeVCPFgGf7WhrLuKag/+iWfOaJ03iKFPI=github.com/danielgtaylor/mexpr v1.9.1/go.mod h1:kAivYNRnBeE/IJinqBvVFvLrX54xX//9zFYwADo4Bc8=github.com/danielgtaylor/shorthand/v2 v2.2.0 h1:hVsemdRq6v3JocP6YRTfu9rOoghZI9PFmkngdKqzAVQ=@@ -292,12 +306,15 @@ github.com/digitorus/pkcs7 v0.0.0-20230713084857-e76b763bdc49/go.mod h1:SKVExuS+github.com/dimchansky/utfbom v1.1.1 h1:vV6w1AhK4VMnhBno/TPVCoK9U/LP0PkLCS9tbxHdi/U=github.com/dimchansky/utfbom v1.1.1/go.mod h1:SxdoEBH5qIqFocHMyGOXVAybYJdr71b1Q/j0mACtrfE=github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=+github.com/docker/cli v29.0.3+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=github.com/docker/cli v29.1.4+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=github.com/docker/cli v29.1.5+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=github.com/docker/cli-docs-tool v0.10.0/go.mod h1:5EM5zPnT2E7yCLERZmrDA234Vwn09fzRHP4aX1qwp1U=github.com/docker/cli-docs-tool v0.11.0 h1:7d8QARFb7QEobizqxmEM7fOteZEHwH/zWgHQtHZEcfE=github.com/docker/cli-docs-tool v0.11.0/go.mod h1:ma8BKiisUo8D6W05XEYIh3oa1UbgrZhi1nowyKFJa8Q=github.com/docker/compose/v5 v5.0.0/go.mod h1:BurapGv8zmYnsbSmlpCz5EU2Pi3YFV/PjeUnoFpcw64=+github.com/docker/docker-credential-helpers v0.9.3/go.mod h1:x+4Gbw9aGmChi3qTLZj8Dfn0TD20M/fuWy0E5+WDeCo=+github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc=github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c h1:+pKlWGMw7gf6bQ+oDZB4KHQFypsfjYlq/C4rfL7D3g8=github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c/go.mod h1:Uw6UezgYA44ePAFQYUehOuCzmy5zmg/+nl2ZfMWGkpA=github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 h1:UhxFibDNY/bfvqU5CAUmr9zpesgbU6SWc8/B4mflAE4=@@ -335,9 +352,13 @@ github.com/form3tech-oss/jwt-go v3.2.5+incompatible h1:/l4kBbb4/vGSsdtB5nUe8L7B9github.com/form3tech-oss/jwt-go v3.2.5+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=github.com/francoispqt/gojay v1.2.13 h1:d2m3sFjloqoIUQU3TsHBgj6qg/BVGlTBeHDUmyJnXKk=github.com/francoispqt/gojay v1.2.13/go.mod h1:ehT5mTG4ua4581f1++1WLG0vPdaA9HaiDsoyrBGkyDY=+github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=+github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=+github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU=github.com/fsouza/fake-gcs-server v1.17.0 h1:OeH75kBZcZa3ZE+zz/mFdJ2btt9FgqfjI7gIh9+5fvk=github.com/fsouza/fake-gcs-server v1.17.0/go.mod h1:D1rTE4YCyHFNa99oyJJ5HyclvN/0uQR+pM/VdlL83bw=github.com/getarcaneapp/arcane/types v0.0.0-20251219045603-8a9960a2bf04/go.mod h1:7Wj+0JnpYq4RQS+otyM6e4zkyJKDC01wxkWPyFCHwZA=+github.com/getarcaneapp/arcane/types v0.0.0-20260209233421-0952125a149f/go.mod h1:oTa9ugCyTbytH0YTl8Wzlh1mtlMSTT8s4exVzd7zaUo=github.com/go-chi/chi/v5 v5.2.2 h1:CMwsvRVTbXVytCk1Wd72Zy1LAsAh9GxMmSNWLHCG618=github.com/go-chi/chi/v5 v5.2.2/go.mod h1:L2yAIGWB3H+phAw1NxKwWM+7eUH/lU8pOMm5hHcoops=github.com/go-chi/chi/v5 v5.2.5 h1:Eg4myHZBjyvJmAFjFvWgrqDTXFyOzjj7YIm3L3mu6Ug=@@ -349,7 +370,10 @@ github.com/go-jose/go-jose/v3 v3.0.0 h1:s6rrhirfEP/CGIoc6p+PZAeogN2SxKav6Wp7+dyMgithub.com/go-jose/go-jose/v3 v3.0.0/go.mod h1:RNkWWRld676jZEYoV3+XK8L2ZnNSvIsxFMht0mSX+u8=github.com/go-jose/go-jose/v4 v4.1.2/go.mod h1:22cg9HWM1pOlnRiY+9cQYJ9XHmya1bYW8OeDM6Ku6Oo=github.com/go-kit/kit v0.8.0 h1:Wz+5lgoB0kkuqLEc6NVmwRknTKP6dTGbSqvhZtBI/j0=+github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=+github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=github.com/go-logfmt/logfmt v0.4.0 h1:MP4Eh7ZCb31lleYCFuwm0oe4/YGak+5l1vA2NOE80nA=+github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ=github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY=@@ -363,6 +387,7 @@ github.com/go-sql-driver/mysql v1.9.3 h1:U/N249h2WzJ3Ukj8SowVFjdtZKfu9vlLZxjPXV1github.com/go-sql-driver/mysql v1.9.3/go.mod h1:qn46aNg1333BRMNU69Lq93t8du/dwxI64Gl8i5p1WMU=github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=+github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=github.com/go-viper/mapstructure/v2 v2.4.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=github.com/gobuffalo/here v0.6.0 h1:hYrd0a6gDmWxBM4TnrGw8mQg24iSVoIkHEk7FodQcBI=github.com/gobuffalo/here v0.6.0/go.mod h1:wAG085dHOYqUpf+Ap+WOdrPTp5IYcDAs/x7PLa8Y5fM=@@ -381,6 +406,9 @@ github.com/gofiber/fiber/v2 v2.52.9 h1:YjKl5DOiyP3j0mO61u3NTmK7or8GzzWzCFzkboyP5github.com/gofiber/fiber/v2 v2.52.9/go.mod h1:YEcBbO/FB+5M1IZNBP9FO3J9281zgPAreiI1oqg8nDw=github.com/gofiber/fiber/v2 v2.52.11 h1:5f4yzKLcBcF8ha1GQTWB+mpblWz3Vz6nSAbTL31HkWs=github.com/gofiber/fiber/v2 v2.52.11/go.mod h1:YEcBbO/FB+5M1IZNBP9FO3J9281zgPAreiI1oqg8nDw=+github.com/gogo/googleapis v1.4.1 h1:1Yx4Myt7BxzvUr5ldGSbwYiZG6t9wGBZ+8/fX3Wvtq0=+github.com/gogo/googleapis v1.4.1/go.mod h1:2lpHqI5OcWCtVElxXnPt+s8oJvMpySlOyM6xDCrzib4=+github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=github.com/golang-jwt/jwt/v4 v4.5.2 h1:YtQM7lnr8iZ+j5q71MGKkNw9Mn7AjHM68uc9g5fXeUI=github.com/golang-jwt/jwt/v4 v4.5.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=github.com/golang-jwt/jwt/v5 v5.3.0/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE=@@ -393,14 +421,19 @@ 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/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=+github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=+github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=+github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=+github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=@@ -414,6 +447,7 @@ github.com/google/flatbuffers v2.0.8+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6github.com/google/gnostic-models v0.7.0 h1:qwTtogB15McXDaNqTZdzPJRHvaVJlAl+HVQnLmJEJxo=github.com/google/gnostic-models v0.7.0/go.mod h1:whL5G0m6dmc5cPxKc5bdKdEN3UjI7OUGxBlw57miDrQ=github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=@@ -421,6 +455,7 @@ github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=+github.com/google/go-containerregistry v0.20.6/go.mod h1:T0x8MuoAoKX/873bkeSfLD2FAkwCDf9/HZgsFJ02E2Y=github.com/google/go-dap v0.12.0 h1:rVcjv3SyMIrpaOoTAdFDyHs99CwVOItIJGKLQFQhNeM=github.com/google/go-dap v0.12.0/go.mod h1:tNjCASCm5cqePi/RVXXWEVqtnNLV1KTWtYOqu6rZNzc=github.com/google/go-dap v0.12.1-0.20250904181021-d7a2259b058b h1:m+yLjBIoXaMKk6pwd1IJYYgM76+mwcy7J9+cuY7LqmQ=@@ -432,6 +467,7 @@ github.com/google/go-intervals v0.0.2/go.mod h1:MkaR3LNRfeKLPmqgJYs4E66z5InYjmCjgithub.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw=+github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=github.com/google/pprof v0.0.0-20211214055906-6f57359322fd/go.mod h1:KgnwoLYCZ8IQu3XUZ8Nc/bM9CCZFOyjUNOSygVozoDg=github.com/google/pprof v0.0.0-20250820193118-f64d9cf942d6/go.mod h1:I6V7YzU0XDpsHqbsyrghnFZLO1gwK6NPTNvmetQIk9U=github.com/google/s2a-go v0.1.9 h1:LGD7gtMgezd8a/Xak7mEWL0PjoTQFvpRudN895yqKW0=@@ -448,20 +484,21 @@ github.com/gorilla/handlers v1.4.2 h1:0QniY0USkHQ1RGCLfKxeNHK9bkDHGRYGNDFBCS+YARgithub.com/gorilla/handlers v1.4.2/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc h1:GN2Lv3MGO7AS6PrRoT6yV5+wkrOpcszoIsO4+4ds248=github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc/go.mod h1:+JKpmjMGhpgPL+rXZ5nsZieVzvarn86asRlBg4uNGnk=+github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 h1:+9834+KizmvFV7pXQGSXQTsaWhq2GjuNUt0aUU0YBYw=+github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y=github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.1.0 h1:QGLs/O40yoNK9vmy4rhUGBVyMf1lISBGtXRpsu/Qu/o=github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.1.0/go.mod h1:hM2alZsMUni80N33RBe6J0e423LB+odMj7d3EMP9l20=github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0 h1:pRhl55Yx1eC7BZ1N+BBWwnKaMyD8uC+34TLdndZMAKk=github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0/go.mod h1:XKMd7iuf/RGPSMJ/U4HP0zS2Z9Fh8Ps9a+6X26m/tmI=github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.3/go.mod h1:NbCUVmiS4foBGBHOYlCT25+YmGpJ32dZPi75pGEUpj4=github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.1/go.mod h1:tIxuGz/9mpox++sgp9fJjHO0+q1X9/UOWd798aAm22M=+github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2/go.mod h1:pkJQ2tZHJ0aFOVEEot6oZmaVEZcRme73eIFmhiVuRWs=github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c h1:6rhixN/i8ZofjG1Y75iExal34USq5p+wiN1tpie8IrU=github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c/go.mod h1:NMPJylDgVpX0MLRlPy15sqSwOFv/U1GZ2m21JhFfek0=github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed h1:5upAirOpQc1Q53c0bnx2ufif5kANL7bfZWcc6VJWJd8=github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed/go.mod h1:tMWxXQ9wFIaZeTI9F+hmhFiGpFmhOHzyShyFUhRm0H4=github.com/hanwen/go-fuse/v2 v2.8.0 h1:wV8rG7rmCz8XHSOwBZhG5YcVqcYjkzivjmbaMafPlAs=github.com/hanwen/go-fuse/v2 v2.8.0/go.mod h1:yE6D2PqWwm3CbYRxFXV9xUd8Md5d6NG0WBs5spCswmI=-github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=-github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=github.com/hashicorp/go-cty-funcs v0.0.0-20250818135842-6aab67130928 h1:NFpfJOqEV8DUhomtXx9A0FfcMg7OCYRugdyw6Ar/Y7s=github.com/hashicorp/go-cty-funcs v0.0.0-20250818135842-6aab67130928/go.mod h1:YC9ASYt9Z9sQEAtzCe+yaAzi3E7wcxfRphDXtwZoWC0=github.com/hashicorp/go-immutable-radix/v2 v2.1.0 h1:CUW5RYIcysz+D3B+l1mDeXrQ7fUvGGCwJfdASSzbrfo=@@ -470,11 +507,15 @@ github.com/hashicorp/go-retryablehttp v0.7.8 h1:ylXZWnqa7Lhqpk0L1P1LzDtGcCR0rPVUgithub.com/hashicorp/go-retryablehttp v0.7.8/go.mod h1:rjiScheydd+CxvumBsIrFKlx3iS0jrZ7LvzFGFmuKbw=github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=+github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=+github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=github.com/hashicorp/hcl/v2 v2.24.0 h1:2QJdZ454DSsYGoaE6QheQZjtKZSUs9Nh2izTWiwQxvE=github.com/hashicorp/hcl/v2 v2.24.0/go.mod h1:oGoO1FIQYfn/AgyOhlg9qLC6/nOJPX3qGbkZpYAcqfM=github.com/hiddeco/sshsig v0.2.0 h1:gMWllgKCITXdydVkDL+Zro0PU96QI55LwUwebSwNTSw=github.com/hiddeco/sshsig v0.2.0/go.mod h1:nJc98aGgiH6Yql2doqH4CTBVHexQA40Q+hMMLHP4EqE=github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=+github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=+github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=github.com/ianlancetaylor/demangle v0.0.0-20210905161508-09a460cdf81d/go.mod h1:aYm2/VgdVmcIU8iMfdMvDMsRAQjcfZSKFby6HOFvi/w=github.com/ianlancetaylor/demangle v0.0.0-20250417193237-f615e6bd150b/go.mod h1:gx7rwoVhcfuVKG5uya9Hs3Sxj7EIvldVofAWIUtGouw=github.com/intel/goresctrl v0.10.0 h1:Q94PBhLtQM/aVxVTKzB1j/ooMuV+9XleTN1fq2OGsSo=@@ -503,7 +544,10 @@ github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8Hmgithub.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA=github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=+github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=+github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=github.com/juju/loggo v0.0.0-20190526231331-6e530bcce5d8 h1:UUHMLvzt/31azWTN/ifGWef4WUqvXk0iRqdhdy/2uzI=+github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U=github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=github.com/k0kubun/go-ansi v0.0.0-20180517002512-3bf9e2903213 h1:qGQQKEcAR99REcMpsXCp3lJ03zYT1PkRd3kQGPn9GVg=@@ -528,8 +572,10 @@ github.com/klauspost/pgzip v1.2.6/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQgithub.com/knqyf263/go-plugin v0.9.0 h1:CQs2+lOPIlkZVtcb835ZYDEoyyWJWLbSTWeCs0EwTwI=github.com/knqyf263/go-plugin v0.9.0/go.mod h1:2z5lCO1/pez6qGo8CvCxSlBFSEat4MEp1DrnA+f7w8Q=github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=+github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s=github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 h1:T+h1c/A9Gawja4Y9mFVWj2vyii2bbUNDw3kt9VxK2EY=+github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=github.com/kr/pty v1.1.1 h1:VkoXIwSboBpnk99O/KFauAEILuNHv5DVFKZMBN/gUgw=github.com/ktrysmt/go-bitbucket v0.6.4 h1:C8dUGp0qkwncKtAnozHCbbqhptefzEd1I0sfnuy9rYQ=@@ -560,6 +606,10 @@ github.com/letsencrypt/boulder v0.0.0-20240620165639-de9c06129bec h1:2tTW6cDth2Tgithub.com/letsencrypt/boulder v0.0.0-20240620165639-de9c06129bec/go.mod h1:TmwEoGCwIti7BCeJ9hescZgRtatxRE+A72pCoPfmcfk=github.com/letsencrypt/boulder v0.20251110.0 h1:J8MnKICeilO91dyQ2n5eBbab24neHzUpYMUIOdOtbjc=github.com/letsencrypt/boulder v0.20251110.0/go.mod h1:ogKCJQwll82m7OVHWyTuf8eeFCjuzdRQlgnZcCl0V+8=+github.com/lmittmann/tint v1.1.2 h1:2CQzrL6rslrsyjqLDwD11bZ5OpLBPU+g3G/r5LSfS8w=+github.com/lmittmann/tint v1.1.2/go.mod h1:HIS3gSy7qNwGCj+5oRjAutErFBl4BzdQP6cJZ0NfMwE=+github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=+github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=github.com/magiconair/properties v1.8.9 h1:nWcCbLq1N2v/cpNsy5WvQ37Fb+YElfq20WJ/a8RkpQM=github.com/magiconair/properties v1.8.9/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=@@ -573,6 +623,7 @@ github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHshgithub.com/mattn/go-runewidth v0.0.17/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=github.com/mattn/go-runewidth v0.0.19/go.mod h1:XBkDxAl56ILZc9knddidhrOlY5R/pDhgLpndooCuJAs=github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=+github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=github.com/mdlayher/socket v0.5.1 h1:VZaqt6RkGkt2OE9l3GcC6nZkqD3xKeQLyfleW/uBcos=github.com/mdlayher/socket v0.5.1/go.mod h1:TjPLHI1UgwEv5J1B5q0zTZq12A/6H7nKmtTanQE37IQ=github.com/mdlayher/vsock v1.2.1 h1:pC1mTJTvjo1r9n9fbm7S1j04rCgCzhCOS5DY0zqHlnQ=@@ -590,6 +641,7 @@ github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3/go.mod h1:RagcQ7I8Iegithub.com/mistifyio/go-zfs/v3 v3.0.1/go.mod h1:CzVgeB0RvF2EGzQnytKVvVSDwmKJXxkOTUGbNrTja/k=github.com/mistifyio/go-zfs/v3 v3.1.0 h1:FZaylcg0hjUp27i23VcJJQiuBeAZjrC8lPqCGM1CopY=github.com/mistifyio/go-zfs/v3 v3.1.0/go.mod h1:CzVgeB0RvF2EGzQnytKVvVSDwmKJXxkOTUGbNrTja/k=+github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=github.com/mitchellh/go-ps v1.0.0 h1:i6ampVEEF4wQFF+bkYfwYgY+F/uYJDktmvLPf7qIgjc=github.com/mitchellh/go-ps v1.0.0/go.mod h1:J4lOc8z8yJs6vUwklHw2XEIiT4z4C40KtWVN3nvg8Pg=github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0=@@ -599,7 +651,9 @@ github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUhgithub.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=github.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/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/client v0.2.1/go.mod h1:O+/tw5d4a1Ha/ZA/tPxIZJapJRUS6LNZ1wiVRxYHyUE=github.com/moby/patternmatcher v0.5.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc=@@ -616,11 +670,15 @@ github.com/moby/sys/mount v0.3.4 h1:yn5jq4STPztkkzSKpZkLcmjue+bZJ0u2AuQY1iNI1Ww=github.com/moby/sys/mount v0.3.4/go.mod h1:KcQJMbQdJHPlq5lcYT+/CjatWM4PuxKe+XLSVS4J6Os=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/term v0.0.0-20221205130635-1aeaba878587/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y=+github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=+github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=github.com/mtibben/percent v0.2.1 h1:5gssi8Nqo8QU/r2pynCm+hBQHpkB/uNK7BJCFogWdzs=github.com/mtibben/percent v0.2.1/go.mod h1:KG9uO+SZkUp+VkRHsCdYQV3XSZrrSpR3O9ibNBTZrns=github.com/mutecomm/go-sqlcipher/v4 v4.4.0 h1:sV1tWCWGAVlPhNGT95Q+z/txFxuhAYWwHD1afF5bMZg=github.com/mutecomm/go-sqlcipher/v4 v4.4.0/go.mod h1:PyN04SaWalavxRGH9E8ZftG6Ju7rsPrGmQRjrEaVpiY=+github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f h1:KUppIJq7/+SVif2QVs3tOP0zanoHgBEVAwHxUSIzRqU=github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus=@@ -630,10 +688,20 @@ github.com/nakagami/firebirdsql v0.0.0-20190310045651-3c02a58cfed8/go.mod h1:86wgithub.com/neo4j/neo4j-go-driver v1.8.1-0.20200803113522-b626aa943eba h1:fhFP5RliM2HW/8XdcO5QngSfFli9GcRIpMXvypTQt6E=github.com/neo4j/neo4j-go-driver v1.8.1-0.20200803113522-b626aa943eba/go.mod h1:ncO5VaFWh0Nrt+4KT4mOZboaczBZcLuHrG+/sUeP8gI=github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=+github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=+github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=+github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=+github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=+github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=+github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=+github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=+github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=github.com/onsi/gomega v1.15.0 h1:WjP/FQ/sk43MRmnEcT+MlDw2TFvkrXlprrPST/IudjU=github.com/onsi/gomega v1.15.0/go.mod h1:cIuvLEne0aoVhAgh/O6ac0Op8WWw9H6eYCriF+tEHG0=+github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=+github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro=github.com/open-policy-agent/opa v1.10.1 h1:haIvxZSPky8HLjRrvQwWAjCPLg8JDFSZMbbG4yyUHgY=github.com/open-policy-agent/opa v1.10.1/go.mod h1:7uPI3iRpOalJ0BhK6s1JALWPU9HvaV1XeBSSMZnr/PM=github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM=@@ -651,18 +719,31 @@ github.com/petermattis/goid v0.0.0-20240813172612-4fcff4a6cae7 h1:Dx7Ovyv/SFnMFwgithub.com/petermattis/goid v0.0.0-20240813172612-4fcff4a6cae7/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4=github.com/pierrec/lz4/v4 v4.1.16 h1:kQPfno+wyx6C5572ABwV+Uo3pDFzQ7yhyGchSyRda0c=github.com/pierrec/lz4/v4 v4.1.16/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=+github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI=github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ=github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU=github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e h1:aoZm08cpOy4WuID//EZDgcC4zIxODThtZNPirFr42+A=github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=+github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=github.com/pkg/profile v1.7.0 h1:hnbDkaNWPCLMO9wGLdBFTIZvzDrDfBM2072E1S9gJkA=github.com/pkg/profile v1.7.0/go.mod h1:8Uer0jas47ZQMJ7VD+OHknK4YDY07LPUC6dEvqDjvNo=github.com/planetscale/vtprotobuf v0.6.0/go.mod h1:t/avpk3KcrXxUnYOhZhMXJlSEyie6gQbtLq5NM3loB8=github.com/proglottis/gpgme v0.1.5 h1:KCGyOw8sQ+SI96j6G8D8YkOGn+1TwbQTT9/zQXoVlz0=github.com/proglottis/gpgme v0.1.5/go.mod h1:5LoXMgpE4bttgwwdv9bLs/vwqv3qV7F4glEEZ7mRKrM=+github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=+github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=+github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g=+github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=+github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=+github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=+github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc=github.com/prometheus/otlptranslator v0.0.2 h1:+1CdeLVrRQ6Psmhnobldo0kTp96Rj80DRXRd5OSnMEQ=github.com/prometheus/otlptranslator v0.0.2/go.mod h1:P8AwMgdD7XEr6QRUJ2QWLpiAZTgTE2UYgjlu3svompI=+github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=+github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=+github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ=github.com/prometheus/procfs v0.16.1/go.mod h1:teAbpZRB1iIAJYREa1LsoWUXykVXA1KlTmWl8x/U+Is=github.com/rcrowley/go-metrics v0.0.0-20250401214520-65e299d6c5c9 h1:bsUq1dX0N8AOIL7EB/X911+m4EHsnWEHeJ0c+3TTBrg=github.com/rcrowley/go-metrics v0.0.0-20250401214520-65e299d6c5c9/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=@@ -675,6 +756,9 @@ github.com/rqlite/gorqlite v0.0.0-20230708021416-2acd02b70b79/go.mod h1:xF/KoXmrgithub.com/russross/blackfriday v1.6.0 h1:KqfZb0pUVN2lYqZUYRddxF4OR8ZMURnJIG5Y3VRLtww=github.com/russross/blackfriday v1.6.0/go.mod h1:ti0ldHuxg49ri4ksnFxlkCfN+hvslNlmVHqNRXXJNAY=github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=+github.com/sagikazarmark/locafero v0.12.0/go.mod h1:sZh36u/YSZ918v0Io+U9ogLYQJ9tLLBmM4eneO6WwsI=+github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE=+github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ=github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 h1:lZUw3E0/J3roVtGQ+SCrUrg3ON6NgVqpn3+iol9aGu4=github.com/santhosh-tekuri/jsonschema/v5 v5.3.1/go.mod h1:uToXkOrWAZ6/Oc07xWQrPOhJotwFIyu2bBVN41fcDUY=github.com/santhosh-tekuri/jsonschema/v6 v6.0.1/go.mod h1:JXeL+ps8p7/KNMjDQk3TCwPpBy0wYklyWTfbkIzdIFU=@@ -700,6 +784,8 @@ github.com/sigstore/protobuf-specs v0.4.1 h1:5SsMqZbdkcO/DNHudaxuCUEjj6x29tS2Xbygithub.com/sigstore/protobuf-specs v0.4.1/go.mod h1:+gXR+38nIa2oEupqDdzg4qSBT0Os+sP7oYv6alWewWc=github.com/sigstore/sigstore v1.9.5 h1:Wm1LT9yF4LhQdEMy5A2JeGRHTrAWGjT3ubE5JUSrGVU=github.com/sigstore/sigstore v1.9.5/go.mod h1:VtxgvGqCmEZN9X2zhFSOkfXxvKUjpy8RpUW39oCtoII=+github.com/sigstore/sigstore v1.10.0/go.mod h1:Ygq+L/y9Bm3YnjpJTlQrOk/gXyrjkpn3/AEJpmk1n9Y=+github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=@@ -709,16 +795,21 @@ github.com/snowflakedb/gosnowflake v1.6.19 h1:KSHXrQ5o7uso25hNIzi/RObXtnSGkFgie9github.com/snowflakedb/gosnowflake v1.6.19/go.mod h1:FM1+PWUdwB9udFDsXdfD58NONC0m+MlOSmQRvimobSM=github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 h1:+jumHNA0Wrelhe64i8F6HNlS8pkoyMv5sreGx2Ry5Rw=github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8/go.mod h1:3n1Cwaq1E1/1lhQhtRK2ts/ZwZEhjcQeJQ1RuC6Q/8U=+github.com/spf13/cobra v1.10.1/go.mod h1:7SmJGaTHFVBY0jW4NXGluQoLvhqFQM+6XSKD+P4XaB0=github.com/spf13/jwalterweatherman v0.0.0-20141219030609-3d60171a6431 h1:XTHrT015sxHyJ5FnQ0AeemSspZWaDq7DoTRW0EVsDCE=+github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=github.com/spiffe/go-spiffe/v2 v2.6.0 h1:l+DolpxNWYgruGQVV0xsfeya3CsC7m8iBzDnMpsbLuo=github.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/go.mod h1:fAH5hQ5pehh+j3nZfvwdk2RgEgQjAoM8wodgtPmh1xo=+github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=github.com/stretchr/objx v0.5.3 h1:jmXUvGomnU1o3W/V5h2VEradbpJDwGrzugQQvL0POH4=github.com/stretchr/objx v0.5.3/go.mod h1:rDQraq+vQZU7Fde9LOZLr8Tax6zZvy4kuNKF+QYS+U0=+github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=+github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=github.com/sylabs/sif/v2 v2.22.0 h1:Y+xXufp4RdgZe02SR3nWEg7S6q4tPWN237WHYzkDSKA=github.com/sylabs/sif/v2 v2.22.0/go.mod h1:W1XhWTmG1KcG7j5a3KSYdMcUIFvbs240w/MMVW627hs=@@ -797,6 +888,7 @@ github.com/ysmood/goob v0.4.0 h1:HsxXhyLBeGzWXnqVKtmT9qM7EuVs/XOgkX7T6r1o1AQ=github.com/ysmood/goob v0.4.0/go.mod h1:u6yx7ZhS4Exf2MwciFr6nIM8knHQIE22lFpWHnfql18=github.com/ysmood/got v0.40.0 h1:ZQk1B55zIvS7zflRrkGfPDrPG3d7+JOza1ZkNxcc74Q=github.com/ysmood/got v0.40.0/go.mod h1:W7DdpuX6skL3NszLmAsC5hT7JAhuLZhByVzHTq874Qg=+github.com/ysmood/gotrace v0.6.0/go.mod h1:TzhIG7nHDry5//eYZDYcTzuJLYQIkykJzCRIo4/dzQM=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=@@ -823,13 +915,16 @@ go.opentelemetry.io/contrib/detectors/gcp v1.39.0 h1:kWRNZMsfBHZ+uHjiH4y7Etn2FK2go.opentelemetry.io/contrib/detectors/gcp v1.39.0/go.mod h1:t/OGqzHBa5v6RHZwrDBJ2OirWc+4q/w2fTbLZwAKjTk=go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0/go.mod h1:rg+RlpR5dKwaS95IyyZqj5Wd4E13lk/msnTS0Xl9lJM=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/otel v1.35.0/go.mod h1:UEqy8Zp11hpkUrL73gSlELM0DupHoiq72dR+Zqel/+Y=+go.opentelemetry.io/otel v1.36.0/go.mod h1:/TcFMXYjyRNh8khOAO9ybYkqaDBb/70aVwkNML4pP8E=go.opentelemetry.io/otel v1.37.0/go.mod h1:ehE/umFRLnuLa/vSccNq9oS1ErUlkkK71gMcN34UG8I=go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM=go.opentelemetry.io/otel/exporters/jaeger v1.17.0 h1:D7UpUy2Xc2wsi1Ras6V40q806WM07rqoCWzXu7Sqy+4=go.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/otlptracegrpc v1.35.0/go.mod h1:LjReUci/F4BUyv+y4dwnq3h/26iNOeC3wAIqgvTIZVo=+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/prometheus v0.42.0 h1:jwV9iQdvp38fxXi8ZC+lNpxjK16MRcZlpDYvbuO1FiA=go.opentelemetry.io/otel/exporters/prometheus v0.42.0/go.mod h1:f3bYiqNqhoPxkvI2LrXqQVC546K7BuRDL/kKuxkujhA=@@ -840,17 +935,24 @@ go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.31.0/go.mod h1:fcwWuDuago.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.38.0 h1:kJxSDN4SgWWTjG/hPp3O7LCGLcHXFlvS2/FFOrwL+SE=go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.38.0/go.mod h1:mgIOzS7iZeKJdeB8/NYHrJ48fdGc71Llo5bJ1J4DWUE=go.opentelemetry.io/otel/metric v1.35.0/go.mod h1:nKVFgxBZ2fReX6IlyW28MgZojkoAkJGaE8CpgeAU3oE=+go.opentelemetry.io/otel/metric v1.36.0/go.mod h1:zC7Ks+yeyJt4xig9DEw9kuUFe5C3zLbVjV2PzT6qzbs=go.opentelemetry.io/otel/metric v1.37.0/go.mod h1:04wGrZurHYKOc+RKeye86GwKiTb9FKm1WHtO+4EVr2E=go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI=go.opentelemetry.io/otel/sdk v1.37.0/go.mod h1:VredYzxUvuo2q3WRcDnKDjbdvmO0sCzOvVAiY+yUkAg=go.opentelemetry.io/otel/sdk v1.38.0/go.mod h1:ghmNdGlVemJI3+ZB5iDEuk4bWA3GkTpW+DOoZMYBVVg=go.opentelemetry.io/otel/sdk/metric v1.38.0/go.mod h1:dg9PBnW9XdQ1Hd6ZnRz689CbtrUp0wMMs9iPcgT9EZA=go.opentelemetry.io/otel/trace v1.35.0/go.mod h1:WUk7DtFp1Aw2MkvqGdwiXYDZZNvA/1J8o6xRXLrIkyc=+go.opentelemetry.io/otel/trace v1.36.0/go.mod h1:gQ+OnDZzrybY4k4seLzPAWNwVBBVlF2szhehOBB/tGA=go.opentelemetry.io/otel/trace v1.37.0/go.mod h1:TlgrlQ+PtQO5XFerSPUYG0JSgGyryXewPGyayAWSBS0=go.opentelemetry.io/otel/trace v1.38.0/go.mod h1:j1P9ivuFsTceSWe1oY+EeW3sc+Pp42sO++GHkg4wwhs=go.opentelemetry.io/proto/otlp v1.5.0/go.mod h1:keN8WnHxOy8PG0rQZjJJ5A2ebUoafqWp0eVQ4yIXvJ4=go.opentelemetry.io/proto/otlp v1.7.1/go.mod h1:b2rVh6rfI/s2pHWNlB7ILJcRALpcNDzKhACevjI+ZnE=+go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=+go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=+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.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU=+golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=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.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=@@ -879,10 +981,17 @@ golang.org/x/mod v0.31.0/go.mod h1:43JraMp9cGx1Rx3AqioxrbrhNsLl2l/iNAvuBkrezpg=golang.org/x/mod v0.32.0/go.mod h1:SgipZ/3h2Ci89DlEtEXWUk/HteuRin+HHhN+WbNhguU=golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=+golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=+golang.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-20190613194153-d28f0bde5980/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-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-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=+golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=+golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=@@ -904,6 +1013,9 @@ golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlgolang.org/x/oauth2 v0.33.0 h1:4Q+qn+E5z8gPRJfmRy7C2gGG3T4jIprK6aSYgTXGRpo=golang.org/x/oauth2 v0.33.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA=golang.org/x/oauth2 v0.34.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA=+golang.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-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=@@ -915,8 +1027,20 @@ golang.org/x/sync v0.15.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=golang.org/x/sync v0.18.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=+golang.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-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-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-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=+golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=@@ -971,11 +1095,14 @@ golang.org/x/text v0.29.0/go.mod h1:7MhJOA9CD2qZyOKYazxdYMF85OwPdEr9jTtBpO7ydH4=golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=golang.org/x/text v0.32.0/go.mod h1:o/rUWzghvpD5TXrTIBuJU77MTaN0ljMWE47kxGJQ7jY=+golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=golang.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-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=@@ -991,6 +1118,7 @@ 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-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=golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90=@@ -1043,22 +1171,30 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQgoogle.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=+google.golang.org/protobuf v1.36.3/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=google.golang.org/protobuf v1.36.8/go.mod h1:fuxRtAxBytpl4zzqUh6/eyUujkJdNiuEkXntxiD/uRU=google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=gopkg.in/airbrake/gobrake.v2 v2.0.9 h1:7z2uVWwn7oVeeugY1DtlPAy5H+KYgB1KeKTnqjNatLo=gopkg.in/alecthomas/kingpin.v2 v2.2.6 h1:jMFz6MfLP0/4fUyZle81rXUoxOBFi19VUFKVDOQfozc=+gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=gopkg.in/evanphx/json-patch.v4 v4.12.0 h1:n6jtcsulIzXPJaxegRbvFNNrZDjbij7ny3gmSPG+6V4=gopkg.in/evanphx/json-patch.v4 v4.12.0/go.mod h1:p8EYWUEYMpynmqDbY58zCKCFZw8pRWMG4EsWvDvM72M=gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=+gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2 h1:OAj3g0cR6Dx/R07QgQe8wkA9RNjB2u4i700xBkIT4e0=gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=+gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=+gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=gorm.io/driver/sqlite v1.6.0 h1:WHRRrIiulaPiPFmDcod6prc4l2VGVWHz80KspNsxSfQ=gorm.io/driver/sqlite v1.6.0/go.mod h1:AO9V1qIQddBESngQUKWL9yoH93HIeA1X6V633rBwyT8=gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=+gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8=gotest.tools/v3 v3.4.0/go.mod h1:CtbdzLSsqVhDgMtKsx03ird5YTGB3ar27v0u/yKBW5g=honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=diff --git a/tests/spec/builds.spec.ts b/tests/spec/builds.spec.tsnew file mode 100644index 000000000..2179df625--- /dev/null+++ b/tests/spec/builds.spec.ts@@ -0,0 +1,399 @@+import { test, expect, type Locator, type Page } from "@playwright/test";++const ROUTES = {+ page: "/images/builds",+};++const STREAM_SUCCESS =+ '{"type":"build","phase":"begin","service":"manual","status":"build started"}\n' ++ '{"type":"build","phase":"complete","service":"manual","status":"build complete"}\n';++const FIELD_LABELS = {+ cacheTo: "Cache To",+ entitlements: "Entitlements",+ network: "Network",+ isolation: "Isolation",+ shmSize: "Shm Size (bytes)",+ ulimits: "Ulimits",+ extraHosts: "Extra Hosts",+};++async function navigateToBuildWorkspace(page: Page) {+ await page.goto(ROUTES.page);+ await page.waitForLoadState("networkidle");+ await expect(page.getByRole("heading", { level: 1, name: /Build Workspace/i })).toBeVisible();+}++async function ensureSwitchState(toggle: Locator, desired: boolean) {+ const current = (await toggle.getAttribute("aria-checked")) === "true";+ if (current !== desired) {+ await toggle.click();+ }+}++async function setRequiredBuildInputs(page: Page, tags = `e2e/build:${Date.now()}`) {+ const tagsInput = page.locator("#image-tags");+ await expect(tagsInput).toBeVisible();+ await tagsInput.fill(tags);+}++async function openAdvancedBuildOptions(page: Page) {+ const dockerfileInput = page.locator("#dockerfile");+ const alreadyVisible = await dockerfileInput.isVisible().catch(() => false);+ if (alreadyVisible) {+ return;+ }++ await page.getByRole("button", { name: /Advanced/i }).first().click();+ await expect(dockerfileInput).toBeVisible();+}++async function selectBuildProvider(page: Page, provider: "local" | "depot") {+ const providerTrigger = page.locator('[data-slot="select-trigger"]').first();+ await expect(providerTrigger).toBeVisible();+ await providerTrigger.click();++ const providerLabel = provider === "depot" ? "Depot" : "Local Docker";+ await page.locator('[data-slot="select-item"]').filter({ hasText: providerLabel }).first().click();+}++function getToastTitle(page: Page) {+ return page.locator("li[data-sonner-toast] div[data-title]");+}++function getBuildButton(page: Page) {+ return page.getByRole("button", { name: "Build", exact: true }).first();+}++function upsertSettingEntry(settings: Array<{ key: string; value: unknown }>, key: string, value: unknown) {+ const existing = settings.find((entry) => entry.key === key);+ if (existing) {+ existing.value = value;+ return;+ }+ settings.push({ key, value });+}++function injectDepotSettings(payload: unknown): unknown {+ if (Array.isArray(payload)) {+ const settings = payload.map((entry) => ({ ...(entry as { key: string; value: unknown }) }));+ upsertSettingEntry(settings, "depotProjectId", "e2e-depot-project");+ upsertSettingEntry(settings, "depotToken", "e2e-depot-token");+ upsertSettingEntry(settings, "depotConfigured", "true");+ return settings;+ }++ if (payload && typeof payload === "object") {+ const maybeSettingsObject = payload as Record<string, unknown>;+ if (Array.isArray(maybeSettingsObject.settings)) {+ const settings = maybeSettingsObject.settings.map((entry) => ({ ...(entry as { key: string; value: unknown }) }));+ upsertSettingEntry(settings, "depotProjectId", "e2e-depot-project");+ upsertSettingEntry(settings, "depotToken", "e2e-depot-token");+ upsertSettingEntry(settings, "depotConfigured", "true");+ return { ...maybeSettingsObject, settings };+ }++ return {+ ...maybeSettingsObject,+ depotProjectId: "e2e-depot-project",+ depotToken: "e2e-depot-token",+ depotConfigured: true,+ };+ }++ return {+ depotProjectId: "e2e-depot-project",+ depotToken: "e2e-depot-token",+ depotConfigured: true,+ };+}++async function mockDepotConfiguredSettings(page: Page) {+ await page.route("**/api/environments/0/settings", async (route) => {+ if (route.request().method() !== "GET") {+ await route.continue();+ return;+ }++ const upstream = await route.fetch();+ const original = await upstream.json().catch(() => ({}));+ const patched = injectDepotSettings(original);++ await route.fulfill({+ status: upstream.status(),+ headers: {+ ...upstream.headers(),+ "content-type": "application/json",+ },+ body: JSON.stringify(patched),+ });+ });+}++test.describe("Build workspace provider flows", () => {+ test("submits local provider build payload from UI controls", async ({ page }) => {+ await navigateToBuildWorkspace(page);+ await setRequiredBuildInputs(page);++ const pushSwitch = page.locator("#build-push");+ const loadSwitch = page.locator("#build-load");++ await expect(pushSwitch).toBeVisible();+ await expect(loadSwitch).toBeVisible();++ await ensureSwitchState(pushSwitch, true);+ await ensureSwitchState(loadSwitch, true);++ let buildPayload: Record<string, unknown> | null = null;++ await page.route("**/api/environments/*/images/build", async (route) => {+ buildPayload = route.request().postDataJSON() as Record<string, unknown>;+ await route.fulfill({+ status: 200,+ contentType: "application/x-ndjson",+ body: STREAM_SUCCESS,+ });+ });++ await page.getByRole("button", { name: "Build", exact: true }).first().click();++ await expect.poll(() => buildPayload, { timeout: 10000 }).not.toBeNull();++ expect(buildPayload?.provider).toBe("local");+ expect(buildPayload?.push).toBe(true);+ expect(buildPayload?.load).toBe(true);++ await expect(page.getByText("Build completed").first()).toBeVisible();+ });++ test("uses provider selector via UI and enforces depot push/load behavior", async ({ page }) => {+ await mockDepotConfiguredSettings(page);+ await navigateToBuildWorkspace(page);+ await setRequiredBuildInputs(page);++ await selectBuildProvider(page, "depot");++ const loadSwitch = page.locator("#build-load");+ await expect(loadSwitch).toBeDisabled();++ let buildPayload: Record<string, unknown> | null = null;++ await page.route("**/api/environments/*/images/build", async (route) => {+ buildPayload = route.request().postDataJSON() as Record<string, unknown>;+ await route.fulfill({+ status: 200,+ contentType: "application/x-ndjson",+ body: STREAM_SUCCESS,+ });+ });++ await page.getByRole("button", { name: "Build", exact: true }).first().click();++ await expect.poll(() => buildPayload, { timeout: 10000 }).not.toBeNull();++ expect(buildPayload?.provider).toBe("depot");+ expect(buildPayload?.push).toBe(true);+ expect(buildPayload?.load).toBe(false);+ });++ test("maps advanced local build options from UI into build request payload", async ({ page }) => {+ await navigateToBuildWorkspace(page);+ await setRequiredBuildInputs(page, `e2e/local-advanced:${Date.now()}`);+ await openAdvancedBuildOptions(page);++ await page.locator("#dockerfile").fill("Dockerfile.prod");+ await page.locator("#target").fill("builder");+ await page.locator("#platforms").fill("linux/amd64");+ await page.locator("#build-args").fill("FOO=bar\nHTTP_PROXY=http://proxy.local");+ await page.locator("#labels").fill("com.example.team=arcane\ncom.example.env=e2e");+ await page.locator("#cache-from").fill("myorg/myimage:cache,myorg/other:latest");+ await page.getByLabel(FIELD_LABELS.network).fill("host");+ await page.getByLabel(FIELD_LABELS.isolation).fill("process");+ await page.getByLabel(FIELD_LABELS.shmSize).fill("1048576");+ await page.getByLabel(FIELD_LABELS.ulimits).fill("nofile=1024:2048\nnproc=512:1024");+ await page.getByLabel(FIELD_LABELS.extraHosts).fill("registry.local=10.0.0.5\nmirror.local=10.0.0.6");++ await ensureSwitchState(page.locator("#no-cache"), true);+ await ensureSwitchState(page.locator("#pull-base-images"), true);+ await ensureSwitchState(page.locator("#build-push"), false);+ await ensureSwitchState(page.locator("#build-load"), true);++ let buildPayload: Record<string, unknown> | null = null;+ await page.route("**/api/environments/*/images/build", async (route) => {+ buildPayload = route.request().postDataJSON() as Record<string, unknown>;+ await route.fulfill({+ status: 200,+ contentType: "application/x-ndjson",+ body: STREAM_SUCCESS,+ });+ });++ await getBuildButton(page).click();+ await expect.poll(() => buildPayload, { timeout: 10000 }).not.toBeNull();++ expect(buildPayload).toMatchObject({+ dockerfile: "Dockerfile.prod",+ target: "builder",+ buildArgs: {+ FOO: "bar",+ HTTP_PROXY: "http://proxy.local",+ },+ labels: {+ "com.example.team": "arcane",+ "com.example.env": "e2e",+ },+ cacheFrom: ["myorg/myimage:cache", "myorg/other:latest"],+ cacheTo: [],+ network: "host",+ isolation: "process",+ shmSize: 1048576,+ ulimits: {+ nofile: "1024:2048",+ nproc: "512:1024",+ },+ entitlements: [],+ privileged: false,+ extraHosts: ["registry.local=10.0.0.5", "mirror.local=10.0.0.6"],+ platforms: ["linux/amd64"],+ noCache: true,+ pull: true,+ provider: "local",+ push: false,+ load: true,+ });+ });++ test("maps depot-supported advanced options and forces push/load in payload", async ({ page }) => {+ await mockDepotConfiguredSettings(page);+ await navigateToBuildWorkspace(page);+ await setRequiredBuildInputs(page, `e2e/depot-advanced:${Date.now()}`);+ await openAdvancedBuildOptions(page);+ await selectBuildProvider(page, "depot");++ await expect(page.locator("#build-load")).toBeDisabled();+ await page.getByLabel(FIELD_LABELS.cacheTo).fill("type=registry,ref=myorg/myimage:cache\ntype=inline");+ await page.getByLabel(FIELD_LABELS.entitlements).fill("network.host,security.insecure");+ await page.locator("#platforms").fill("linux/amd64, linux/arm64");+ await ensureSwitchState(page.locator("#privileged-build"), true);+ await ensureSwitchState(page.locator("#build-push"), false);++ let buildPayload: Record<string, unknown> | null = null;+ await page.route("**/api/environments/*/images/build", async (route) => {+ buildPayload = route.request().postDataJSON() as Record<string, unknown>;+ await route.fulfill({+ status: 200,+ contentType: "application/x-ndjson",+ body: STREAM_SUCCESS,+ });+ });++ await getBuildButton(page).click();+ await expect.poll(() => buildPayload, { timeout: 10000 }).not.toBeNull();++ expect(buildPayload).toMatchObject({+ cacheTo: ["type=registry", "ref=myorg/myimage:cache", "type=inline"],+ entitlements: ["network.host", "security.insecure"],+ privileged: true,+ platforms: ["linux/amd64", "linux/arm64"],+ provider: "depot",+ push: true,+ load: false,+ });+ });++ test("blocks local provider submission when unsupported local options are configured", async ({ page }) => {+ await navigateToBuildWorkspace(page);+ await setRequiredBuildInputs(page, `e2e/local-unsupported:${Date.now()}`);+ await openAdvancedBuildOptions(page);++ await page.getByLabel(FIELD_LABELS.cacheTo).evaluate((el) => {+ (el as HTMLTextAreaElement).disabled = false;+ });+ await page.getByLabel(FIELD_LABELS.entitlements).evaluate((el) => {+ (el as HTMLTextAreaElement).disabled = false;+ });+ await page.locator("#privileged-build").evaluate((el) => {+ const button = el as HTMLButtonElement;+ button.disabled = false;+ button.removeAttribute("disabled");+ button.removeAttribute("data-disabled");+ button.setAttribute("aria-disabled", "false");+ });++ await page.getByLabel(FIELD_LABELS.cacheTo).fill("type=registry,ref=myorg/myimage:cache");+ await page.getByLabel(FIELD_LABELS.entitlements).fill("network.host");+ await page.locator("#platforms").fill("linux/amd64, linux/arm64");+ await ensureSwitchState(page.locator("#privileged-build"), true);++ let buildRequests = 0;+ await page.route("**/api/environments/*/images/build", async (route) => {+ buildRequests += 1;+ await route.abort();+ });++ await getBuildButton(page).click();+ const localUnsupportedToast = getToastTitle(page).filter({+ hasText: /Unsupported build options for provider local:/,+ });+ await expect(localUnsupportedToast.first()).toBeVisible();+ const localUnsupportedText = await localUnsupportedToast.first().innerText();+ expect(localUnsupportedText).toContain("cacheTo");+ expect(localUnsupportedText).toContain("entitlements");+ expect(localUnsupportedText).toContain("platforms");+ await page.waitForTimeout(300);+ expect(buildRequests).toBe(0);+ });++ test("blocks depot provider submission when local-only values exist before switching provider", async ({ page }) => {+ await mockDepotConfiguredSettings(page);+ await navigateToBuildWorkspace(page);+ await setRequiredBuildInputs(page, `e2e/depot-unsupported:${Date.now()}`);+ await openAdvancedBuildOptions(page);++ await page.getByLabel(FIELD_LABELS.network).fill("host");+ await page.getByLabel(FIELD_LABELS.isolation).fill("process");+ await page.getByLabel(FIELD_LABELS.shmSize).fill("1024");+ await page.getByLabel(FIELD_LABELS.ulimits).fill("nofile=1024:2048");+ await page.getByLabel(FIELD_LABELS.extraHosts).fill("registry.local=10.0.0.5");++ await selectBuildProvider(page, "depot");++ let buildRequests = 0;+ await page.route("**/api/environments/*/images/build", async (route) => {+ buildRequests += 1;+ await route.abort();+ });++ await getBuildButton(page).click();+ await expect(getToastTitle(page).filter({ hasText: "Unsupported build options for provider depot: extraHosts, isolation, network, shmSize, ulimits" })).toBeVisible();+ await page.waitForTimeout(300);+ expect(buildRequests).toBe(0);+ });++ test("toggles provider-specific advanced field disabled states in the UI", async ({ page }) => {+ await mockDepotConfiguredSettings(page);+ await navigateToBuildWorkspace(page);+ await setRequiredBuildInputs(page, `e2e/provider-ui:${Date.now()}`);+ await openAdvancedBuildOptions(page);++ await expect(page.getByLabel(FIELD_LABELS.cacheTo)).toBeDisabled();+ await expect(page.getByLabel(FIELD_LABELS.entitlements)).toBeDisabled();+ await expect(page.locator("#privileged-build")).toBeDisabled();+ await expect(page.getByLabel(FIELD_LABELS.network)).toBeEnabled();+ await expect(page.getByLabel(FIELD_LABELS.isolation)).toBeEnabled();+ await expect(page.getByLabel(FIELD_LABELS.shmSize)).toBeEnabled();+ await expect(page.getByLabel(FIELD_LABELS.ulimits)).toBeEnabled();+ await expect(page.getByLabel(FIELD_LABELS.extraHosts)).toBeEnabled();++ await selectBuildProvider(page, "depot");++ await expect(page.getByLabel(FIELD_LABELS.cacheTo)).toBeEnabled();+ await expect(page.getByLabel(FIELD_LABELS.entitlements)).toBeEnabled();+ await expect(page.locator("#privileged-build")).toBeEnabled();+ await expect(page.getByLabel(FIELD_LABELS.network)).toBeDisabled();+ await expect(page.getByLabel(FIELD_LABELS.isolation)).toBeDisabled();+ await expect(page.getByLabel(FIELD_LABELS.shmSize)).toBeDisabled();+ await expect(page.getByLabel(FIELD_LABELS.ulimits)).toBeDisabled();+ await expect(page.getByLabel(FIELD_LABELS.extraHosts)).toBeDisabled();+ });+});diff --git a/types/builds/builds.go b/types/builds/builds.gonew file mode 100644index 000000000..eed0c01be--- /dev/null+++ b/types/builds/builds.go@@ -0,0 +1,41 @@+package builds++import (+ "context"+ "io"++ imagetypes "github.com/getarcaneapp/arcane/types/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() (*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/build_history.go b/types/image/build_history.gonew file mode 100644index 000000000..69e3939df--- /dev/null+++ b/types/image/build_history.go@@ -0,0 +1,40 @@+package image++import "time"++// BuildRecord represents a historical image build entry.+type BuildRecord struct {+ ID string `json:"id" sortable:"true"`+ EnvironmentID string `json:"environmentId"`+ UserID *string `json:"userId,omitempty"`+ Username *string `json:"username,omitempty"`+ Status string `json:"status" sortable:"true"`+ Provider string `json:"provider,omitempty"`+ ContextDir string `json:"contextDir"`+ Dockerfile string `json:"dockerfile,omitempty"`+ Target string `json:"target,omitempty"`+ Tags []string `json:"tags,omitempty"`+ Platforms []string `json:"platforms,omitempty"`+ BuildArgs map[string]string `json:"buildArgs,omitempty"`+ Labels map[string]string `json:"labels,omitempty"`+ CacheFrom []string `json:"cacheFrom,omitempty"`+ CacheTo []string `json:"cacheTo,omitempty"`+ NoCache bool `json:"noCache"`+ Pull bool `json:"pull"`+ Network string `json:"network,omitempty"`+ Isolation string `json:"isolation,omitempty"`+ ShmSize int64 `json:"shmSize,omitempty"`+ Ulimits map[string]string `json:"ulimits,omitempty"`+ Entitlements []string `json:"entitlements,omitempty"`+ Privileged bool `json:"privileged"`+ ExtraHosts []string `json:"extraHosts,omitempty"`+ Push bool `json:"push"`+ Load bool `json:"load"`+ Digest *string `json:"digest,omitempty"`+ ErrorMessage *string `json:"errorMessage,omitempty"`+ Output *string `json:"output,omitempty"`+ OutputTruncated bool `json:"outputTruncated"`+ CompletedAt *time.Time `json:"completedAt,omitempty" sortable:"true"`+ DurationMs *int64 `json:"durationMs,omitempty"`+ CreatedAt time.Time `json:"createdAt" sortable:"true"`+}diff --git a/types/image/image.go b/types/image/image.goindex 4018ec1af..2861b4601 100644--- a/types/image/image.go+++ b/types/image/image.go@@ -228,6 +228,138 @@ 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 directory on the server.+ //+ // Required: true+ ContextDir string `json:"contextDir" minLength:"1" doc:"Build context directory"`++ // Dockerfile is the path to the Dockerfile (relative to context or absolute).+ //+ // Required: false+ Dockerfile string `json:"dockerfile,omitempty" doc:"Dockerfile path"`++ // 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.//diff --git a/types/project/project.go b/types/project/project.goindex 75135d3eb..d315e5c0d 100644--- a/types/project/project.go+++ b/types/project/project.go@@ -265,6 +265,11 @@ type Details struct {// Required: falseRuntimeServices []RuntimeService `json:"runtimeServices,omitempty"`+ // HasBuildDirective indicates whether any Compose service defines a build directive.+ //+ // Required: false+ HasBuildDirective bool `json:"hasBuildDirective,omitempty"`+// GitOpsManagedBy is the ID of the GitOps sync managing this project (if any).//// Required: falsediff --git a/types/settings/settings.go b/types/settings/settings.goindex 0b17df79d..6d00d2658 100644--- a/types/settings/settings.go+++ b/types/settings/settings.go@@ -350,4 +350,29 @@ type Update struct {//// Required: falseAutoHealRestartWindow *string `json:"autoHealRestartWindow,omitempty"`++ // BuildProvider is the default build provider (local|depot).+ //+ // Required: false+ BuildProvider *string `json:"buildProvider,omitempty"`++ // BuildsDirectory is the root directory for manual build workspaces.+ //+ // Required: false+ BuildsDirectory *string `json:"buildsDirectory,omitempty"`++ // BuildTimeout is the timeout for BuildKit builds in seconds.+ //+ // Required: false+ BuildTimeout *string `json:"buildTimeout,omitempty"`++ // DepotProjectId is the Depot project identifier.+ //+ // Required: false+ DepotProjectId *string `json:"depotProjectId,omitempty"`++ // DepotToken is the Depot API token.+ //+ // Required: false+ DepotToken *string `json:"depotToken,omitempty"`}