Skip to content

Modern Docker Management, Designed for Everyone

feat: configurable compose up button (#1940)

Kyle Mendellf6bb8d2a0fec
diff --git a/backend/internal/huma/handlers/projects.go b/backend/internal/huma/handlers/projects.go
index 7fb4309f9..73db6e3f4 100644
--- a/backend/internal/huma/handlers/projects.go
+++ b/backend/internal/huma/handlers/projects.go
@@ -59,6 +59,7 @@ type GetProjectStatusCountsOutput struct {
type DeployProjectInput struct {
EnvironmentID string `path:"id" doc:"Environment ID"`
ProjectID string `path:"projectId" doc:"Project ID"`
+ Body *project.DeployOptions
}
type DeployProjectOutput struct {
@@ -448,7 +449,7 @@ func (h *ProjectHandler) DeployProject(ctx context.Context, input *DeployProject
}
deployCtx := context.WithValue(humaCtx.Context(), projects.ProgressWriterKey{}, writer)
- if err := h.projectService.DeployProject(deployCtx, input.ProjectID, *user); err != nil {
+ if err := h.projectService.DeployProject(deployCtx, input.ProjectID, *user, input.Body); err != nil {
_, _ = fmt.Fprintf(writer, `{"error":%q}`+"\n", err.Error())
if f, ok := writer.(http.Flusher); ok {
f.Flush()
diff --git a/backend/internal/models/settings.go b/backend/internal/models/settings.go
index 214145bcf..391f00dca 100644
--- a/backend/internal/models/settings.go
+++ b/backend/internal/models/settings.go
@@ -63,6 +63,7 @@ type Settings struct {
AnalyticsHeartbeatInterval SettingVariable `key:"analyticsHeartbeatInterval" meta:"label=Analytics Heartbeat Interval;type=cron;keywords=analytics,heartbeat,interval,frequency,schedule,telemetry,jobs;description=How often to send the anonymous analytics heartbeat (cron expression)"`
AutoInjectEnv SettingVariable `key:"autoInjectEnv" meta:"label=Auto Inject Env Variables;type=boolean;keywords=auto,inject,env,environment,variables,interpolation;category=internal;description=Automatically inject project .env variables into all containers (default: false)"`
PruneMode SettingVariable `key:"dockerPruneMode" meta:"label=Docker Prune Action;type=select;keywords=prune,cleanup,clean,remove,delete,unused,dangling,space,disk;category=internal;description=Configure how unused Docker images are cleaned up"`
+ DefaultDeployPullPolicy SettingVariable `key:"defaultDeployPullPolicy" meta:"label=Default Deploy Pull Policy;type=select;keywords=deploy,pull,policy,compose,up,missing,always;category=internal;description=Default image pull policy when deploying projects"`
ScheduledPruneEnabled SettingVariable `key:"scheduledPruneEnabled" meta:"label=Scheduled Prune Enabled;type=boolean;keywords=prune,cleanup,maintenance,schedule,automatic;category=internal;description=Enable scheduled pruning of unused Docker resources"`
ScheduledPruneInterval SettingVariable `key:"scheduledPruneInterval" meta:"label=Scheduled Prune Interval;type=cron;keywords=prune,cleanup,interval,minutes,schedule;category=internal;description=How often to run scheduled prunes (cron expression)"`
GitopsSyncInterval SettingVariable `key:"gitopsSyncInterval" meta:"label=GitOps Sync Interval;type=cron;keywords=gitops,sync,interval,frequency,schedule,repository;category=internal;description=How often to run GitOps synchronization checks (cron expression)"`
diff --git a/backend/internal/services/gitops_sync_service.go b/backend/internal/services/gitops_sync_service.go
index 083b0e769..64e75366f 100644
--- a/backend/internal/services/gitops_sync_service.go
+++ b/backend/internal/services/gitops_sync_service.go
@@ -615,7 +615,7 @@ func (s *GitOpsSyncService) createProjectForSyncInternal(ctx context.Context, sy
// Deploy the project immediately after creation
slog.InfoContext(ctx, "Deploying project after initial Git sync", "projectName", project.Name, "projectId", project.ID)
- if err := s.projectService.DeployProject(ctx, project.ID, actor); err != nil {
+ if err := s.projectService.DeployProject(ctx, project.ID, actor, nil); err != nil {
slog.ErrorContext(ctx, "Failed to deploy project after initial Git sync", "error", err, "projectId", project.ID)
}
diff --git a/backend/internal/services/project_service.go b/backend/internal/services/project_service.go
index 085ab0216..57796e9a2 100644
--- a/backend/internal/services/project_service.go
+++ b/backend/internal/services/project_service.go
@@ -790,12 +790,25 @@ func (s *ProjectService) GetProjectStatusCounts(ctx context.Context) (folderCoun
// Project Actions
-func (s *ProjectService) DeployProject(ctx context.Context, projectID string, user models.User) error {
+func (s *ProjectService) DeployProject(ctx context.Context, projectID string, user models.User, options *project.DeployOptions) error {
projectFromDb, err := s.GetProjectFromDatabaseByID(ctx, projectID)
if err != nil {
return fmt.Errorf("failed to get project: %w", err)
}
+ resolvedPullPolicy := ""
+ forceRecreate := false
+ if options != nil {
+ resolvedPullPolicy = normalizeDeployPullPolicyInternal(options.PullPolicy)
+ forceRecreate = options.ForceRecreate
+ }
+ if resolvedPullPolicy == "" {
+ resolvedPullPolicy = normalizeDeployPullPolicyInternal(s.settingsService.GetStringSetting(ctx, "defaultDeployPullPolicy", "missing"))
+ }
+ if resolvedPullPolicy == "" {
+ resolvedPullPolicy = "missing"
+ }
+
composeFileFullPath, derr := projects.DetectComposeFile(projectFromDb.Path)
if derr != nil {
return fmt.Errorf("no compose file found in project directory: %s", projectFromDb.Path)
@@ -824,7 +837,7 @@ func (s *ProjectService) DeployProject(ctx context.Context, projectID string, us
return fmt.Errorf("failed to update project status to deploying: %w", err)
}
- if perr := s.prepareProjectImagesForDeploy(ctx, projectID, project, io.Discard, nil, &user); perr != nil {
+ 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)
}
@@ -832,7 +845,7 @@ func (s *ProjectService) DeployProject(ctx context.Context, projectID string, us
slog.Info("starting compose up with health check support", "projectID", projectID, "projectName", project.Name, "services", len(project.Services), "removeOrphans", removeOrphans)
// Health/progress streaming (if any) is handled inside projects.ComposeUp via ctx.
- if err := projects.ComposeUp(ctx, project, nil, removeOrphans); err != nil {
+ if err := projects.ComposeUp(ctx, project, nil, removeOrphans, forceRecreate); err != nil {
slog.Error("compose up failed", "projectName", project.Name, "projectID", projectID, "error", err)
if containers, psErr := s.GetProjectServices(ctx, projectID); psErr == nil {
slog.Info("containers after failed deploy", "projectID", projectID, "containers", containers)
@@ -1031,7 +1044,7 @@ func (s *ProjectService) RedeployProject(ctx context.Context, projectID string,
slog.ErrorContext(ctx, "could not log project redeploy action", "error", logErr)
}
- return s.DeployProject(ctx, projectID, user)
+ return s.DeployProject(ctx, projectID, user, nil)
}
func (s *ProjectService) PullProjectImages(ctx context.Context, projectID string, progressWriter io.Writer, user models.User, credentials []containerregistry.Credential) error {
@@ -1223,6 +1236,7 @@ func (s *ProjectService) prepareProjectImagesForDeploy(
progressWriter io.Writer,
credentials []containerregistry.Credential,
user *models.User,
+ pullPolicyOverride string,
) error {
if project == nil {
return nil
@@ -1243,7 +1257,7 @@ func (s *ProjectService) prepareProjectImagesForDeploy(
continue
}
- decision := decideDeployImageAction(svc)
+ decision := decideDeployImageAction(svc, pullPolicyOverride)
if err := s.ensureDeployServiceImageReady(ctx, projectID, project, name, svc, imageName, decision, progressWriter, credentials, user, pathMapper); err != nil {
return err
}
@@ -1375,6 +1389,16 @@ func normalizePullPolicy(policy string) string {
return policy
}
+func normalizeDeployPullPolicyInternal(policy string) string {
+ normalized := normalizePullPolicy(policy)
+ switch normalized {
+ case "always", "missing", "never":
+ return normalized
+ default:
+ return ""
+ }
+}
+
func isAlwaysPullPolicy(policy string) bool {
if policy == "always" || policy == "daily" || policy == "weekly" {
return true
@@ -1382,8 +1406,13 @@ func isAlwaysPullPolicy(policy string) bool {
return strings.HasPrefix(policy, "every_")
}
-func decideDeployImageAction(svc composetypes.ServiceConfig) deployImageDecision {
+func decideDeployImageAction(svc composetypes.ServiceConfig, pullPolicyOverride string) deployImageDecision {
policy := normalizePullPolicy(svc.PullPolicy)
+ if policy == "" {
+ if override := normalizeDeployPullPolicyInternal(pullPolicyOverride); override != "" {
+ policy = override
+ }
+ }
buildEnabled := svc.Build != nil
if buildEnabled {
diff --git a/backend/internal/services/project_service_test.go b/backend/internal/services/project_service_test.go
index 67ed26936..30ab1206e 100644
--- a/backend/internal/services/project_service_test.go
+++ b/backend/internal/services/project_service_test.go
@@ -591,14 +591,14 @@ func TestDecideDeployImageAction(t *testing.T) {
Build: &composetypes.BuildConfig{Context: "."},
}
- decision := decideDeployImageAction(svc)
+ 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)
+ decision := decideDeployImageAction(svc, "")
assert.True(t, decision.PullIfMissing)
assert.True(t, decision.FallbackBuildOnPullFail)
assert.False(t, decision.Build)
@@ -606,10 +606,17 @@ func TestDecideDeployImageAction(t *testing.T) {
t.Run("non-build service never policy requires local only", func(t *testing.T) {
svc := composetypes.ServiceConfig{PullPolicy: "never"}
- decision := decideDeployImageAction(svc)
+ decision := decideDeployImageAction(svc, "")
assert.True(t, decision.RequireLocalOnly)
assert.False(t, decision.PullIfMissing)
})
+
+ t.Run("compose pull policy wins over deploy override", func(t *testing.T) {
+ svc := composetypes.ServiceConfig{PullPolicy: "never"}
+ decision := decideDeployImageAction(svc, "always")
+ assert.True(t, decision.RequireLocalOnly)
+ assert.False(t, decision.PullAlways)
+ })
}
func TestProjectService_PrepareServiceBuildRequest_GeneratedImageProviderGuardrails(t *testing.T) {
diff --git a/backend/internal/services/settings_service.go b/backend/internal/services/settings_service.go
index f09a710d9..3520f7253 100644
--- a/backend/internal/services/settings_service.go
+++ b/backend/internal/services/settings_service.go
@@ -97,6 +97,7 @@ func (s *SettingsService) getDefaultSettings() *models.Settings {
AnalyticsHeartbeatInterval: models.SettingVariable{Value: "0 0 0 * * *"},
AutoInjectEnv: models.SettingVariable{Value: "false"},
PruneMode: models.SettingVariable{Value: "dangling"},
+ DefaultDeployPullPolicy: models.SettingVariable{Value: "missing"},
ScheduledPruneEnabled: models.SettingVariable{Value: "false"},
ScheduledPruneInterval: models.SettingVariable{Value: "0 0 0 * * *"},
ScheduledPruneContainers: models.SettingVariable{Value: "true"},
diff --git a/backend/pkg/projects/cmds.go b/backend/pkg/projects/cmds.go
index dad1bd482..dc453d247 100644
--- a/backend/pkg/projects/cmds.go
+++ b/backend/pkg/projects/cmds.go
@@ -42,7 +42,7 @@ func ComposeRestart(ctx context.Context, proj *types.Project, services []string)
return c.svc.Restart(ctx, proj.Name, api.RestartOptions{Services: services})
}
-func ComposeUp(ctx context.Context, proj *types.Project, services []string, removeOrphans bool) error {
+func ComposeUp(ctx context.Context, proj *types.Project, services []string, removeOrphans bool, forceRecreate bool) error {
c, err := NewClient(ctx)
if err != nil {
return err
@@ -51,7 +51,7 @@ func ComposeUp(ctx context.Context, proj *types.Project, services []string, remo
progressWriter, _ := ctx.Value(ProgressWriterKey{}).(io.Writer)
- upOptions, startOptions := composeUpOptions(proj, services, removeOrphans)
+ upOptions, startOptions := composeUpOptions(proj, services, removeOrphans, forceRecreate)
// If we don't need progress, just run compose up normally.
if progressWriter == nil {
@@ -61,10 +61,15 @@ func ComposeUp(ctx context.Context, proj *types.Project, services []string, remo
return composeUpWithProgress(ctx, c.svc, proj, api.UpOptions{Create: upOptions, Start: startOptions}, progressWriter)
}
-func composeUpOptions(proj *types.Project, services []string, removeOrphans bool) (api.CreateOptions, api.StartOptions) {
+func composeUpOptions(proj *types.Project, services []string, removeOrphans bool, forceRecreate bool) (api.CreateOptions, api.StartOptions) {
+ recreatePolicy := api.RecreateDiverged
+ if forceRecreate {
+ recreatePolicy = api.RecreateForce
+ }
+
upOptions := api.CreateOptions{
Services: services,
- Recreate: api.RecreateDiverged,
+ Recreate: recreatePolicy,
RecreateDependencies: api.RecreateDiverged,
RemoveOrphans: removeOrphans,
}
diff --git a/frontend/messages/en.json b/frontend/messages/en.json
index c964c6c96..ff16e3920 100644
--- a/frontend/messages/en.json
+++ b/frontend/messages/en.json
@@ -2159,5 +2159,11 @@
"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"
+ "build_history": "Build History",
+ "deploy_pull_policy_missing": "Pull if not present",
+ "deploy_pull_policy_always": "Always pull latest",
+ "deploy_pull_policy_never": "Never pull",
+ "deploy_force_recreate": "Force recreate containers",
+ "settings_default_deploy_pull_policy": "Default Deploy Pull Policy",
+ "settings_default_deploy_pull_policy_description": "Default image pull policy when deploying projects"
}
diff --git a/frontend/src/lib/components/action-buttons.svelte b/frontend/src/lib/components/action-buttons.svelte
index 3e193917d..77f7839ee 100644
--- a/frontend/src/lib/components/action-buttons.svelte
+++ b/frontend/src/lib/components/action-buttons.svelte
@@ -6,12 +6,14 @@
import { tryCatch } from '$lib/utils/try-catch';
import { handleApiResultWithCallbacks } from '$lib/utils/api.util';
import { ArcaneButton } from '$lib/components/arcane-button/index.js';
+ import DeploySplitButton from '$lib/components/deploy-split-button/deploy-split-button.svelte';
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 { deployOptionsStore } from '$lib/stores/deploy-options.store.svelte';
import { containerService } from '$lib/services/container-service';
- import { projectService } from '$lib/services/project-service';
+ import { projectService, type DeployProjectOptions } from '$lib/services/project-service';
import { isDownloadingLine, calculateOverallProgress, areAllLayersComplete } from '$lib/utils/pull-progress';
import { sanitizeLogText } from '$lib/utils/log-text';
import { EllipsisIcon, DownloadIcon, HammerIcon } from '$lib/icons';
@@ -89,6 +91,12 @@
if (key === 'refresh') refreshLoading = value;
}
+ function handleDeployPullPolicyChange(value: string) {
+ if (value === 'missing' || value === 'always' || value === 'never') {
+ deployOptionsStore.setPullPolicy(value);
+ }
+ }
+
const uiLoading = $derived({
start: !!(isLoading.start || loading?.start || startLoading),
stop: !!(isLoading.stop || loading?.stop || stopLoading),
@@ -103,7 +111,12 @@
const startMutation = createMutation(() => ({
mutationKey: ['action', 'start', type, id],
- mutationFn: () => tryCatch(type === 'container' ? containerService.startContainer(id) : projectService.deployProject(id)),
+ mutationFn: () =>
+ tryCatch(
+ type === 'container'
+ ? containerService.startContainer(id)
+ : projectService.deployProject(id, deployOptionsStore.getRequestOptions())
+ ),
onMutate: () => setLoading('start', true),
onSettled: () => {
if (!deployPulling) {
@@ -367,7 +380,7 @@
});
}
- async function handleDeploy() {
+ async function handleDeploy(options?: DeployProjectOptions) {
resetPullState();
setLoading('start', true);
let openedPopover = false;
@@ -583,7 +596,7 @@
}
};
- await projectService.deployProject(id, handleDeployLine);
+ await projectService.deployProject(id, handleDeployLine, options ?? deployOptionsStore.getRequestOptions());
if (hadError) throw new Error(pullError || m.progress_deploy_failed());
@@ -797,12 +810,11 @@
layers={deployPopoverLayers}
outputLines={deployProgressPhase === 'build' ? buildOutputLines : []}
>
- <ArcaneButton
- action="deploy"
+ <DeploySplitButton
size={adaptiveIconOnly ? 'icon' : 'default'}
showLabel={!adaptiveIconOnly}
customLabel={deployButtonLabel}
- onclick={() => handleDeploy()}
+ onDeploy={() => handleDeploy()}
loading={uiLoading.start}
/>
</ProgressPopover>
@@ -927,9 +939,29 @@
{m.common_start()}
</DropdownMenu.Item>
{:else}
- <DropdownMenu.Item onclick={handleDeploy} disabled={uiLoading.start}>
+ <DropdownMenu.Item onclick={() => handleDeploy()} disabled={uiLoading.start}>
{deployButtonLabel}
</DropdownMenu.Item>
+ {#if type === 'project'}
+ <DropdownMenu.Separator />
+ <DropdownMenu.Label>{m.settings_default_deploy_pull_policy()}</DropdownMenu.Label>
+ <DropdownMenu.RadioGroup value={deployOptionsStore.pullPolicy} onValueChange={handleDeployPullPolicyChange}>
+ <DropdownMenu.RadioItem value="missing">Missing</DropdownMenu.RadioItem>
+ <DropdownMenu.RadioItem value="always">
+ {m.common_always()}
+ </DropdownMenu.RadioItem>
+ <DropdownMenu.RadioItem value="never">
+ {m.common_never()}
+ </DropdownMenu.RadioItem>
+ </DropdownMenu.RadioGroup>
+ <DropdownMenu.Separator />
+ <DropdownMenu.CheckboxItem
+ checked={deployOptionsStore.forceRecreate}
+ onCheckedChange={(checked) => deployOptionsStore.setForceRecreate(checked === true)}
+ >
+ {m.deploy_force_recreate()}
+ </DropdownMenu.CheckboxItem>
+ {/if}
{/if}
{:else}
<DropdownMenu.Item onclick={handleStop} disabled={uiLoading.stop}>
@@ -1045,12 +1077,7 @@
layers={deployPopoverLayers}
outputLines={deployProgressPhase === 'build' ? buildOutputLines : []}
>
- <ArcaneButton
- action="deploy"
- customLabel={deployButtonLabel}
- onclick={() => handleDeploy()}
- loading={uiLoading.start}
- />
+ <DeploySplitButton customLabel={deployButtonLabel} onDeploy={() => handleDeploy()} loading={uiLoading.start} />
</ProgressPopover>
{/if}
{/if}
@@ -1133,9 +1160,29 @@
{m.common_start()}
</DropdownMenu.Item>
{:else}
- <DropdownMenu.Item onclick={handleDeploy} disabled={uiLoading.start}>
+ <DropdownMenu.Item onclick={() => handleDeploy()} disabled={uiLoading.start}>
{deployButtonLabel}
</DropdownMenu.Item>
+ {#if type === 'project'}
+ <DropdownMenu.Separator />
+ <DropdownMenu.Label>{m.settings_default_deploy_pull_policy()}</DropdownMenu.Label>
+ <DropdownMenu.RadioGroup value={deployOptionsStore.pullPolicy} onValueChange={handleDeployPullPolicyChange}>
+ <DropdownMenu.RadioItem value="missing">Missing</DropdownMenu.RadioItem>
+ <DropdownMenu.RadioItem value="always">
+ {m.common_always()}
+ </DropdownMenu.RadioItem>
+ <DropdownMenu.RadioItem value="never">
+ {m.common_never()}
+ </DropdownMenu.RadioItem>
+ </DropdownMenu.RadioGroup>
+ <DropdownMenu.Separator />
+ <DropdownMenu.CheckboxItem
+ checked={deployOptionsStore.forceRecreate}
+ onCheckedChange={(checked) => deployOptionsStore.setForceRecreate(checked === true)}
+ >
+ {m.deploy_force_recreate()}
+ </DropdownMenu.CheckboxItem>
+ {/if}
{/if}
{:else}
<DropdownMenu.Item onclick={handleStop} disabled={uiLoading.stop}>
diff --git a/frontend/src/lib/components/deploy-split-button/deploy-split-button.svelte b/frontend/src/lib/components/deploy-split-button/deploy-split-button.svelte
new file mode 100644
index 000000000..67a6b6ab9
--- /dev/null
+++ b/frontend/src/lib/components/deploy-split-button/deploy-split-button.svelte
@@ -0,0 +1,84 @@
+<script lang="ts">
+ import { ArcaneButton, arcaneButtonVariants, type ArcaneButtonSize } from '$lib/components/arcane-button/index.js';
+ import * as ButtonGroup from '$lib/components/ui/button-group/index.js';
+ import * as DropdownMenu from '$lib/components/ui/dropdown-menu/index.js';
+ import { ArrowDownIcon } from '$lib/icons';
+ import { m } from '$lib/paraglide/messages';
+ import { deployOptionsStore, type DeployPullPolicy } from '$lib/stores/deploy-options.store.svelte';
+ import { cn } from '$lib/utils';
+
+ let {
+ size = 'default',
+ showLabel = true,
+ loading = false,
+ customLabel,
+ onDeploy
+ }: {
+ size?: ArcaneButtonSize;
+ showLabel?: boolean;
+ loading?: boolean;
+ customLabel?: string;
+ onDeploy: () => void | Promise<void>;
+ } = $props();
+
+ function setPullPolicy(value: string) {
+ deployOptionsStore.setPullPolicy(value as DeployPullPolicy);
+ }
+
+ function setForceRecreate(value: boolean) {
+ deployOptionsStore.setForceRecreate(value);
+ }
+</script>
+
+<ButtonGroup.Root>
+ <ArcaneButton action="deploy" {size} {showLabel} {loading} {customLabel} onclick={() => onDeploy?.()} />
+
+ <DropdownMenu.Root>
+ <DropdownMenu.Trigger
+ class={cn(
+ arcaneButtonVariants({ tone: 'outline-primary', size: 'icon' }),
+ size === 'sm' && 'size-8 rounded-md',
+ size === 'lg' && 'size-10 rounded-md'
+ )}
+ aria-label={m.common_open_menu()}
+ disabled={loading}
+ onclick={(event) => event.stopPropagation()}
+ onpointerdown={(event) => event.stopPropagation()}
+ >
+ <ArrowDownIcon class="size-4" />
+ </DropdownMenu.Trigger>
+
+ <DropdownMenu.Content align="end" class="w-72">
+ <DropdownMenu.Label>{m.settings_default_deploy_pull_policy()}</DropdownMenu.Label>
+ <DropdownMenu.RadioGroup value={deployOptionsStore.pullPolicy} onValueChange={setPullPolicy}>
+ <DropdownMenu.RadioItem value="missing">
+ <div class="flex flex-col gap-0.5">
+ <span class="font-medium">Missing</span>
+ <span class="text-muted-foreground text-xs">{m.deploy_pull_policy_missing()}</span>
+ </div>
+ </DropdownMenu.RadioItem>
+ <DropdownMenu.RadioItem value="always">
+ <div class="flex flex-col gap-0.5">
+ <span class="font-medium">{m.common_always()}</span>
+ <span class="text-muted-foreground text-xs">{m.deploy_pull_policy_always()}</span>
+ </div>
+ </DropdownMenu.RadioItem>
+ <DropdownMenu.RadioItem value="never">
+ <div class="flex flex-col gap-0.5">
+ <span class="font-medium">{m.common_never()}</span>
+ <span class="text-muted-foreground text-xs">{m.deploy_pull_policy_never()}</span>
+ </div>
+ </DropdownMenu.RadioItem>
+ </DropdownMenu.RadioGroup>
+
+ <DropdownMenu.Separator />
+
+ <DropdownMenu.CheckboxItem
+ checked={deployOptionsStore.forceRecreate}
+ onCheckedChange={(checked) => setForceRecreate(checked === true)}
+ >
+ {m.deploy_force_recreate()}
+ </DropdownMenu.CheckboxItem>
+ </DropdownMenu.Content>
+ </DropdownMenu.Root>
+</ButtonGroup.Root>
diff --git a/frontend/src/lib/services/project-service.ts b/frontend/src/lib/services/project-service.ts
index 40eb16806..4b37737e1 100644
--- a/frontend/src/lib/services/project-service.ts
+++ b/frontend/src/lib/services/project-service.ts
@@ -5,6 +5,11 @@ import type { Project, ProjectStatusCounts } from '$lib/types/project.type';
import { transformPaginationParams } from '$lib/utils/params.util';
import BaseAPIService from './api-service';
+export type DeployProjectOptions = {
+ pullPolicy?: 'missing' | 'always' | 'never';
+ forceRecreate?: boolean;
+};
+
export class ProjectService extends BaseAPIService {
private async resolveEnvironmentId(environmentId?: string): Promise<string> {
return environmentId ?? (await environmentStore.getCurrentEnvironmentId());
@@ -21,13 +26,25 @@ export class ProjectService extends BaseAPIService {
return res.data;
}
- deployProject(projectId: string): Promise<Project>;
- deployProject(projectId: string, onLine: (data: any) => void): Promise<Project>;
- async deployProject(projectId: string, onLine?: (data: any) => void): Promise<Project> {
+ deployProject(projectId: string, options?: DeployProjectOptions): Promise<Project>;
+ deployProject(projectId: string, onLine: (data: any) => void, options?: DeployProjectOptions): Promise<Project>;
+ async deployProject(
+ projectId: string,
+ onLineOrOptions?: ((data: any) => void) | DeployProjectOptions,
+ maybeOptions?: DeployProjectOptions
+ ): Promise<Project> {
const envId = await environmentStore.getCurrentEnvironmentId();
const url = `/api/environments/${envId}/projects/${projectId}/up`;
+ const onLine = typeof onLineOrOptions === 'function' ? onLineOrOptions : undefined;
+ const options = typeof onLineOrOptions === 'function' ? maybeOptions : onLineOrOptions;
- const res = await fetch(url, { method: 'POST' });
+ const res = await fetch(url, {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json'
+ },
+ body: JSON.stringify(options ?? {})
+ });
const status = String(res.status);
if (!res.ok || !res.body) {
throw new Error(m.progress_deploy_failed_to_start({ status }));
diff --git a/frontend/src/lib/stores/deploy-options.store.svelte.ts b/frontend/src/lib/stores/deploy-options.store.svelte.ts
new file mode 100644
index 000000000..5306938b9
--- /dev/null
+++ b/frontend/src/lib/stores/deploy-options.store.svelte.ts
@@ -0,0 +1,81 @@
+import { PersistedState } from 'runed';
+import settingsStore from './config-store';
+
+export type DeployPullPolicy = 'missing' | 'always' | 'never';
+
+export type DeployOptionsState = {
+ pullPolicy: DeployPullPolicy;
+ forceRecreate: boolean;
+};
+
+const defaultDeployOptions: DeployOptionsState = {
+ pullPolicy: 'missing',
+ forceRecreate: false
+};
+
+const persistedOptions = new PersistedState<DeployOptionsState>('arcane-deploy-options', defaultDeployOptions);
+const userOverrodePullPolicy = new PersistedState<boolean>('arcane-deploy-options-user-overrode-pull-policy', false);
+
+function isDeployPullPolicy(value: unknown): value is DeployPullPolicy {
+ return value === 'missing' || value === 'always' || value === 'never';
+}
+
+const persistedCurrent = persistedOptions.current;
+
+let state = $state<DeployOptionsState>({
+ pullPolicy: isDeployPullPolicy(persistedCurrent?.pullPolicy) ? persistedCurrent.pullPolicy : defaultDeployOptions.pullPolicy,
+ forceRecreate: persistedCurrent?.forceRecreate === true
+});
+
+function persistState() {
+ persistedOptions.current = {
+ pullPolicy: state.pullPolicy,
+ forceRecreate: state.forceRecreate
+ };
+}
+
+settingsStore.subscribe((settings) => {
+ if (!settings || userOverrodePullPolicy.current) {
+ return;
+ }
+
+ if (isDeployPullPolicy(settings.defaultDeployPullPolicy)) {
+ state.pullPolicy = settings.defaultDeployPullPolicy;
+ persistState();
+ }
+});
+
+export const deployOptionsStore = {
+ get current(): DeployOptionsState {
+ return state;
+ },
+ get pullPolicy(): DeployPullPolicy {
+ return state.pullPolicy;
+ },
+ get forceRecreate(): boolean {
+ return state.forceRecreate;
+ },
+ setPullPolicy(value: DeployPullPolicy) {
+ if (!isDeployPullPolicy(value)) {
+ return;
+ }
+
+ state.pullPolicy = value;
+ userOverrodePullPolicy.current = true;
+ persistState();
+ },
+ setForceRecreate(value: boolean) {
+ state.forceRecreate = value;
+ persistState();
+ },
+ toggleForceRecreate() {
+ state.forceRecreate = !state.forceRecreate;
+ persistState();
+ },
+ getRequestOptions(): DeployOptionsState {
+ return {
+ pullPolicy: state.pullPolicy,
+ forceRecreate: state.forceRecreate
+ };
+ }
+};
diff --git a/frontend/src/lib/types/settings.type.ts b/frontend/src/lib/types/settings.type.ts
index ebb8519b6..7785f91a5 100644
--- a/frontend/src/lib/types/settings.type.ts
+++ b/frontend/src/lib/types/settings.type.ts
@@ -10,6 +10,7 @@ export type Settings = {
pollingInterval: number;
environmentHealthInterval: number;
dockerPruneMode: 'all' | 'dangling';
+ defaultDeployPullPolicy: 'missing' | 'always' | 'never';
scheduledPruneEnabled?: boolean;
scheduledPruneInterval?: number;
scheduledPruneContainers?: boolean;
diff --git a/frontend/src/routes/(app)/environments/[id]/+page.svelte b/frontend/src/routes/(app)/environments/[id]/+page.svelte
index a7015e139..1f58630c4 100644
--- a/frontend/src/routes/(app)/environments/[id]/+page.svelte
+++ b/frontend/src/routes/(app)/environments/[id]/+page.svelte
@@ -136,6 +136,7 @@
autoUpdate: z.boolean(),
autoInjectEnv: z.boolean(),
dockerPruneMode: z.enum(['all', 'dangling']),
+ defaultDeployPullPolicy: z.enum(['missing', 'always', 'never']),
defaultShell: z.string(),
projectsDirectory: z.string(),
diskUsagePath: z.string(),
@@ -164,6 +165,7 @@
autoUpdate: settings?.autoUpdate ?? false,
autoInjectEnv: settings?.autoInjectEnv ?? false,
dockerPruneMode: (settings?.dockerPruneMode as 'all' | 'dangling') || 'dangling',
+ defaultDeployPullPolicy: (settings?.defaultDeployPullPolicy as 'missing' | 'always' | 'never') || 'missing',
defaultShell: settings?.defaultShell || '/bin/sh',
projectsDirectory: settings?.projectsDirectory || '/app/data/projects',
diskUsagePath: settings?.diskUsagePath || '/app/data/projects',
@@ -199,6 +201,7 @@
autoUpdate: formData.autoUpdate,
autoInjectEnv: formData.autoInjectEnv,
dockerPruneMode: formData.dockerPruneMode,
+ defaultDeployPullPolicy: formData.defaultDeployPullPolicy,
defaultShell: formData.defaultShell,
projectsDirectory: formData.projectsDirectory,
diskUsagePath: formData.diskUsagePath,
diff --git a/frontend/src/routes/(app)/environments/[id]/components/DockerTab.svelte b/frontend/src/routes/(app)/environments/[id]/components/DockerTab.svelte
index 3e3cb1c79..11718767e 100644
--- a/frontend/src/routes/(app)/environments/[id]/components/DockerTab.svelte
+++ b/frontend/src/routes/(app)/environments/[id]/components/DockerTab.svelte
@@ -8,6 +8,12 @@
import { DockerBrandIcon } from '$lib/icons';
let { formInputs, shellSelectValue, handleShellSelectChange, shellOptions, pruneModeDescription, pruneModeOptions } = $props();
+
+ const deployPullPolicyOptions = [
+ { value: 'missing', label: 'Missing', description: m.deploy_pull_policy_missing() },
+ { value: 'always', label: m.common_always(), description: m.deploy_pull_policy_always() },
+ { value: 'never', label: m.common_never(), description: m.deploy_pull_policy_never() }
+ ];
</script>
<Card.Root class="flex flex-col">
@@ -62,6 +68,18 @@
{/if}
</div>
+ <div class="space-y-2">
+ <SelectWithLabel
+ id="defaultDeployPullPolicy"
+ name="defaultDeployPullPolicy"
+ bind:value={$formInputs.defaultDeployPullPolicy.value}
+ label={m.settings_default_deploy_pull_policy()}
+ description={m.settings_default_deploy_pull_policy_description()}
+ options={deployPullPolicyOptions}
+ onValueChange={(v) => ($formInputs.defaultDeployPullPolicy.value = v as 'missing' | 'always' | 'never')}
+ />
+ </div>
+
<div class="space-y-4 rounded-lg border p-4">
<div class="flex items-center justify-between">
<div class="space-y-0.5">
diff --git a/frontend/src/routes/(app)/projects/projects-table.svelte b/frontend/src/routes/(app)/projects/projects-table.svelte
index ad3b1a16d..1c11a681c 100644
--- a/frontend/src/routes/(app)/projects/projects-table.svelte
+++ b/frontend/src/routes/(app)/projects/projects-table.svelte
@@ -19,6 +19,7 @@
import { UniversalMobileCard } from '$lib/components/arcane-table';
import { m } from '$lib/paraglide/messages';
import { projectService } from '$lib/services/project-service';
+ import { deployOptionsStore } from '$lib/stores/deploy-options.store.svelte';
import { gitOpsSyncService } from '$lib/services/gitops-sync-service';
import { FolderOpenIcon, LayersIcon, CalendarIcon, ProjectsIcon, GitBranchIcon, RefreshIcon } from '$lib/icons';
import { environmentStore } from '$lib/stores/environment.store.svelte';
@@ -71,7 +72,7 @@
try {
if (action === 'start') {
handleApiResultWithCallbacks({
- result: await tryCatch(projectService.deployProject(id)),
+ result: await tryCatch(projectService.deployProject(id, deployOptionsStore.getRequestOptions())),
message: m.compose_start_failed(),
setLoadingState: (value) => (isLoading.start = value),
onSuccess: async () => {
@@ -177,7 +178,8 @@
action: async () => {
isBulkLoading.up = true;
- const results = await Promise.allSettled(ids.map((id) => projectService.deployProject(id)));
+ const deployOptions = deployOptionsStore.getRequestOptions();
+ const results = await Promise.allSettled(ids.map((id) => projectService.deployProject(id, deployOptions)));
const successCount = results.filter((r) => r.status === 'fulfilled').length;
const failureCount = results.length - successCount;
diff --git a/tests/spec/environment-settings.spec.ts b/tests/spec/environment-settings.spec.ts
index f3a6b6e98..560507f78 100644
--- a/tests/spec/environment-settings.spec.ts
+++ b/tests/spec/environment-settings.spec.ts
@@ -1,4 +1,4 @@
-import { test, expect, type Page } from "@playwright/test";
+import { test, expect, type Locator, type Page } from "@playwright/test";
const LOCAL_ENV_ID = "0";
@@ -6,23 +6,36 @@ async function openEnvironment(page: Page, environmentId: string) {
await page.goto(`/environments/${environmentId}`);
await page.waitForLoadState("networkidle");
await expect(page.locator("#env-name")).toBeVisible();
- await expect(page.getByRole("button", { name: "Save", exact: true }).first()).toBeVisible();
+ await expect(
+ page.getByRole("button", { name: "Save", exact: true }).first(),
+ ).toBeVisible();
}
-async function createDirectEnvironmentViaUI(page: Page, environmentName: string) {
+async function createDirectEnvironmentViaUI(
+ page: Page,
+ environmentName: string,
+) {
await page.goto("/environments");
await page.waitForLoadState("networkidle");
- await page.getByRole("button", { name: "Add Environment", exact: true }).click();
+ await page
+ .getByRole("button", { name: "Add Environment", exact: true })
+ .click();
await expect(page.getByText("Create New Agent Environment")).toBeVisible();
await page.locator("input#name:visible").first().fill(environmentName);
await page.locator("#new-agent-api-url").fill("localhost:3552");
- await page.getByRole("button", { name: "Generate Agent Configuration", exact: true }).click();
+ await page
+ .getByRole("button", { name: "Generate Agent Configuration", exact: true })
+ .click();
- await expect(page.locator('[data-slot="sheet-title"]')).toContainText(/Environment Created/i);
+ await expect(page.locator('[data-slot="sheet-title"]')).toContainText(
+ /Environment Created/i,
+ );
await page.getByRole("button", { name: "Done", exact: true }).click();
- await expect(page.getByRole("button", { name: environmentName, exact: true })).toBeVisible();
+ await expect(
+ page.getByRole("button", { name: environmentName, exact: true }),
+ ).toBeVisible();
}
async function deleteEnvironmentViaUI(page: Page, environmentName: string) {
@@ -40,7 +53,9 @@ async function deleteEnvironmentViaUI(page: Page, environmentName: string) {
await envRow.getByRole("button", { name: /open menu/i }).click();
await page.getByRole("menuitem", { name: "Delete", exact: true }).click();
await page.getByRole("button", { name: "Remove", exact: true }).click();
- await expect(page.getByRole("button", { name: environmentName, exact: true })).toHaveCount(0);
+ await expect(
+ page.getByRole("button", { name: environmentName, exact: true }),
+ ).toHaveCount(0);
}
async function openLocalEnvironment(page: Page) {
@@ -48,7 +63,9 @@ async function openLocalEnvironment(page: Page) {
}
async function saveAndWaitForPut(page: Page, expectedPath: string) {
- const saveButton = page.getByRole("button", { name: "Save", exact: true }).first();
+ const saveButton = page
+ .getByRole("button", { name: "Save", exact: true })
+ .first();
await expect(saveButton).toBeEnabled();
const requestPromise = page.waitForRequest((request) => {
@@ -62,6 +79,20 @@ async function saveAndWaitForPut(page: Page, expectedPath: string) {
await expect(saveButton).toBeDisabled();
}
+async function selectSettingOption(
+ page: Page,
+ trigger: Locator,
+ optionText: string,
+) {
+ await expect(trigger).toBeVisible();
+ await trigger.click();
+ await page
+ .locator('[data-slot="select-item"]')
+ .filter({ hasText: optionText })
+ .first()
+ .click();
+}
+
test.describe("Environment Settings UI", () => {
test("should update and save environment details", async ({ page }) => {
const envName = `settings-ui-${Date.now().toString().slice(-5)}`;
@@ -85,7 +116,9 @@ test.describe("Environment Settings UI", () => {
}
});
- test("should update and save general environment settings", async ({ page }) => {
+ test("should update and save general environment settings", async ({
+ page,
+ }) => {
await openLocalEnvironment(page);
await page.getByRole("tab", { name: "General", exact: true }).click();
@@ -93,22 +126,35 @@ test.describe("Environment Settings UI", () => {
await expect(projectsDirectoryInput).toBeVisible();
const originalProjectsDirectory = await projectsDirectoryInput.inputValue();
- const updatedProjectsDirectory =
- originalProjectsDirectory.endsWith("-e2e") ? `${originalProjectsDirectory}-x` : `${originalProjectsDirectory}-e2e`;
+ const updatedProjectsDirectory = originalProjectsDirectory.endsWith("-e2e")
+ ? `${originalProjectsDirectory}-x`
+ : `${originalProjectsDirectory}-e2e`;
try {
await projectsDirectoryInput.fill(updatedProjectsDirectory);
- await saveAndWaitForPut(page, `/api/environments/${LOCAL_ENV_ID}/settings`);
+ await saveAndWaitForPut(
+ page,
+ `/api/environments/${LOCAL_ENV_ID}/settings`,
+ );
await page.reload();
await page.getByRole("tab", { name: "General", exact: true }).click();
- await expect(page.locator("#projects-directory")).toHaveValue(updatedProjectsDirectory);
+ await expect(page.locator("#projects-directory")).toHaveValue(
+ updatedProjectsDirectory,
+ );
} finally {
await page.getByRole("tab", { name: "General", exact: true }).click();
- const currentProjectsDirectory = await page.locator("#projects-directory").inputValue();
+ const currentProjectsDirectory = await page
+ .locator("#projects-directory")
+ .inputValue();
if (currentProjectsDirectory !== originalProjectsDirectory) {
- await page.locator("#projects-directory").fill(originalProjectsDirectory);
- await saveAndWaitForPut(page, `/api/environments/${LOCAL_ENV_ID}/settings`);
+ await page
+ .locator("#projects-directory")
+ .fill(originalProjectsDirectory);
+ await saveAndWaitForPut(
+ page,
+ `/api/environments/${LOCAL_ENV_ID}/settings`,
+ );
}
}
});
@@ -120,8 +166,12 @@ test.describe("Environment Settings UI", () => {
const originalName = await nameInput.inputValue();
await nameInput.fill(`${originalName}-pending`);
- const saveButton = page.getByRole("button", { name: "Save", exact: true }).first();
- const resetButton = page.getByRole("button", { name: "Reset", exact: true }).first();
+ const saveButton = page
+ .getByRole("button", { name: "Save", exact: true })
+ .first();
+ const resetButton = page
+ .getByRole("button", { name: "Reset", exact: true })
+ .first();
await expect(saveButton).toBeEnabled();
await expect(resetButton).toBeVisible();
@@ -130,4 +180,55 @@ test.describe("Environment Settings UI", () => {
await expect(nameInput).toHaveValue(originalName);
await expect(saveButton).toBeDisabled();
});
+
+ test("should update and save the default deploy pull policy in Docker settings", async ({
+ page,
+ }) => {
+ await openLocalEnvironment(page);
+
+ const dockerTab = page.getByRole("tab", { name: /Docker/i }).first();
+ await dockerTab.click();
+ const pullPolicyTrigger = page.locator("#defaultDeployPullPolicy");
+ await expect(pullPolicyTrigger).toBeVisible();
+
+ const originalValue =
+ (await pullPolicyTrigger.textContent())?.trim() || "Missing";
+ const updatedValue = originalValue.includes("Always") ? "Never" : "Always";
+
+ try {
+ await selectSettingOption(page, pullPolicyTrigger, updatedValue);
+ await saveAndWaitForPut(
+ page,
+ `/api/environments/${LOCAL_ENV_ID}/settings`,
+ );
+
+ await page.reload();
+ await page
+ .getByRole("tab", { name: /Docker/i })
+ .first()
+ .click();
+ await expect(page.locator("#defaultDeployPullPolicy")).toContainText(
+ updatedValue,
+ );
+ } finally {
+ await page
+ .getByRole("tab", { name: /Docker/i })
+ .first()
+ .click();
+ const currentValue = (
+ (await page.locator("#defaultDeployPullPolicy").textContent()) || ""
+ ).trim();
+ if (!currentValue.includes(originalValue)) {
+ await selectSettingOption(
+ page,
+ page.locator("#defaultDeployPullPolicy"),
+ originalValue,
+ );
+ await saveAndWaitForPut(
+ page,
+ `/api/environments/${LOCAL_ENV_ID}/settings`,
+ );
+ }
+ }
+ });
});
diff --git a/tests/spec/project.spec.ts b/tests/spec/project.spec.ts
index 6fbc1bcb4..9572daed7 100644
--- a/tests/spec/project.spec.ts
+++ b/tests/spec/project.spec.ts
@@ -1,5 +1,8 @@
import { test, expect, type Locator, type Page } from "@playwright/test";
-import { fetchProjectCountsWithRetry, fetchProjectsWithRetry } from "../utils/fetch.util";
+import {
+ fetchProjectCountsWithRetry,
+ fetchProjectsWithRetry,
+} from "../utils/fetch.util";
import { Project, ProjectStatusCounts } from "types/project.type";
import { TEST_COMPOSE_YAML, TEST_ENV_FILE } from "../setup/project.data";
@@ -9,6 +12,10 @@ const ROUTES = {
newProject: "/projects/new",
};
+const DEPLOY_STREAM_SUCCESS =
+ '{"type":"deploy","phase":"begin"}\n' +
+ '{"type":"deploy","phase":"complete"}\n';
+
async function navigateToProjects(page: Page) {
await page.goto(ROUTES.page);
await page.waitForLoadState("networkidle");
@@ -22,8 +29,59 @@ async function setCodeMirrorValue(page: Page, editor: Locator, text: string) {
await page.keyboard.type(text, { delay: 0 });
}
+async function createProjectViaUI(page: Page, projectName: string) {
+ const containerName = `test-redis-container-${Date.now()}`;
+ const envFile = TEST_ENV_FILE.replace(
+ /CONTAINER_NAME=.*/m,
+ `CONTAINER_NAME=${containerName}`,
+ );
+
+ await page.goto(ROUTES.newProject);
+ await page.waitForLoadState("networkidle");
+
+ await page.getByRole("button", { name: "My New Project" }).click();
+ await page.getByRole("textbox", { name: "My New Project" }).fill(projectName);
+ await page.getByRole("textbox", { name: "My New Project" }).press("Enter");
+
+ const composeEditor = page.locator(".cm-editor").first();
+ const envEditor = page.locator(".cm-editor").nth(1);
+ await expect(composeEditor).toBeVisible();
+ await expect(envEditor).toBeVisible();
+
+ await setCodeMirrorValue(page, composeEditor, TEST_COMPOSE_YAML);
+ await setCodeMirrorValue(page, envEditor, envFile);
+
+ const createButton = page
+ .getByRole("button", { name: "Create Project" })
+ .locator('[data-slot="arcane-button"]');
+ await createButton.click();
+
+ await page.waitForURL(/\/projects\/.+/, { timeout: 10000 });
+ await expect(page.getByRole("button", { name: projectName })).toBeVisible();
+}
+
+async function destroyCurrentProjectViaUI(page: Page) {
+ const destroyButton = page.getByRole("button", {
+ name: "Destroy",
+ exact: true,
+ });
+ await expect(destroyButton).toBeVisible();
+ await destroyButton.click();
+
+ const dialog = page.getByRole("dialog");
+ await expect(dialog).toBeVisible();
+ await dialog.getByLabel(/Remove project files/i).check();
+ await dialog.getByRole("button", { name: "Destroy", exact: true }).click();
+
+ await page.waitForURL(ROUTES.page, { timeout: 10000 });
+}
+
let realProjects: Project[] = [];
-let projectCounts: ProjectStatusCounts = { runningProjects: 0, stoppedProjects: 0, totalProjects: 0 };
+let projectCounts: ProjectStatusCounts = {
+ runningProjects: 0,
+ stoppedProjects: 0,
+ totalProjects: 0,
+};
test.beforeEach(async ({ page }) => {
await navigateToProjects(page);
@@ -38,14 +96,30 @@ test.beforeEach(async ({ page }) => {
test.describe("Projects Page", () => {
test("should display the main heading and description", async ({ page }) => {
- await expect(page.getByRole("heading", { name: "Projects", level: 1 })).toBeVisible();
- await expect(page.getByText("View and Manage Compose Projects")).toBeVisible();
+ await expect(
+ page.getByRole("heading", { name: "Projects", level: 1 }),
+ ).toBeVisible();
+ await expect(
+ page.getByText("View and Manage Compose Projects"),
+ ).toBeVisible();
});
test("should display summary cards with correct counts", async ({ page }) => {
- await expect(page.getByText(`${projectCounts.totalProjects} Total Projects`, { exact: true })).toBeVisible();
- await expect(page.getByText(`${projectCounts.runningProjects} Running`, { exact: true })).toBeVisible();
- await expect(page.getByText(`${projectCounts.stoppedProjects} Stopped`, { exact: true })).toBeVisible();
+ await expect(
+ page.getByText(`${projectCounts.totalProjects} Total Projects`, {
+ exact: true,
+ }),
+ ).toBeVisible();
+ await expect(
+ page.getByText(`${projectCounts.runningProjects} Running`, {
+ exact: true,
+ }),
+ ).toBeVisible();
+ await expect(
+ page.getByText(`${projectCounts.stoppedProjects} Stopped`, {
+ exact: true,
+ }),
+ ).toBeVisible();
});
test("should display projects list", async ({ page }) => {
@@ -53,7 +127,10 @@ test.describe("Projects Page", () => {
});
test("should show project actions menu", async ({ page }) => {
- test.skip(!realProjects.length, "No projects available for actions menu test");
+ test.skip(
+ !realProjects.length,
+ "No projects available for actions menu test",
+ );
await page.waitForLoadState("networkidle");
const firstRow = page.locator("tbody tr").first();
@@ -65,15 +142,28 @@ test.describe("Projects Page", () => {
// Check for at least one of the state action buttons (Up/Down/Restart)
const upItem = page.getByRole("menuitem", { name: "Up", exact: true });
const downItem = page.getByRole("menuitem", { name: "Down", exact: true });
- const restartItem = page.getByRole("menuitem", { name: "Restart", exact: true });
- const hasStateAction = (await upItem.count()) > 0 || (await downItem.count()) > 0 || (await restartItem.count()) > 0;
+ const restartItem = page.getByRole("menuitem", {
+ name: "Restart",
+ exact: true,
+ });
+ const hasStateAction =
+ (await upItem.count()) > 0 ||
+ (await downItem.count()) > 0 ||
+ (await restartItem.count()) > 0;
expect(hasStateAction).toBe(true);
- await expect(page.getByRole("menuitem", { name: "Pull & Redeploy" })).toBeVisible();
+ await expect(
+ page.getByRole("menuitem", { name: "Pull & Redeploy" }),
+ ).toBeVisible();
await expect(page.getByRole("menuitem", { name: "Destroy" })).toBeVisible();
});
- test("should navigate to project details when project name is clicked", async ({ page }) => {
- test.skip(!realProjects.length, "No projects available for navigation test");
+ test("should navigate to project details when project name is clicked", async ({
+ page,
+ }) => {
+ test.skip(
+ !realProjects.length,
+ "No projects available for navigation test",
+ );
await page.waitForLoadState("networkidle");
// Get the first project link that points to /projects/ (not the "Git" indicator link)
@@ -87,7 +177,9 @@ test.describe("Projects Page", () => {
await firstProjectLink.click();
await expect(page).toHaveURL(/\/projects\/.+/);
- await expect(page.getByRole("button", { name: new RegExp(`${projectName}`) })).toBeVisible();
+ await expect(
+ page.getByRole("button", { name: new RegExp(`${projectName}`) }),
+ ).toBeVisible();
});
test("should allow searching/filtering projects", async ({ page }) => {
@@ -99,13 +191,18 @@ test.describe("Projects Page", () => {
const firstProject = realProjects[0];
if (firstProject?.name) {
await searchInput.fill(firstProject.name);
- await expect(page.getByRole("link", { name: firstProject.name })).toBeVisible();
+ await expect(
+ page.getByRole("link", { name: firstProject.name }),
+ ).toBeVisible();
await searchInput.clear();
}
});
test("should display project status badges", async ({ page }) => {
- test.skip(!realProjects.length, "No projects available for status badge test");
+ test.skip(
+ !realProjects.length,
+ "No projects available for status badge test",
+ );
await page.waitForLoadState("networkidle");
@@ -129,63 +226,104 @@ test.describe("New Compose Project Page", () => {
});
test("should display the create project form", async ({ page }) => {
- await expect(page.getByRole("button", { name: "My New Project" })).toBeVisible();
- await expect(page.getByRole("heading", { name: "Docker Compose File" })).toBeVisible();
- await expect(page.getByRole("heading", { name: "Environment (.env)" })).toBeVisible();
+ await expect(
+ page.getByRole("button", { name: "My New Project" }),
+ ).toBeVisible();
+ await expect(
+ page.getByRole("heading", { name: "Docker Compose File" }),
+ ).toBeVisible();
+ await expect(
+ page.getByRole("heading", { name: "Environment (.env)" }),
+ ).toBeVisible();
});
test("should validate required fields", async ({ page }) => {
- const createButton = page.getByRole("button", { name: "Create Project" }).locator('[data-slot="arcane-button"]');
+ const createButton = page
+ .getByRole("button", { name: "Create Project" })
+ .locator('[data-slot="arcane-button"]');
await expect(createButton).toBeDisabled();
await page.getByRole("button", { name: "My New Project" }).click();
- await page.getByRole("textbox", { name: "My New Project" }).fill("test-project");
+ await page
+ .getByRole("textbox", { name: "My New Project" })
+ .fill("test-project");
await page.getByRole("textbox", { name: "My New Project" }).press("Enter");
});
- test("should enable Create Project after entering a valid name", async ({ page }) => {
+ test("should enable Create Project after entering a valid name", async ({
+ page,
+ }) => {
const observedErrors: string[] = [];
- page.on("pageerror", (err) => observedErrors.push(String(err?.message ?? err)));
+ page.on("pageerror", (err) =>
+ observedErrors.push(String(err?.message ?? err)),
+ );
page.on("console", (msg) => {
if (msg.type() === "error") observedErrors.push(msg.text());
});
- const createButton = page.getByRole("button", { name: "Create Project" }).locator('[data-slot="arcane-button"]');
+ const createButton = page
+ .getByRole("button", { name: "Create Project" })
+ .locator('[data-slot="arcane-button"]');
await expect(createButton).toBeVisible();
// Open the inline name editor and set a valid name.
await page.getByRole("button", { name: "My New Project" }).click();
- await page.getByRole("textbox", { name: "My New Project" }).fill("test-project");
+ await page
+ .getByRole("textbox", { name: "My New Project" })
+ .fill("test-project");
await page.getByRole("textbox", { name: "My New Project" }).press("Enter");
// The button should become enabled once name + compose content are present.
await expect(createButton).toBeEnabled();
- const stateUnsafe = observedErrors.filter((e) => e.includes("state_unsafe_mutation"));
- expect(stateUnsafe, `Unexpected state_unsafe_mutation errors: ${stateUnsafe.join("\n")}`).toHaveLength(0);
+ const stateUnsafe = observedErrors.filter((e) =>
+ e.includes("state_unsafe_mutation"),
+ );
+ expect(
+ stateUnsafe,
+ `Unexpected state_unsafe_mutation errors: ${stateUnsafe.join("\n")}`,
+ ).toHaveLength(0);
});
- test("should hide Create Project when compose syntax is invalid and show it when fixed", async ({ page }) => {
+ test("should hide Create Project when compose syntax is invalid and show it when fixed", async ({
+ page,
+ }) => {
await page.getByRole("button", { name: "My New Project" }).click();
- await page.getByRole("textbox", { name: "My New Project" }).fill("syntax-check-project");
+ await page
+ .getByRole("textbox", { name: "My New Project" })
+ .fill("syntax-check-project");
await page.getByRole("textbox", { name: "My New Project" }).press("Enter");
const composeEditor = page.locator(".cm-editor").first();
await expect(composeEditor).toBeVisible();
- await setCodeMirrorValue(page, composeEditor, "services:\n\tredis:\n\t\timage: redis:latest\n");
- await expect(page.locator('button[data-slot="arcane-button"]').filter({ hasText: "Create Project" })).toHaveCount(0);
+ await setCodeMirrorValue(
+ page,
+ composeEditor,
+ "services:\n\tredis:\n\t\timage: redis:latest\n",
+ );
+ await expect(
+ page
+ .locator('button[data-slot="arcane-button"]')
+ .filter({ hasText: "Create Project" }),
+ ).toHaveCount(0);
await setCodeMirrorValue(page, composeEditor, TEST_COMPOSE_YAML);
- const createButton = page.locator('button[data-slot="arcane-button"]').filter({ hasText: "Create Project" });
+ const createButton = page
+ .locator('button[data-slot="arcane-button"]')
+ .filter({ hasText: "Create Project" });
await expect(createButton).toBeVisible();
await expect(createButton).toBeEnabled();
});
- test("should hide Create Project when env syntax is invalid and show it when fixed", async ({ page }) => {
+ test("should hide Create Project when env syntax is invalid and show it when fixed", async ({
+ page,
+ }) => {
await page.getByRole("button", { name: "My New Project" }).click();
- await page.getByRole("textbox", { name: "My New Project" }).fill("env-check-project");
+ await page
+ .getByRole("textbox", { name: "My New Project" })
+ .fill("env-check-project");
await page.getByRole("textbox", { name: "My New Project" }).press("Enter");
const composeEditor = page.locator(".cm-editor").first();
@@ -195,10 +333,16 @@ test.describe("New Compose Project Page", () => {
await setCodeMirrorValue(page, composeEditor, TEST_COMPOSE_YAML);
await setCodeMirrorValue(page, envEditor, "NOT VALID LINE");
- await expect(page.locator('button[data-slot="arcane-button"]').filter({ hasText: "Create Project" })).toHaveCount(0);
+ await expect(
+ page
+ .locator('button[data-slot="arcane-button"]')
+ .filter({ hasText: "Create Project" }),
+ ).toHaveCount(0);
await setCodeMirrorValue(page, envEditor, TEST_ENV_FILE);
- const createButton = page.locator('button[data-slot="arcane-button"]').filter({ hasText: "Create Project" });
+ const createButton = page
+ .locator('button[data-slot="arcane-button"]')
+ .filter({ hasText: "Create Project" });
await expect(createButton).toBeVisible();
await expect(createButton).toBeEnabled();
});
@@ -206,12 +350,17 @@ test.describe("New Compose Project Page", () => {
test("should create a new project successfully", async ({ page }) => {
const projectName = `test-project-${Date.now()}`;
const containerName = `test-redis-container-${Date.now()}`;
- const envFile = TEST_ENV_FILE.replace(/CONTAINER_NAME=.*/m, `CONTAINER_NAME=${containerName}`);
+ const envFile = TEST_ENV_FILE.replace(
+ /CONTAINER_NAME=.*/m,
+ `CONTAINER_NAME=${containerName}`,
+ );
let createdProjectId: string | null = null;
let projectPullRequestCount = 0;
await page.getByRole("button", { name: "My New Project" }).click();
- await page.getByRole("textbox", { name: "My New Project" }).fill(projectName);
+ await page
+ .getByRole("textbox", { name: "My New Project" })
+ .fill(projectName);
await page.getByRole("textbox", { name: "My New Project" }).press("Enter");
const composeEditor = page.locator(".cm-editor").first();
@@ -246,7 +395,9 @@ test.describe("New Compose Project Page", () => {
}
});
- const createButton = page.getByRole("button", { name: "Create Project" }).locator('[data-slot="arcane-button"]');
+ const createButton = page
+ .getByRole("button", { name: "Create Project" })
+ .locator('[data-slot="arcane-button"]');
await createButton.click();
await page.waitForURL(/\/projects\/.+/, { timeout: 10000 });
@@ -263,8 +414,12 @@ test.describe("New Compose Project Page", () => {
await page.waitForLoadState("networkidle");
const serviceTable = page.getByRole("table");
- const serviceNameWhenStopped = serviceTable.getByText("redis", { exact: true });
- const emptyServicesState = page.getByText(/No services found for this project/i);
+ const serviceNameWhenStopped = serviceTable.getByText("redis", {
+ exact: true,
+ });
+ const emptyServicesState = page.getByText(
+ /No services found for this project/i,
+ );
if ((await serviceNameWhenStopped.count()) > 0) {
await expect(serviceNameWhenStopped.first()).toBeVisible();
@@ -277,37 +432,117 @@ test.describe("New Compose Project Page", () => {
await route.continue();
});
- const deployButton = page.getByRole("button", { name: "Up", exact: true }).filter({ hasText: "Up" }).last();
+ const deployButton = page
+ .getByRole("button", { name: "Up", exact: true })
+ .filter({ hasText: "Up" })
+ .last();
await deployButton.click();
await page.waitForTimeout(5000);
await page.waitForLoadState("networkidle");
expect(projectPullRequestCount).toBe(0);
- await expect(page.getByText("Running", { exact: true })).toBeVisible({ timeout: 20000 });
- await expect(page.getByRole("button", { name: "Down", exact: true })).toBeVisible();
+ await expect(page.getByText("Running", { exact: true })).toBeVisible({
+ timeout: 20000,
+ });
+ await expect(
+ page.getByRole("button", { name: "Down", exact: true }),
+ ).toBeVisible();
+ });
+
+ test("should send selected deploy split-button options in the up request", async ({
+ page,
+ }) => {
+ const projectName = `test-deploy-options-${Date.now()}`;
+ let deployRequestBody: Record<string, unknown> | null = null;
+
+ try {
+ await createProjectViaUI(page, projectName);
+
+ await page.route("**/api/environments/*/projects/*/up", async (route) => {
+ const postData = route.request().postDataJSON() as Record<
+ string,
+ unknown
+ > | null;
+ deployRequestBody = postData;
+
+ await route.fulfill({
+ status: 200,
+ contentType: "application/x-json-stream",
+ body: DEPLOY_STREAM_SUCCESS,
+ });
+ });
+
+ const deployButtonGroup = page
+ .locator('[data-slot="button-group"]')
+ .filter({ has: page.getByRole("button", { name: "Up", exact: true }) })
+ .first();
+ const deployMenuTrigger = deployButtonGroup.getByRole("button", {
+ name: "Open menu",
+ });
+
+ await expect(deployMenuTrigger).toBeVisible();
+
+ await deployMenuTrigger.click();
+ await page
+ .locator('[data-slot="dropdown-menu-radio-item"]')
+ .filter({ hasText: "Always" })
+ .first()
+ .click();
+
+ await deployMenuTrigger.click();
+ await page
+ .getByRole("menuitemcheckbox", { name: /Force recreate containers/i })
+ .click();
+
+ await page.getByRole("button", { name: "Up", exact: true }).click();
+
+ await expect
+ .poll(() => deployRequestBody, {
+ message: "Expected the deploy request body to be captured",
+ })
+ .not.toBeNull();
+
+ expect(deployRequestBody).toEqual({
+ pullPolicy: "always",
+ forceRecreate: true,
+ });
+ } finally {
+ if (/\/projects\/.+/.test(new URL(page.url()).pathname)) {
+ await destroyCurrentProjectViaUI(page);
+ }
+ }
});
- test("should destroy the project and remove files from disk", async ({ page }) => {
+ test("should destroy the project and remove files from disk", async ({
+ page,
+ }) => {
const projectName = `test-destroy-${Date.now()}`;
// 1. Create the project first
await page.getByRole("button", { name: "My New Project" }).click();
- await page.getByRole("textbox", { name: "My New Project" }).fill(projectName);
+ await page
+ .getByRole("textbox", { name: "My New Project" })
+ .fill(projectName);
await page.getByRole("textbox", { name: "My New Project" }).press("Enter");
const composeEditor = page.locator(".cm-editor").first();
await expect(composeEditor).toBeVisible();
await setCodeMirrorValue(page, composeEditor, TEST_COMPOSE_YAML);
- const createButton = page.locator('button[data-slot="arcane-button"]').filter({ hasText: "Create Project" });
+ const createButton = page
+ .locator('button[data-slot="arcane-button"]')
+ .filter({ hasText: "Create Project" });
await createButton.click();
await page.waitForURL(/\/projects\/.+/, { timeout: 10000 });
await expect(page.getByRole("button", { name: projectName })).toBeVisible();
// 2. Destroy the project
- const destroyButton = page.getByRole("button", { name: "Destroy", exact: true });
+ const destroyButton = page.getByRole("button", {
+ name: "Destroy",
+ exact: true,
+ });
await expect(destroyButton).toBeVisible();
await destroyButton.click();
@@ -320,17 +555,24 @@ test.describe("New Compose Project Page", () => {
await removeFilesCheckbox.check();
// Click "Destroy" in the dialog
- const confirmDestroyButton = dialog.getByRole("button", { name: "Destroy", exact: true });
+ const confirmDestroyButton = dialog.getByRole("button", {
+ name: "Destroy",
+ exact: true,
+ });
await confirmDestroyButton.click();
// 4. Verify redirection and project removal
await page.waitForURL(ROUTES.page, { timeout: 10000 });
- await expect(page.getByRole("link", { name: projectName })).not.toBeVisible();
+ await expect(
+ page.getByRole("link", { name: projectName }),
+ ).not.toBeVisible();
});
});
test.describe("GitOps Managed Project", () => {
- test("should show read-only alert when project is GitOps managed", async ({ page }) => {
+ test("should show read-only alert when project is GitOps managed", async ({
+ page,
+ }) => {
const gitOpsProject = realProjects.find((p) => p.gitOpsManagedBy);
test.skip(!gitOpsProject, "No GitOps-managed projects found");
@@ -347,7 +589,9 @@ test.describe("GitOps Managed Project", () => {
await expect(page.getByText(/managed by Git/i)).toBeVisible();
});
- test("should display Sync from Git button when GitOps managed", async ({ page }) => {
+ test("should display Sync from Git button when GitOps managed", async ({
+ page,
+ }) => {
const gitOpsProject = realProjects.find((p) => p.gitOpsManagedBy);
test.skip(!gitOpsProject, "No GitOps-managed projects found");
@@ -359,12 +603,19 @@ test.describe("GitOps Managed Project", () => {
await page.waitForLoadState("networkidle");
// Verify the Sync from Git button is present
- await expect(page.getByRole("button", { name: "Sync from Git" })).toBeVisible();
+ await expect(
+ page.getByRole("button", { name: "Sync from Git" }),
+ ).toBeVisible();
});
test("should show last sync commit when GitOps managed", async ({ page }) => {
- const gitOpsProject = realProjects.find((p) => p.gitOpsManagedBy && p.lastSyncCommit);
- test.skip(!gitOpsProject, "No GitOps-managed projects with sync commit found");
+ const gitOpsProject = realProjects.find(
+ (p) => p.gitOpsManagedBy && p.lastSyncCommit,
+ );
+ test.skip(
+ !gitOpsProject,
+ "No GitOps-managed projects with sync commit found",
+ );
await page.goto(`/projects/${gitOpsProject!.id}`);
await page.waitForLoadState("networkidle");
@@ -386,7 +637,9 @@ test.describe("GitOps Managed Project", () => {
await expect(nameButton).toBeDisabled();
});
- test("should have compose editor in read-only mode when GitOps managed", async ({ page }) => {
+ test("should have compose editor in read-only mode when GitOps managed", async ({
+ page,
+ }) => {
const gitOpsProject = realProjects.find((p) => p.gitOpsManagedBy);
test.skip(!gitOpsProject, "No GitOps-managed projects found");
@@ -398,11 +651,16 @@ test.describe("GitOps Managed Project", () => {
await page.waitForLoadState("networkidle");
await page.waitForTimeout(800);
- const composeContent = page.locator(".cm-editor").first().locator(".cm-content");
+ const composeContent = page
+ .locator(".cm-editor")
+ .first()
+ .locator(".cm-content");
await expect(composeContent).toHaveAttribute("aria-readonly", "true");
});
- test("should have env editor in read-only mode when GitOps managed", async ({ page }) => {
+ test("should have env editor in read-only mode when GitOps managed", async ({
+ page,
+ }) => {
const gitOpsProject = realProjects.find((p) => p.gitOpsManagedBy);
test.skip(!gitOpsProject, "No GitOps-managed projects found");
@@ -418,9 +676,16 @@ test.describe("GitOps Managed Project", () => {
await expect(envContent).toHaveAttribute("aria-readonly", "true");
});
- test("should allow editing for non-GitOps managed projects", async ({ page }) => {
- const regularProject = realProjects.find((p) => !p.gitOpsManagedBy && p.status === "stopped");
- test.skip(!regularProject, "No regular (non-GitOps) stopped projects found");
+ test("should allow editing for non-GitOps managed projects", async ({
+ page,
+ }) => {
+ const regularProject = realProjects.find(
+ (p) => !p.gitOpsManagedBy && p.status === "stopped",
+ );
+ test.skip(
+ !regularProject,
+ "No regular (non-GitOps) stopped projects found",
+ );
await page.goto(`/projects/${regularProject!.id}`);
await page.waitForLoadState("networkidle");
@@ -438,10 +703,14 @@ test.describe("GitOps Managed Project", () => {
await expect(page.getByText("Git Read-only")).not.toBeVisible();
// Sync from Git button should NOT be visible
- await expect(page.getByRole("button", { name: "Sync from Git" })).not.toBeVisible();
+ await expect(
+ page.getByRole("button", { name: "Sync from Git" }),
+ ).not.toBeVisible();
});
- test("should not show GitOps alert on Configuration tab for regular projects", async ({ page }) => {
+ test("should not show GitOps alert on Configuration tab for regular projects", async ({
+ page,
+ }) => {
const regularProject = realProjects.find((p) => !p.gitOpsManagedBy);
test.skip(!regularProject, "No regular (non-GitOps) projects found");
@@ -454,41 +723,60 @@ test.describe("GitOps Managed Project", () => {
// Verify no GitOps-related UI elements
await expect(page.getByText(/managed by Git\./i)).not.toBeVisible();
- await expect(page.getByRole("button", { name: "Sync from Git" })).not.toBeVisible();
+ await expect(
+ page.getByRole("button", { name: "Sync from Git" }),
+ ).not.toBeVisible();
});
});
test.describe("Project Detail Page", () => {
- test("should display project details for existing project", async ({ page }) => {
- test.skip(!realProjects.length, "No projects available for detail page test");
+ test("should display project details for existing project", async ({
+ page,
+ }) => {
+ test.skip(
+ !realProjects.length,
+ "No projects available for detail page test",
+ );
const firstProject = realProjects[0];
await page.goto(`/projects/${firstProject.id || firstProject.name}`);
await page.waitForLoadState("networkidle");
- await expect(page.getByRole("button", { name: firstProject.name, exact: false })).toBeVisible();
+ await expect(
+ page.getByRole("button", { name: firstProject.name, exact: false }),
+ ).toBeVisible();
await expect(page.getByRole("tab", { name: /Services/i })).toBeVisible();
- await expect(page.getByRole("tab", { name: /Configuration|Config/i })).toBeVisible();
+ await expect(
+ page.getByRole("tab", { name: /Configuration|Config/i }),
+ ).toBeVisible();
await expect(page.getByRole("tab", { name: /Logs/i })).toBeVisible();
});
test("should display tabs navigation", async ({ page }) => {
- test.skip(!realProjects.length, "No projects available for navigation test");
+ test.skip(
+ !realProjects.length,
+ "No projects available for navigation test",
+ );
const firstProject = realProjects[0];
await page.goto(`/projects/${firstProject.id || firstProject.name}`);
await page.waitForLoadState("networkidle");
await expect(page.getByRole("tab", { name: /Services/i })).toBeVisible();
- await expect(page.getByRole("tab", { name: /Configuration|Config/i })).toBeVisible();
+ await expect(
+ page.getByRole("tab", { name: /Configuration|Config/i }),
+ ).toBeVisible();
await expect(page.getByRole("tab", { name: /Logs/i })).toBeVisible();
});
test("should display services tab content", async ({ page }) => {
test.skip(!realProjects.length, "No projects available for services test");
- const projectWithServices = realProjects.find((p) => p.serviceCount > 0) || realProjects[0];
- await page.goto(`/projects/${projectWithServices.id || projectWithServices.name}`);
+ const projectWithServices =
+ realProjects.find((p) => p.serviceCount > 0) || realProjects[0];
+ await page.goto(
+ `/projects/${projectWithServices.id || projectWithServices.name}`,
+ );
await page.waitForLoadState("networkidle");
await page.getByRole("tab", { name: /Services/i }).click();
@@ -499,7 +787,9 @@ test.describe("Project Detail Page", () => {
if ((await nginxService.count()) > 0) {
await expect(nginxService.first()).toBeVisible();
} else {
- const anyServiceBadge = page.locator("text=/running|stopped|unknown/i").first();
+ const anyServiceBadge = page
+ .locator("text=/running|stopped|unknown/i")
+ .first();
if ((await anyServiceBadge.count()) > 0) {
await expect(anyServiceBadge).toBeVisible();
} else {
@@ -509,7 +799,10 @@ test.describe("Project Detail Page", () => {
});
test("should display configuration editors", async ({ page }) => {
- test.skip(!realProjects.length, "No projects available for configuration test");
+ test.skip(
+ !realProjects.length,
+ "No projects available for configuration test",
+ );
const firstProject = realProjects[0];
await page.goto(`/projects/${firstProject.id || firstProject.name}`);
@@ -521,13 +814,19 @@ test.describe("Project Detail Page", () => {
// The project config editor supports two layouts:
// - classic (default): side-by-side compose.yaml + .env panels
// - tree view: file list on the left and a single code panel on the right
- await expect(page.getByRole("heading", { name: "compose.yaml" })).toBeVisible();
+ await expect(
+ page.getByRole("heading", { name: "compose.yaml" }),
+ ).toBeVisible();
- const projectFilesHeading = page.getByRole("heading", { name: /Project Files/i });
+ const projectFilesHeading = page.getByRole("heading", {
+ name: /Project Files/i,
+ });
const isTreeView = await projectFilesHeading.isVisible();
if (isTreeView) {
- const composeFileButton = page.getByRole("button", { name: "compose.yaml" }).first();
+ const composeFileButton = page
+ .getByRole("button", { name: "compose.yaml" })
+ .first();
const envFileButton = page.getByRole("button", { name: ".env" }).first();
await expect(composeFileButton).toBeVisible();
@@ -538,7 +837,9 @@ test.describe("Project Detail Page", () => {
await expect(page.getByRole("heading", { name: ".env" })).toBeVisible();
await composeFileButton.click();
- await expect(page.getByRole("heading", { name: "compose.yaml" })).toBeVisible();
+ await expect(
+ page.getByRole("heading", { name: "compose.yaml" }),
+ ).toBeVisible();
const includesFolder = page.getByRole("button", { name: "Includes" });
if (await includesFolder.count()) {
@@ -549,13 +850,19 @@ test.describe("Project Detail Page", () => {
await expect(page.getByRole("heading", { name: ".env" })).toBeVisible();
// Also validate that we can switch to tree view and see the file list.
- const layoutSwitch = page.getByRole("switch", { name: /Classic|Tree View/i });
+ const layoutSwitch = page.getByRole("switch", {
+ name: /Classic|Tree View/i,
+ });
if (await layoutSwitch.count()) {
await layoutSwitch.click();
await expect(projectFilesHeading).toBeVisible();
- const composeFileButton = page.getByRole("button", { name: "compose.yaml" }).first();
- const envFileButton = page.getByRole("button", { name: ".env" }).first();
+ const composeFileButton = page
+ .getByRole("button", { name: "compose.yaml" })
+ .first();
+ const envFileButton = page
+ .getByRole("button", { name: ".env" })
+ .first();
await expect(composeFileButton).toBeVisible();
await expect(envFileButton).toBeVisible();
@@ -582,10 +889,17 @@ test.describe("Project Detail Page", () => {
const logsSelected = await logsTab.getAttribute("aria-selected");
if (logsSelected === "true") {
await expect(page.getByText(/Real-time project logs/i)).toBeVisible();
- await expect(page.getByRole("button", { name: /^(Start|Stop)$/i })).toBeVisible();
- await expect(page.getByRole("button", { name: "Clear", exact: true })).toBeVisible();
-
- const startButton = page.getByRole("button", { name: "Start", exact: true });
+ await expect(
+ page.getByRole("button", { name: /^(Start|Stop)$/i }),
+ ).toBeVisible();
+ await expect(
+ page.getByRole("button", { name: "Clear", exact: true }),
+ ).toBeVisible();
+
+ const startButton = page.getByRole("button", {
+ name: "Start",
+ exact: true,
+ });
if ((await startButton.count()) > 0) {
await startButton.click();
}
diff --git a/types/project/project.go b/types/project/project.go
index d315e5c0d..f690a6491 100644
--- a/types/project/project.go
+++ b/types/project/project.go
@@ -59,6 +59,19 @@ type UpdateProject struct {
EnvContent *string `json:"envContent,omitempty"`
}
+// DeployOptions configures project deploy behavior.
+type DeployOptions struct {
+ // PullPolicy overrides the image pull policy used during deploy.
+ //
+ // Required: false
+ PullPolicy string `json:"pullPolicy,omitempty" binding:"omitempty,oneof=missing always never"`
+
+ // ForceRecreate forces compose to recreate containers even when unchanged.
+ //
+ // Required: false
+ ForceRecreate bool `json:"forceRecreate,omitempty"`
+}
+
// UpdateIncludeFile is used to update an include file within a project.
type UpdateIncludeFile struct {
// RelativePath is the path to the include file relative to the project.
diff --git a/types/settings/settings.go b/types/settings/settings.go
index b6cb842b9..702652c56 100644
--- a/types/settings/settings.go
+++ b/types/settings/settings.go
@@ -77,6 +77,11 @@ type Update struct {
// Required: false
PruneMode *string `json:"dockerPruneMode,omitempty" binding:"omitempty,oneof=all dangling"`
+ // DefaultDeployPullPolicy is the default image pull policy used for project deploys.
+ //
+ // Required: false
+ DefaultDeployPullPolicy *string `json:"defaultDeployPullPolicy,omitempty" binding:"omitempty,oneof=missing always never"`
+
// ScheduledPruneEnabled indicates if scheduled pruning is enabled.
//
// Required: false