Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
fix: build project images before redeploying after Git sync (#4611)
Kyle Mendell76cb3ce8fadd
diff --git a/backend/internal/gitops/children/sync/service.go b/backend/internal/gitops/children/sync/service.goindex 49ac83eb4..f8c532a3d 100644--- a/backend/internal/gitops/children/sync/service.go+++ b/backend/internal/gitops/children/sync/service.go@@ -120,9 +120,10 @@ func New(}}-// Run clones the sync source and applies it to its project or Swarm stack. A retry replays the-// revision its run pinned, and redeploys it unless the record already confirms that revision.-func (s *Service) Run(ctx context.Context, sync *projectpkg.GitOpsSync, actor user.Actor, result *gitops.SyncResult) (*gitops.SyncResult, error) {+// Run clones the sync source and applies it to its project or Swarm stack within sourceTimeout; the redeploy+// keeps ctx's own budget. A retry replays the revision its run pinned, and redeploys it unless the record+// already confirms that revision.+func (s *Service) Run(ctx context.Context, sourceTimeout time.Duration, sync *projectpkg.GitOpsSync, actor user.Actor, result *gitops.SyncResult) (*gitops.SyncResult, error) {pinned := ""if run, ok := jobcontext.Run(ctx); ok {index := slices.IndexFunc(run.Outcome.Targets, func(target scheduler.TargetOutcome) bool {@@ -142,7 +143,10 @@ func (s *Service) Run(ctx context.Context, sync *projectpkg.GitOpsSync, actor usreturn result, nil}- source, err := s.prepareSyncSource(ctx, sync, result, actor, pinned)+ stageCtx, cancelStage := context.WithTimeout(ctx, sourceTimeout)+ defer cancelStage()++ source, err := s.prepareSyncSource(stageCtx, sync, result, actor, pinned)if source != nil {defer s.repoService.Discard(ctx, source.repoPath)}@@ -152,7 +156,7 @@ func (s *Service) Run(ctx context.Context, sync *projectpkg.GitOpsSync, actor usvar syncFiles []projects.SyncFileif sync.SyncDirectory {- if syncFiles, err = s.walkAndParseSyncDirectory(ctx, sync, source.repoPath); err != nil {+ if syncFiles, err = s.walkAndParseSyncDirectory(stageCtx, sync, source.repoPath); err != nil {return result, s.failSync(ctx, result, sync, actor, "Failed to walk directory", err)}}@@ -180,18 +184,18 @@ func (s *Service) Run(ctx context.Context, sync *projectpkg.GitOpsSync, actor usWithRegistryAuth: true,WorkingDir: filepath.Dir(filepath.Join(source.repoPath, sync.ComposePath)),}- if _, deployErr := s.swarmService.DeployStack(ctx, sync.EnvironmentID, request); deployErr != nil {+ if _, deployErr := s.swarmService.DeployStack(stageCtx, sync.EnvironmentID, request); deployErr != nil {return result, s.failSync(ctx, result, sync, actor, "Failed to deploy swarm stack", deployErr)}result.Message = fmt.Sprintf("Successfully deployed swarm stack %s from %s", sync.ProjectName, sync.ComposePath)case sync.SyncDirectory:- if project, syncedFiles, _, changed, err = s.syncProjectDirectory(ctx, sync, syncFiles, actor); err != nil {+ if project, syncedFiles, _, changed, err = s.syncProjectDirectory(stageCtx, sync, syncFiles, actor); err != nil {message := kit.Ternary(errors.Is(err, common.ErrGitOpsSyncProjectBindingBroken), "GitOps project binding broken", "Failed to sync project directory")return result, s.failSync(ctx, result, sync, actor, message, err)}result.Message = fmt.Sprintf("Successfully synced directory with %d files to project %s", len(syncedFiles), project.Name)default:- if project, changed, err = s.syncComposeFile(ctx, sync, actor, result, source); err != nil {+ if project, changed, err = s.syncComposeFile(stageCtx, sync, actor, result, source); err != nil {return result, err}result.Message = fmt.Sprintf("Successfully synced compose file from %s to project %s", sync.ComposePath, project.Name)@@ -406,7 +410,7 @@ func (s *Service) syncComposeFile(ctx context.Context, sync *projectpkg.GitOpsSyreturn project, true, nil}-// redeployIfRunningAfterSync redeploys a running project, or any project when RedeployAfterSync is on. A project+// redeployIfRunningAfterSync rebuilds and redeploys a running project, or any project when RedeployAfterSync is on. A project// left stopped still gets its images pulled when PullImageAfterSync is on, so a re-pointed tag stays available.func (s *Service) redeployIfRunningAfterSync(ctx context.Context, sync *projectpkg.GitOpsSync, project *projectpkg.Project, actor user.Actor) error {details, err := s.projectService.GetProjectDetails(ctx, project.ID, projecttypes.DetailsOptions{})@@ -414,7 +418,7 @@ func (s *Service) redeployIfRunningAfterSync(ctx context.Context, sync *projectpswitch {case running || sync.RedeployAfterSync:slog.InfoContext(ctx, "Redeploying project after Git sync", "projectName", project.Name, "projectId", project.ID, "wasRunning", running)- if redeployErr := s.projectService.RedeployProject(ctx, project.ID, actor, nil); redeployErr != nil {+ if redeployErr := s.projectService.RedeployProject(ctx, project.ID, actor, &projecttypes.DeployOptions{Build: true}); redeployErr != nil {slog.ErrorContext(ctx, "Failed to redeploy project after Git sync", "error", redeployErr, "projectId", project.ID)return common.Classify(common.ErrRedeployAfterSyncFailed, fmt.Errorf("redeploy failed: %w", redeployErr))}diff --git a/backend/internal/gitops/service.go b/backend/internal/gitops/service.goindex 636d1cbec..00af1de19 100644--- a/backend/internal/gitops/service.go+++ b/backend/internal/gitops/service.go@@ -819,7 +819,7 @@ func (s *GitOpsSyncService) performSyncAdmitted(ctx context.Context, environmentreturn s.backup.Perform(syncCtx, syncRecord, actor, result, backupAdopt)}- return s.sync.Run(syncCtx, syncRecord, actor, result)+ return s.sync.Run(ctx, defaultGitSyncTimeout, syncRecord, actor, result)}func (s *GitOpsSyncService) GetSyncStatus(ctx context.Context, environmentID, id string) (*gitops.SyncStatus, error) {diff --git a/backend/pkg/projects/coordinator.go b/backend/pkg/projects/coordinator.goindex a5084bd87..e738f2037 100644--- a/backend/pkg/projects/coordinator.go+++ b/backend/pkg/projects/coordinator.go@@ -57,16 +57,16 @@ func (c *composeCoordinatorInternal) Deploy(ctx context.Context, request projectreturn nil, fmt.Errorf("resolve registry credentials: %w", err)}pullPolicy := ""- forceRecreate, recreateVolumes := false, false+ forceRecreate, recreateVolumes, build := false, false, falseif request.Options != nil {pullPolicy = NormalizeDeployPullPolicy(request.Options.PullPolicy)- forceRecreate, recreateVolumes = request.Options.ForceRecreate, request.Options.RecreateVolumes+ forceRecreate, recreateVolumes, build = request.Options.ForceRecreate, request.Options.RecreateVolumes, request.Options.Build}if pullPolicy == "" {pullPolicy = NormalizeDeployPullPolicy(request.DefaultPullPolicy)}pullPolicy = cmp.Or(pullPolicy, "missing")- if prepareImagesForDeployErr := c.PrepareImagesForDeploy(ctx, request.ProjectID, model, request.Progress, operations, pullPolicy); prepareImagesForDeployErr != nil {+ if prepareImagesForDeployErr := c.PrepareImagesForDeploy(ctx, request.ProjectID, model, request.Progress, operations, pullPolicy, build); prepareImagesForDeployErr != nil {return nil, fmt.Errorf("failed to prepare project images for deploy: %w", prepareImagesForDeployErr)}removeOrphans := ResolveRemoveOrphans(request.GitOpsManaged, request.Options)@@ -256,6 +256,7 @@ func (c *composeCoordinatorInternal) PrepareImagesForDeploy(progressWriter io.Writer,operations projecttypes.ComposeImageOperations,pullPolicyOverride string,+ build bool,) error {if project == nil {return nil@@ -273,7 +274,10 @@ func (c *composeCoordinatorInternal) PrepareImagesForDeploy(decision := DecideDeployImageAction(localSvc, pullPolicyOverride)serviceDecision := decision- if updated && !decision.Build {+ switch {+ case build && localSvc.Build != nil:+ serviceDecision = DeployImageDecision{Build: true}+ case updated && !decision.Build:exists, existsErr := operations.Exists(ctx, imageName)if existsErr != nil {slog.WarnContext(ctx, "failed to check local image existence", "image", imageName, "error", existsErr)@@ -387,6 +391,9 @@ func (c *composeCoordinatorInternal) buildServiceImageForDeployInternal(if buildErr := operations.Build(ctx, buildReq, progressWriter, serviceName); buildErr != nil {return buildErr}+ if buildReq.Provider == "depot" {+ return operations.Pull(ctx, strings.TrimSpace(updatedSvc.Image), progressWriter)+ }return nil}diff --git a/types/project/project.go b/types/project/project.goindex fe165e5c1..d3b164b10 100644--- a/types/project/project.go+++ b/types/project/project.go@@ -170,6 +170,11 @@ type DeployOptions struct {// Required: falseForceRecreate bool `json:"forceRecreate,omitempty"`+ // Build rebuilds services that define a build section before deploying.+ //+ // Required: false+ Build bool `json:"build,omitempty"`+// RemoveOrphans removes containers for services not defined in the compose file.//// Required: false