Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
fix: dockerfile_inline builds not working from projects (#1965)
Kyle Mendell911607206acd
diff --git a/backend/internal/services/project_service.go b/backend/internal/services/project_service.goindex 6cf928283..7a459381c 100644--- a/backend/internal/services/project_service.go+++ b/backend/internal/services/project_service.go@@ -837,8 +837,10 @@ func (s *ProjectService) DeployProject(ctx context.Context, projectID string, usreturn fmt.Errorf("failed to update project status to deploying: %w", err)}- if perr := s.prepareProjectImagesForDeploy(ctx, projectID, project, io.Discard, nil, &user, resolvedPullPolicy); perr != nil {- slog.Warn("prepare images for deploy failed (continuing to compose up)", "projectID", projectID, "error", perr)+ progressWriter, _ := ctx.Value(projects.ProgressWriterKey{}).(io.Writer)+ if perr := s.prepareProjectImagesForDeploy(ctx, projectID, project, progressWriter, nil, &user, resolvedPullPolicy); perr != nil {+ s.restoreProjectStatusAfterFailedDeployInternal(ctx, projectID)+ return fmt.Errorf("failed to prepare project images for deploy: %w", perr)}removeOrphans := projectFromDb.GitOpsManagedBy != nil && *projectFromDb.GitOpsManagedBy != ""@@ -850,7 +852,7 @@ func (s *ProjectService) DeployProject(ctx context.Context, projectID string, usif containers, psErr := s.GetProjectServices(ctx, projectID); psErr == nil {slog.Info("containers after failed deploy", "projectID", projectID, "containers", containers)}- _ = s.updateProjectStatusandCountsInternal(ctx, projectID, models.ProjectStatusStopped)+ s.restoreProjectStatusAfterFailedDeployInternal(ctx, projectID)// Provide more helpful error messageserrMsg := err.Error()@@ -1258,6 +1260,9 @@ func (s *ProjectService) prepareProjectImagesForDeploy(}decision := decideDeployImageAction(svc, pullPolicyOverride)+ if updated {+ decision = deployImageDecision{Build: true}+ }if err := s.ensureDeployServiceImageReady(ctx, projectID, project, name, svc, imageName, decision, progressWriter, credentials, user, pathMapper); err != nil {return err}@@ -1442,7 +1447,7 @@ func decideDeployImageAction(svc composetypes.ServiceConfig, pullPolicyOverride}}-func resolveBuildContext(workingDir string, svc composetypes.ServiceConfig, serviceName string, pathMapper *pathmapper.PathMapper) (string, error) {+func resolveBuildContextInternal(workingDir string, svc composetypes.ServiceConfig, serviceName string) (string, error) {contextDir := strings.TrimSpace(svc.Build.Context)if contextDir == "" {contextDir = workingDir@@ -1454,32 +1459,16 @@ func resolveBuildContext(workingDir string, svc composetypes.ServiceConfig, servreturn "", 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+ return contextDir, nil}-func resolveDockerfilePath(svc composetypes.ServiceConfig, serviceName string, pathMapper *pathmapper.PathMapper) (string, error) {+func resolveDockerfilePathInternal(svc composetypes.ServiceConfig) (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+ return dockerfilePath, nil}func buildArgsFromCompose(args map[string]*string) map[string]string {@@ -1610,31 +1599,40 @@ func (s *ProjectService) prepareServiceBuildRequest(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)+ contextDir, err := resolveBuildContextInternal(project.WorkingDir, updatedSvc, serviceName)if err != nil {return imagetypes.BuildRequest{}, updatedSvc, updated, err}- dockerfilePath, err := resolveDockerfilePath(updatedSvc, serviceName, pathMapper)- if err != nil {- return imagetypes.BuildRequest{}, updatedSvc, updated, err+ dockerfileInline := updatedSvc.Build.DockerfileInline+ if strings.TrimSpace(updatedSvc.Build.Dockerfile) != "" && strings.TrimSpace(dockerfileInline) != "" {+ return imagetypes.BuildRequest{}, updatedSvc, updated, fmt.Errorf("service %s cannot define both dockerfile and dockerfile_inline", serviceName)+ }++ dockerfilePath := ""+ if strings.TrimSpace(dockerfileInline) == "" {+ dockerfilePath, err = resolveDockerfilePathInternal(updatedSvc)+ 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),+ ContextDir: contextDir,+ Dockerfile: dockerfilePath,+ DockerfileInline: dockerfileInline,+ 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...,@@ -1654,6 +1652,30 @@ func (s *ProjectService) prepareServiceBuildRequest(return buildReq, updatedSvc, updated, nil}+func (s *ProjectService) restoreProjectStatusAfterFailedDeployInternal(ctx context.Context, projectID string) {+ services, err := s.GetProjectServices(ctx, projectID)+ if err == nil {+ serviceCount, runningCount := s.getServiceCounts(services)+ status := s.calculateProjectStatus(services)+ if updateErr := s.db.WithContext(ctx).Model(&models.Project{}).Where("id = ?", projectID).Updates(map[string]any{+ "status": status,+ "service_count": serviceCount,+ "running_count": runningCount,+ "updated_at": time.Now(),+ }).Error; updateErr == nil {+ return+ } else {+ slog.WarnContext(ctx, "failed to restore project status after deploy failure", "projectID", projectID, "error", updateErr)+ }+ } else {+ slog.WarnContext(ctx, "failed to inspect project services after deploy failure", "projectID", projectID, "error", err)+ }++ if updateErr := s.updateProjectStatusInternal(ctx, projectID, models.ProjectStatusStopped); updateErr != nil {+ slog.WarnContext(ctx, "failed to set stopped status after deploy failure", "projectID", projectID, "error", updateErr)+ }+}+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 nildiff --git a/backend/internal/services/project_service_test.go b/backend/internal/services/project_service_test.goindex 12b8a0bde..391b0e75b 100644--- a/backend/internal/services/project_service_test.go+++ b/backend/internal/services/project_service_test.go@@ -2,12 +2,17 @@ package servicesimport ("context"+ "errors"+ "io""os""path/filepath""testing""time"composetypes "github.com/compose-spec/compose-go/v2/types"+ "github.com/getarcaneapp/arcane/backend/internal/utils/pathmapper"+ buildtypes "github.com/getarcaneapp/arcane/types/builds"+ imagetypes "github.com/getarcaneapp/arcane/types/image"glsqlite "github.com/glebarez/sqlite""github.com/moby/moby/api/types/container""github.com/stretchr/testify/assert"@@ -18,6 +23,19 @@ import ("github.com/getarcaneapp/arcane/backend/internal/models")+type testBuildBuilder struct {+ err error+}++func (b testBuildBuilder) BuildImage(_ context.Context, _ imagetypes.BuildRequest, _ io.Writer, _ string) (*imagetypes.BuildResult, error) {+ if b.err != nil {+ return nil, b.err+ }+ return &imagetypes.BuildResult{Provider: "local"}, nil+}++var _ buildtypes.Builder = testBuildBuilder{}+func setupProjectTestDB(t *testing.T) *database.DB {t.Helper()db, err := gorm.Open(glsqlite.Open(":memory:"), &gorm.Config{})@@ -710,6 +728,64 @@ func TestProjectService_PrepareServiceBuildRequest_MapsComposeFields(t *testing.assert.Contains(t, req.ExtraHosts[0], "10.0.0.5")}+func TestProjectService_PrepareServiceBuildRequest_UsesExecutorVisiblePaths(t *testing.T) {+ svc := &ProjectService{}+ proj := &composetypes.Project{WorkingDir: "/app/data/projects/demo", Name: "demo"}+ pm := pathmapper.NewPathMapper("/app/data/projects", "/docker-data/arcane/projects")++ serviceCfg := composetypes.ServiceConfig{+ Name: "web",+ Image: "example/web:latest",+ Build: &composetypes.BuildConfig{+ Context: ".",+ Dockerfile: "/app/data/projects/demo/Dockerfile.custom",+ },+ }++ req, _, _, err := svc.prepareServiceBuildRequest(+ context.Background(),+ "project-id",+ proj,+ "web",+ serviceCfg,+ ProjectBuildOptions{},+ pm,+ )+ require.NoError(t, err)++ assert.Equal(t, "/app/data/projects/demo", req.ContextDir)+ assert.Equal(t, "/app/data/projects/demo/Dockerfile.custom", req.Dockerfile)+}++func TestProjectService_PrepareServiceBuildRequest_UsesInlineDockerfile(t *testing.T) {+ svc := &ProjectService{}+ proj := &composetypes.Project{WorkingDir: "/tmp/project", Name: "demo"}++ serviceCfg := composetypes.ServiceConfig{+ Name: "web",+ Image: "example/web:latest",+ Build: &composetypes.BuildConfig{+ Context: ".",+ DockerfileInline: "FROM alpine:3.20\nRUN echo inline\n",+ },+ }++ 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.Empty(t, req.Dockerfile)+ assert.Equal(t, "FROM alpine:3.20\nRUN echo inline\n", req.DockerfileInline)+}+func TestNormalizePullPolicy(t *testing.T) {assert.Equal(t, "missing", normalizePullPolicy("if_not_present"))assert.Equal(t, "build", normalizePullPolicy(" BUILD "))@@ -788,6 +864,84 @@ func TestProjectService_PrepareServiceBuildRequest_GeneratedImageProviderGuardraassert.Contains(t, err.Error(), "must define an image when push is enabled")}+func TestProjectService_DeployProject_StopsOnBuildPreparationError(t *testing.T) {+ db := setupProjectTestDB(t)+ ctx := context.Background()+ settingsService, err := NewSettingsService(ctx, db)+ require.NoError(t, err)++ projectsRoot := t.TempDir()+ projectDir := filepath.Join(projectsRoot, "demo")+ require.NoError(t, os.MkdirAll(projectDir, 0o755))+ composeContent := "services:\n" ++ " web:\n" ++ " pull_policy: build\n" ++ " build:\n" ++ " context: .\n"+ require.NoError(t, os.WriteFile(filepath.Join(projectDir, "compose.yaml"), []byte(composeContent), 0o644))+ require.NoError(t, settingsService.SetStringSetting(ctx, "projectsDirectory", projectsRoot+":"+projectsRoot))++ proj := &models.Project{+ BaseModel: models.BaseModel{ID: "p1"},+ Name: "demo",+ Path: projectDir,+ Status: models.ProjectStatusStopped,+ }+ require.NoError(t, db.Create(proj).Error)++ buildSvc := &BuildService{builder: testBuildBuilder{err: errors.New("boom build")}}+ svc := NewProjectService(db, settingsService, nil, nil, nil, buildSvc)++ err = svc.DeployProject(ctx, "p1", models.User{BaseModel: models.BaseModel{ID: "u1"}, Username: "tester"}, nil)+ require.Error(t, err)+ assert.Contains(t, err.Error(), "failed to prepare project images for deploy")+ assert.Contains(t, err.Error(), "boom build")++ var updated models.Project+ require.NoError(t, db.First(&updated, "id = ?", "p1").Error)+ assert.Equal(t, models.ProjectStatusStopped, updated.Status)+}++func TestProjectService_DeployProject_BuildsGeneratedImageWithoutPull(t *testing.T) {+ db := setupProjectTestDB(t)+ ctx := context.Background()+ settingsService, err := NewSettingsService(ctx, db)+ require.NoError(t, err)++ projectsRoot := t.TempDir()+ projectDir := filepath.Join(projectsRoot, "demo")+ require.NoError(t, os.MkdirAll(projectDir, 0o755))+ composeContent := "services:\n" ++ " caddy:\n" ++ " build:\n" ++ " dockerfile_inline: |\n" ++ " FROM caddy:builder AS builder\n" ++ " RUN xcaddy build --with github.com/caddyserver/replace-response\n" ++ "\n" ++ " FROM caddy:latest\n" ++ " COPY --from=builder /usr/bin/caddy /usr/bin/caddy\n"+ require.NoError(t, os.WriteFile(filepath.Join(projectDir, "compose.yaml"), []byte(composeContent), 0o644))+ require.NoError(t, settingsService.SetStringSetting(ctx, "projectsDirectory", projectsRoot+":"+projectsRoot))++ proj := &models.Project{+ BaseModel: models.BaseModel{ID: "p-generated"},+ Name: "build-test",+ Path: projectDir,+ Status: models.ProjectStatusStopped,+ }+ require.NoError(t, db.Create(proj).Error)++ buildSvc := &BuildService{builder: testBuildBuilder{err: errors.New("boom build")}}+ svc := NewProjectService(db, settingsService, nil, nil, nil, buildSvc)++ err = svc.DeployProject(ctx, proj.ID, models.User{BaseModel: models.BaseModel{ID: "u1"}, Username: "tester"}, nil)+ require.Error(t, err)+ assert.Contains(t, err.Error(), "failed to prepare project images for deploy")+ assert.Contains(t, err.Error(), "boom build")+ assert.NotContains(t, err.Error(), "failed to pull image arcane.local/")+ assert.NotContains(t, err.Error(), "failed to resolve reference \"arcane.local/")+}+//go:fix inlinefunc ptr(v string) *string {return new(v)diff --git a/backend/pkg/libarcane/libbuild/builder_buildkit.go b/backend/pkg/libarcane/libbuild/builder_buildkit.goindex e0414633f..49a538f54 100644--- a/backend/pkg/libarcane/libbuild/builder_buildkit.go+++ b/backend/pkg/libarcane/libbuild/builder_buildkit.go@@ -99,21 +99,26 @@ func normalizeEntitlementsInternal(entitlements []string, privileged bool) []strreturn out}-func (b *builder) buildSolveOptInternal(ctx context.Context, req imagetypes.BuildRequest) (buildkit.SolveOpt, <-chan error, error) {- contextDir := filepath.Clean(req.ContextDir)+func (b *builder) buildSolveOptInternal(ctx context.Context, req imagetypes.BuildRequest) (buildkit.SolveOpt, <-chan error, func(), error) {+ fsInput, err := prepareBuildFilesystemInputInternal(req)+ if err != nil {+ return buildkit.SolveOpt{}, nil, nil, err+ }- dockerfilePath := strings.TrimSpace(req.Dockerfile)- if dockerfilePath == "" {- dockerfilePath = "Dockerfile"+ contextDir, dockerfilePath, cleanup, err := prepareBuildContextInternal(fsInput)+ if err != nil {+ return buildkit.SolveOpt{}, nil, nil, err}- fullDockerfilePath := dockerfilePath- if !filepath.IsAbs(dockerfilePath) {- fullDockerfilePath = filepath.Join(contextDir, dockerfilePath)+ dockerfileDir := contextDir+ dockerfileFilename := dockerfilePath+ if dockerfileRelDir := filepath.Dir(filepath.FromSlash(dockerfilePath)); dockerfileRelDir != "." {+ dockerfileDir = filepath.Join(contextDir, dockerfileRelDir)+ dockerfileFilename = filepath.Base(dockerfilePath)}frontendAttrs := map[string]string{- "filename": filepath.Base(fullDockerfilePath),+ "filename": dockerfileFilename,}if strings.TrimSpace(req.Target) != "" {frontendAttrs["target"] = strings.TrimSpace(req.Target)@@ -143,7 +148,7 @@ func (b *builder) buildSolveOptInternal(ctx context.Context, req imagetypes.BuilFrontendAttrs: frontendAttrs,LocalDirs: map[string]string{"context": contextDir,- "dockerfile": filepath.Dir(fullDockerfilePath),+ "dockerfile": dockerfileDir,},CacheImports: parseBuildkitCacheEntriesInternal(req.CacheFrom),CacheExports: parseBuildkitCacheEntriesInternal(req.CacheTo),@@ -165,7 +170,8 @@ func (b *builder) buildSolveOptInternal(ctx context.Context, req imagetypes.Builif req.Load {exportEntry, errCh, err := b.buildLoadExportInternal(ctx, req.Tags)if err != nil {- return buildkit.SolveOpt{}, nil, err+ cleanup()+ return buildkit.SolveOpt{}, nil, nil, err}loadErrCh = errChexports = append(exports, exportEntry)@@ -175,7 +181,7 @@ func (b *builder) buildSolveOptInternal(ctx context.Context, req imagetypes.BuilsolveOpt.Exports = exports}- return solveOpt, loadErrCh, nil+ return solveOpt, loadErrCh, cleanup, nil}func (b *builder) buildLoadExportInternal(ctx context.Context, tags []string) (buildkit.ExportEntry, chan error, error) {diff --git a/backend/pkg/libarcane/libbuild/builder_buildkit_test.go b/backend/pkg/libarcane/libbuild/builder_buildkit_test.gonew file mode 100644index 000000000..7f65ce155--- /dev/null+++ b/backend/pkg/libarcane/libbuild/builder_buildkit_test.go@@ -0,0 +1,45 @@+package libbuild++import (+ "context"+ "os"+ "path/filepath"+ "testing"++ imagetypes "github.com/getarcaneapp/arcane/types/image"+ "github.com/stretchr/testify/assert"+ "github.com/stretchr/testify/require"+)++func TestBuildSolveOptInternal_StagesInlineDockerfile(t *testing.T) {+ contextDir := t.TempDir()+ require.NoError(t, os.WriteFile(filepath.Join(contextDir, "app.txt"), []byte("hello\n"), 0o644))++ b := &builder{}+ req := imagetypes.BuildRequest{+ ContextDir: contextDir,+ DockerfileInline: "FROM alpine:3.20\nCOPY app.txt /app.txt\n",+ BuildArgs: map[string]string{+ "FOO": "bar",+ },+ }++ solveOpt, loadErrCh, cleanup, err := b.buildSolveOptInternal(context.Background(), req)+ require.NoError(t, err)+ defer cleanup()+ assert.Nil(t, loadErrCh)+ assert.Equal(t, ".arcane.inline.Dockerfile", solveOpt.FrontendAttrs["filename"])++ contextPath := solveOpt.LocalDirs["context"]+ dockerfileDir := solveOpt.LocalDirs["dockerfile"]+ assert.NotEmpty(t, contextPath)+ assert.Equal(t, contextPath, dockerfileDir)++ contents, err := os.ReadFile(filepath.Join(dockerfileDir, solveOpt.FrontendAttrs["filename"]))+ require.NoError(t, err)+ assert.Equal(t, "FROM alpine:3.20\nCOPY app.txt /app.txt\n", string(contents))++ appContents, err := os.ReadFile(filepath.Join(contextPath, "app.txt"))+ require.NoError(t, err)+ assert.Equal(t, "hello\n", string(appContents))+}diff --git a/backend/pkg/libarcane/libbuild/builder_core.go b/backend/pkg/libarcane/libbuild/builder_core.goindex d757d6c71..89b7fb8c5 100644--- a/backend/pkg/libarcane/libbuild/builder_core.go+++ b/backend/pkg/libarcane/libbuild/builder_core.go@@ -84,11 +84,12 @@ func (b *builder) BuildImage(ctx context.Context, req imagetypes.BuildRequest, p}}()- solveOpt, loadErrCh, err := b.buildSolveOptInternal(buildCtx, req)+ solveOpt, loadErrCh, cleanupSolveOpt, err := b.buildSolveOptInternal(buildCtx, req)if err != nil {buildErr = errreturn nil, err}+ defer cleanupSolveOpt()authProvider := authprovider.NewDockerAuthProvider(authprovider.DockerAuthProviderConfig{AuthConfigProvider: buildkitAuthConfigProviderInternal(authprovider.LoadAuthConfig(config.LoadDefaultConfigFile(os.Stderr)), b.registryAuthProvider),diff --git a/backend/pkg/libarcane/libbuild/builder_docker.go b/backend/pkg/libarcane/libbuild/builder_docker.goindex 32026d11d..5c63e2919 100644--- a/backend/pkg/libarcane/libbuild/builder_docker.go+++ b/backend/pkg/libarcane/libbuild/builder_docker.go@@ -23,21 +23,26 @@ import ()type dockerBuildInput struct {+ buildFilesystemInput+ platform string+ buildArgs map[string]*string+ labels map[string]string+ cacheFrom []string+ noCache bool+ pullParent bool+ networkMode string+ isolation string+ shmSize int64+ ulimits []*dockercontainer.Ulimit+ extraHosts []string+}++type buildFilesystemInput struct {contextDir stringfullDockerfilePath stringrelDockerfile stringdockerfileOutsideCtx 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+ dockerfileInline string}func parseUlimitsInternal(values map[string]string) []*dockercontainer.Ulimit {@@ -79,19 +84,19 @@ func parseUlimitsInternal(values map[string]string) []*dockercontainer.Ulimit {return out}-func prepareDockerBuildInputInternal(req imagetypes.BuildRequest) (dockerBuildInput, bool, error) {+func prepareBuildFilesystemInputInternal(req imagetypes.BuildRequest) (buildFilesystemInput, error) {contextDir := filepath.Clean(req.ContextDir)if contextDir == "" {- return dockerBuildInput{}, false, errors.New("contextDir is required")+ return buildFilesystemInput{}, 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])+ if strings.TrimSpace(req.DockerfileInline) != "" {+ return buildFilesystemInput{+ contextDir: contextDir,+ relDockerfile: ".arcane.inline.Dockerfile",+ dockerfileOutsideCtx: true,+ dockerfileInline: req.DockerfileInline,+ }, nil}dockerfilePath := strings.TrimSpace(req.Dockerfile)@@ -112,6 +117,29 @@ func prepareDockerBuildInputInternal(req imagetypes.BuildRequest) (dockerBuildInrelDockerfile = filepath.ToSlash(relDockerfile)}+ return buildFilesystemInput{+ contextDir: contextDir,+ fullDockerfilePath: fullDockerfilePath,+ relDockerfile: relDockerfile,+ dockerfileOutsideCtx: dockerfileOutsideCtx,+ }, nil+}++func prepareDockerBuildInputInternal(req imagetypes.BuildRequest) (dockerBuildInput, bool, error) {+ fsInput, err := prepareBuildFilesystemInputInternal(req)+ if err != nil {+ return dockerBuildInput{}, false, err+ }++ if len(req.Platforms) > 1 {+ return dockerBuildInput{}, true, fmt.Errorf("docker build fallback does not support multi-platform builds")+ }++ platform := ""+ if len(req.Platforms) == 1 {+ platform = strings.TrimSpace(req.Platforms[0])+ }+buildArgs := map[string]*string{}for key, val := range req.BuildArgs {v := val@@ -155,10 +183,7 @@ func prepareDockerBuildInputInternal(req imagetypes.BuildRequest) (dockerBuildIn}return dockerBuildInput{- contextDir: contextDir,- fullDockerfilePath: fullDockerfilePath,- relDockerfile: relDockerfile,- dockerfileOutsideCtx: dockerfileOutsideCtx,+ buildFilesystemInput: fsInput,platform: platform,buildArgs: buildArgs,labels: labels,@@ -235,8 +260,8 @@ func copyContextTreeInternal(srcRoot, dstRoot string) error {})}-func prepareDockerBuildContextInternal(input dockerBuildInput) (string, string, func(), error) {- if !input.dockerfileOutsideCtx {+func prepareBuildContextInternal(input buildFilesystemInput) (string, string, func(), error) {+ if input.dockerfileInline == "" && !input.dockerfileOutsideCtx {return input.contextDir, input.relDockerfile, func() {}, nil}@@ -254,6 +279,20 @@ func prepareDockerBuildContextInternal(input dockerBuildInput) (string, string,return "", "", nil, fmt.Errorf("failed to stage build context: %w", err)}+ if input.dockerfileInline != "" {+ stagedDockerfilePath := filepath.Join(stagingDir, filepath.FromSlash(input.relDockerfile))+ if err := os.MkdirAll(filepath.Dir(stagedDockerfilePath), 0o755); err != nil {+ cleanup()+ return "", "", nil, fmt.Errorf("failed to create inline Dockerfile path: %w", err)+ }+ if err := os.WriteFile(stagedDockerfilePath, []byte(input.dockerfileInline), 0o600); err != nil {+ cleanup()+ return "", "", nil, fmt.Errorf("failed to stage inline Dockerfile: %w", err)+ }++ return stagingDir, filepath.ToSlash(input.relDockerfile), cleanup, nil+ }+const stagedDockerfile = ".arcane.external.Dockerfile"stagedDockerfilePath := filepath.Join(stagingDir, stagedDockerfile)dockerfileInfo, err := os.Stat(input.fullDockerfilePath)@@ -270,6 +309,10 @@ func prepareDockerBuildContextInternal(input dockerBuildInput) (string, string,return stagingDir, stagedDockerfile, cleanup, nil}+func prepareDockerBuildContextInternal(input dockerBuildInput) (string, string, func(), error) {+ return prepareBuildContextInternal(input.buildFilesystemInput)+}+func (b *builder) performDockerBuildInternal(ctx context.Context,dockerClient *dockerclient.Client,diff --git a/backend/pkg/libarcane/libbuild/builder_docker_test.go b/backend/pkg/libarcane/libbuild/builder_docker_test.goindex 6a3971d27..b1158bfef 100644--- a/backend/pkg/libarcane/libbuild/builder_docker_test.go+++ b/backend/pkg/libarcane/libbuild/builder_docker_test.go@@ -1,6 +1,8 @@package libbuildimport (+ "os"+ "path/filepath""testing"imagetypes "github.com/getarcaneapp/arcane/types/image"@@ -65,3 +67,29 @@ func TestBuildDockerImageOptionsInternal_EmptyAuthConfigsBecomesNil(t *testing.Trequire.NoError(t, err)assert.Nil(t, buildOpts.AuthConfigs)}++func TestPrepareDockerBuildContextInternal_StagesInlineDockerfile(t *testing.T) {+ contextDir := t.TempDir()+ require.NoError(t, os.WriteFile(filepath.Join(contextDir, "app.txt"), []byte("hello\n"), 0o644))++ req := imagetypes.BuildRequest{+ ContextDir: contextDir,+ DockerfileInline: "FROM alpine:3.20\nCOPY app.txt /app.txt\n",+ }++ input, reportProgress, err := prepareDockerBuildInputInternal(req)+ require.NoError(t, err)+ assert.False(t, reportProgress)++ buildContextDir, dockerfileForBuild, cleanup, err := prepareDockerBuildContextInternal(input)+ require.NoError(t, err)+ defer cleanup()++ contents, err := os.ReadFile(filepath.Join(buildContextDir, filepath.FromSlash(dockerfileForBuild)))+ require.NoError(t, err)+ assert.Equal(t, "FROM alpine:3.20\nCOPY app.txt /app.txt\n", string(contents))++ appContents, err := os.ReadFile(filepath.Join(buildContextDir, "app.txt"))+ require.NoError(t, err)+ assert.Equal(t, "hello\n", string(appContents))+}diff --git a/backend/pkg/libarcane/libbuild/builder_utils.go b/backend/pkg/libarcane/libbuild/builder_utils.goindex c92ab45f2..840c446e6 100644--- a/backend/pkg/libarcane/libbuild/builder_utils.go+++ b/backend/pkg/libarcane/libbuild/builder_utils.go@@ -32,6 +32,10 @@ func validateBuildRequestInternal(req imagetypes.BuildRequest, providerName strireturn fmt.Errorf("build context not found: %w", err)}+ if strings.TrimSpace(req.Dockerfile) != "" && strings.TrimSpace(req.DockerfileInline) != "" {+ return errors.New("dockerfile and dockerfileInline are mutually exclusive")+ }+if providerName == "depot" && !req.Push {return errors.New("depot builds must push images to a registry")}@@ -45,6 +49,9 @@ func validateBuildRequestInternal(req imagetypes.BuildRequest, providerName stri}dockerfilePath := strings.TrimSpace(req.Dockerfile)+ if strings.TrimSpace(req.DockerfileInline) != "" {+ return nil+ }if dockerfilePath == "" {dockerfilePath = "Dockerfile"}diff --git a/backend/pkg/libarcane/libbuild/builder_utils_test.go b/backend/pkg/libarcane/libbuild/builder_utils_test.goindex 1e634b481..626a59b9f 100644--- a/backend/pkg/libarcane/libbuild/builder_utils_test.go+++ b/backend/pkg/libarcane/libbuild/builder_utils_test.go@@ -72,3 +72,30 @@ func TestValidateBuildRequestInternal_RespectsTrimmedValues(t *testing.T) {err := validateBuildRequestInternal(req, "local")assert.NoError(t, err)}++func TestValidateBuildRequestInternal_AllowsInlineDockerfile(t *testing.T) {+ contextDir := t.TempDir()+ req := imagetypes.BuildRequest{+ ContextDir: contextDir,+ DockerfileInline: "FROM alpine:3.20\nRUN echo inline\n",+ Tags: []string{"ghcr.io/getarcaneapp/arcane:test"},+ Load: true,+ }++ err := validateBuildRequestInternal(req, "local")+ assert.NoError(t, err)+}++func TestValidateBuildRequestInternal_RejectsDockerfileAndInlineTogether(t *testing.T) {+ contextDir := createBuildContextWithDockerfileInternal(t)+ req := imagetypes.BuildRequest{+ ContextDir: contextDir,+ Dockerfile: "Dockerfile",+ DockerfileInline: "FROM alpine:3.20\n",+ Tags: []string{"ghcr.io/getarcaneapp/arcane:test"},+ Load: true,+ }++ err := validateBuildRequestInternal(req, "local")+ require.EqualError(t, err, "dockerfile and dockerfileInline are mutually exclusive")+}diff --git a/frontend/src/lib/components/action-buttons.svelte b/frontend/src/lib/components/action-buttons.svelteindex 77f7839ee..49139914f 100644--- a/frontend/src/lib/components/action-buttons.svelte+++ b/frontend/src/lib/components/action-buttons.svelte@@ -206,7 +206,9 @@}});const deployPopoverIcon = $derived(deployProgressPhase === 'build' ? HammerIcon : DownloadIcon);- const deployPopoverLayers = $derived.by(() => (deployProgressPhase === 'pull' ? layerProgress : {}));+ const deployPopoverLayers = $derived.by(() =>+ deployProgressPhase === 'pull' || deployProgressPhase === 'build' ? 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).@@ -297,6 +299,64 @@pullProgress = calculateOverallProgress(layerProgress);}+ function updateLayerProgressFromStreamData(data: any) {+ const layerId = String(data?.id ?? '').trim();+ if (!layerId) return;++ const currentLayer = layerProgress[layerId] || { current: 0, total: 0, status: '' };+ if (data?.status) {+ currentLayer.status = String(data.status);+ }++ if (data?.progressDetail) {+ const { current, total } = data.progressDetail;+ if (typeof current === 'number') currentLayer.current = current;+ if (typeof total === 'number') currentLayer.total = total;+ }++ layerProgress[layerId] = currentLayer;+ updatePullProgress();+ }++ function handleBuildStreamLine(+ data: any,+ errorFallback: string,+ errorFormatter: (message: string) => string,+ onError?: (message: string) => void+ ): boolean {+ if (!data) return false;++ if (data.phase === 'begin') {+ pullStatusText = m.progress_building_images_starting();+ appendBuildOutputLine(m.build_phase_started(), data.service);+ }++ if (data.status) {+ pullStatusText = String(data.status);+ appendBuildOutputLine(data.status, data.service);+ }++ if (data.id) {+ updateLayerProgressFromStreamData(data);+ }++ if (data.phase === 'complete') {+ pullStatusText = m.build_completed();+ pullProgress = 100;+ appendBuildOutputLine(m.build_phase_completed(), data.service);+ }++ if (data.error) {+ const errMsg = typeof data.error === 'string' ? data.error : data.error.message || errorFallback;+ pullError = errMsg;+ pullStatusText = errorFormatter(errMsg);+ onError?.(errMsg);+ return true;+ }++ return false;+ }+async function handleRefresh() {if (!onRefresh) return;await refreshMutation.mutateAsync();@@ -411,42 +471,19 @@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;+ if (+ handleBuildStreamLine(+ deployData,+ m.progress_deploy_failed(),+ (errMsg) => 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;}@@ -742,17 +779,7 @@(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);- }+ handleBuildStreamLine(data, m.build_failed(), (errMsg) => m.build_failed_with_error({ error: errMsg }));});@@ -808,6 +835,7 @@loading={deployPulling}icon={deployPopoverIcon}layers={deployPopoverLayers}+ showOutputPanel={deployProgressPhase === 'build'}outputLines={deployProgressPhase === 'build' ? buildOutputLines : []}><DeploySplitButton@@ -868,6 +896,8 @@error={pullError}loading={projectBuilding}icon={HammerIcon}+ layers={layerProgress}+ showOutputPanel={projectBuilding}outputLines={buildOutputLines}><ArcaneButton@@ -1018,6 +1048,7 @@loading={deployPulling}icon={deployPopoverIcon}layers={deployPopoverLayers}+ showOutputPanel={deployProgressPhase === 'build'}outputLines={deployProgressPhase === 'build' ? buildOutputLines : []}triggerClass="hidden">@@ -1034,6 +1065,8 @@error={pullError}loading={projectBuilding}icon={HammerIcon}+ layers={layerProgress}+ showOutputPanel={projectBuilding}outputLines={buildOutputLines}triggerClass="hidden">@@ -1075,6 +1108,7 @@loading={deployPulling}icon={deployPopoverIcon}layers={deployPopoverLayers}+ showOutputPanel={deployProgressPhase === 'build'}outputLines={deployProgressPhase === 'build' ? buildOutputLines : []}><DeploySplitButton customLabel={deployButtonLabel} onDeploy={() => handleDeploy()} loading={uiLoading.start} />@@ -1109,6 +1143,8 @@error={pullError}loading={projectBuilding}icon={HammerIcon}+ layers={layerProgress}+ showOutputPanel={projectBuilding}outputLines={buildOutputLines}><ArcaneButton action="build" onclick={() => handleProjectBuild()} loading={projectBuilding} />diff --git a/frontend/src/lib/components/progress-popover.svelte b/frontend/src/lib/components/progress-popover.svelteindex 4ae660999..476cf4abb 100644--- a/frontend/src/lib/components/progress-popover.svelte+++ b/frontend/src/lib/components/progress-popover.svelte@@ -42,6 +42,8 @@onCancel?: () => void;layers?: Record<string, LayerProgress>;outputLines?: string[];+ showOutputPanel?: boolean;+ outputPlaceholder?: string;triggerClass?: string;children: Snippet;}@@ -65,6 +67,8 @@onCancel,layers = {},outputLines = [],+ showOutputPanel = false,+ outputPlaceholder = m.build_output_placeholder(),triggerClass,children}: Props = $props();@@ -83,6 +87,7 @@const percent = $derived(Math.round(progress));const isComplete = $derived(progress >= 100);+ const hasStructuredProgress = $derived(Object.keys(layers).length > 0 || progress > 0);// Track if we've ever reached complete state to prevent flashing backlet hasReachedComplete = $state(false);@@ -103,8 +108,9 @@// 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 isIndeterminateGeneric = $derived(mode !== 'pull' && loading && !isComplete && !error && !hasStructuredProgress);const cleanStatusText = $derived(sanitizeLogText(statusText));+ const genericStatus = $derived(cleanStatusText || subtitle);// Derive aggregate status for displayconst aggregateStatus = $derived(getAggregateStatus(layers, cleanStatusText, hasReachedComplete || isComplete));@@ -184,8 +190,17 @@<Item.Description class={cn(error && 'line-clamp-none break-words whitespace-pre-wrap')}>{#if error}{error}+ {:else if mode !== 'pull' && layerStats.total > 0}+ {hasReachedComplete ? 100 : percent}% · {genericStatus}+ <span class="text-muted-foreground">+ · {m.progress_layers_status({ completed: layerStats.completed, total: layerStats.total })}</span+ >{:else if mode !== 'pull'}- {aggregateStatus || subtitle}+ {#if hasStructuredProgress || loading || hasReachedComplete}+ {hasReachedComplete ? 100 : percent}% · {genericStatus}+ {:else}+ {genericStatus}+ {/if}{:else if layerStats.total > 0}{aggregateStatus || subtitle}<span class="text-muted-foreground">@@ -256,7 +271,7 @@</Collapsible.Root>{/if}- {#if outputLines.length > 0 && !error}+ {#if (showOutputPanel || 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>@@ -264,9 +279,9 @@</div><prebind: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>+ class="max-h-40 overflow-y-auto px-2 py-2 font-mono text-[11px] leading-relaxed whitespace-pre-wrap text-emerald-200">{#if outputLines.length > 0}{#each outputLines as line, i (i)}<span+ class="block break-words">{line}</span+ >{/each}{:else}<span class="text-emerald-300/60">{outputPlaceholder}</span>{/if}</pre></div>{/if}{/snippet}diff --git a/types/image/image.go b/types/image/image.goindex 45f30ed56..b5d73c99b 100644--- a/types/image/image.go+++ b/types/image/image.go@@ -257,6 +257,11 @@ type BuildRequest struct {// Required: falseDockerfile string `json:"dockerfile,omitempty" doc:"Dockerfile path"`+ // DockerfileInline is the inline Dockerfile content staged into the build context.+ //+ // Required: false+ DockerfileInline string `json:"dockerfileInline,omitempty" doc:"Inline Dockerfile content"`+// Tags are image tags to apply.//// Required: false