Skip to content

Modern Docker Management, Designed for Everyone

fix: use prune mode behavior

Kyle Mendell751f7c74e3a3
diff --git a/backend/internal/services/image_service.go b/backend/internal/services/image_service.go
index a02c3e3cb..3e4f6ae25 100644
--- a/backend/internal/services/image_service.go
+++ b/backend/internal/services/image_service.go
@@ -291,6 +291,8 @@ func (s *ImageService) PruneImages(ctx context.Context, dangling bool) (*image.P
filterArgs := filters.NewArgs()
if dangling {
filterArgs.Add("dangling", "true")
+ } else {
+ filterArgs.Add("dangling", "false")
}
report, err := dockerClient.ImagesPrune(ctx, filterArgs)
diff --git a/frontend/src/lib/services/api/environment-api-service.ts b/frontend/src/lib/services/api/environment-api-service.ts
index c8aea0033..1f4d37c0f 100644
--- a/frontend/src/lib/services/api/environment-api-service.ts
+++ b/frontend/src/lib/services/api/environment-api-service.ts
@@ -114,9 +114,10 @@ export class EnvironmentAPIService extends BaseAPIService {
await this.handleResponse(this.api.delete(`/environments/${envId}/images/${imageId}`, { params: options }));
}
- async pruneImages(filters?: Record<string, string>): Promise<any> {
+ async pruneImages(dangling?: boolean): Promise<any> {
const envId = await this.getCurrentEnvironmentId();
- return this.handleResponse(this.api.post(`/environments/${envId}/images/prune`, { filters }));
+ const params = dangling !== undefined ? { dangling: String(!!dangling) } : undefined;
+ return this.handleResponse(this.api.post(`/environments/${envId}/images/prune`, { params }));
}
async inspectImage(imageId: string): Promise<any> {
diff --git a/frontend/src/routes/images/+page.svelte b/frontend/src/routes/images/+page.svelte
index 9ec768021..c499d13d1 100644
--- a/frontend/src/routes/images/+page.svelte
+++ b/frontend/src/routes/images/+page.svelte
@@ -32,8 +32,9 @@
async function handlePruneImages() {
isLoading.pruning = true;
+ const dangling = data.settings?.dockerPruneMode === 'dangling';
handleApiResultWithCallbacks({
- result: await tryCatch(environmentAPI.pruneImages()),
+ result: await tryCatch(environmentAPI.pruneImages(dangling)),
message: 'Failed to Prune Images',
setLoadingState: (value) => (isLoading.pruning = value),
onSuccess: async () => {
@@ -134,8 +135,8 @@
<Dialog.Header>
<Dialog.Title>Prune Unused Images</Dialog.Title>
<Dialog.Description>
- Are you sure you want to remove all unused (dangling) Docker images? This will free up disk space but cannot be undone.
- Images actively used by containers will not be affected.
+ Removes unused Docker images (prune mode: {String(data.settings.dockerPruneMode)}). This frees disk space and cannot be
+ undone. Images referenced by any container will not be removed.
</Dialog.Description>
</Dialog.Header>
<div class="flex justify-end gap-3 pt-6">
diff --git a/frontend/src/routes/images/+page.ts b/frontend/src/routes/images/+page.ts
index 6ff21581b..8950d9580 100644
--- a/frontend/src/routes/images/+page.ts
+++ b/frontend/src/routes/images/+page.ts
@@ -1,4 +1,4 @@
-import { environmentAPI, systemAPI } from '$lib/services/api';
+import { environmentAPI, settingsAPI, systemAPI } from '$lib/services/api';
import type { SearchPaginationSortRequest } from '$lib/types/pagination.type';
import type { PageLoad } from './$types';
@@ -16,6 +16,7 @@ export const load: PageLoad = async () => {
const totalSize = await environmentAPI.getTotalImageSize();
const images = await environmentAPI.getImages(imageRequestOptions);
+ const settings = await settingsAPI.getSettings();
- return { totalSize, images, imageRequestOptions };
+ return { totalSize, images, imageRequestOptions, settings };
};
diff --git a/frontend/src/routes/settings/forms/docker-settings-form.svelte b/frontend/src/routes/settings/forms/docker-settings-form.svelte
index a4eb1cdea..f151dfaf4 100644
--- a/frontend/src/routes/settings/forms/docker-settings-form.svelte
+++ b/frontend/src/routes/settings/forms/docker-settings-form.svelte
@@ -118,7 +118,7 @@
<SelectWithLabel
id="dockerPruneMode"
name="pruneMode"
- bind:value={pruneMode}
+ bind:value={$formInputs.dockerPruneMode.value}
label="Image Prune Action Behavior"
description={pruneModeDescription}
placeholder="Docker Prune Mode"