Skip to content

Modern Docker Management, Designed for Everyone

feat: support uploading local docker images (#902)

Kyle Mendell1fef14c43689
diff --git a/backend/internal/api/image_handler.go b/backend/internal/api/image_handler.go
index d7e7eb41b..af29fe0e3 100644
--- a/backend/internal/api/image_handler.go
+++ b/backend/internal/api/image_handler.go
@@ -1,10 +1,14 @@
package api
import (
+ "context"
"errors"
"fmt"
+ "io"
"log/slog"
+ "mime/multipart"
"net/http"
+ "strings"
"github.com/gin-gonic/gin"
"github.com/ofkm/arcane-backend/internal/dto"
@@ -17,10 +21,11 @@ type ImageHandler struct {
imageService *services.ImageService
imageUpdateService *services.ImageUpdateService
dockerService *services.DockerClientService
+ settingsService *services.SettingsService
}
-func NewImageHandler(group *gin.RouterGroup, dockerService *services.DockerClientService, imageService *services.ImageService, imageUpdateService *services.ImageUpdateService, authMiddleware *middleware.AuthMiddleware) {
- handler := &ImageHandler{dockerService: dockerService, imageService: imageService, imageUpdateService: imageUpdateService}
+func NewImageHandler(group *gin.RouterGroup, dockerService *services.DockerClientService, imageService *services.ImageService, imageUpdateService *services.ImageUpdateService, settingsService *services.SettingsService, authMiddleware *middleware.AuthMiddleware) {
+ handler := &ImageHandler{dockerService: dockerService, imageService: imageService, imageUpdateService: imageUpdateService, settingsService: settingsService}
apiGroup := group.Group("/environments/:id/images")
apiGroup.Use(authMiddleware.WithAdminNotRequired().Add())
@@ -31,6 +36,7 @@ func NewImageHandler(group *gin.RouterGroup, dockerService *services.DockerClien
apiGroup.DELETE("/:imageId", handler.Remove)
apiGroup.POST("/pull", handler.Pull)
apiGroup.POST("/prune", handler.Prune)
+ apiGroup.POST("/upload", handler.Upload)
}
}
@@ -214,3 +220,81 @@ func (h *ImageHandler) GetImageUsageCounts(c *gin.Context) {
"data": out,
})
}
+
+func (h *ImageHandler) Upload(c *gin.Context) {
+ ctx := context.Background()
+
+ currentUser, ok := middleware.RequireAuthentication(c)
+ if !ok {
+ return
+ }
+
+ // Stream the uploaded file directly to the Docker daemon to avoid buffering large files in memory
+ mr, err := c.Request.MultipartReader()
+ if err != nil {
+ c.JSON(http.StatusBadRequest, gin.H{
+ "success": false,
+ "data": dto.MessageDto{Message: "Invalid multipart form: " + err.Error()},
+ })
+ return
+ }
+
+ var (
+ part *multipart.Part
+ fileName string
+ found bool
+ )
+
+ for {
+ p, err := mr.NextPart()
+ if err != nil {
+ if errors.Is(err, io.EOF) {
+ break
+ }
+ c.JSON(http.StatusBadRequest, gin.H{"success": false, "data": dto.MessageDto{Message: "Failed to read upload: " + err.Error()}})
+ return
+ }
+ // Only consider file parts (have a filename)
+ if p.FileName() != "" {
+ part = p
+ fileName = p.FileName()
+ found = true
+ break
+ }
+ // Discard and continue non-file parts
+ _ = p.Close()
+ }
+
+ if !found || part == nil {
+ c.JSON(http.StatusBadRequest, gin.H{"success": false, "data": dto.MessageDto{Message: "No file uploaded"}})
+ return
+ }
+ defer part.Close()
+
+ maxSizeMB := h.settingsService.GetIntSetting(ctx, "maxImageUploadSize", 500)
+ maxSizeBytes := int64(maxSizeMB) * 1024 * 1024
+
+ // Validate that the file is a Docker image tar archive
+ // We allow .tar, .tar.gz, .tgz, .tar.xz
+ lowerName := strings.ToLower(fileName)
+ if !strings.HasSuffix(lowerName, ".tar") && !strings.HasSuffix(lowerName, ".tar.gz") && !strings.HasSuffix(lowerName, ".tgz") && !strings.HasSuffix(lowerName, ".tar.xz") {
+ c.JSON(http.StatusBadRequest, gin.H{"success": false, "data": dto.MessageDto{Message: "Invalid file format. Only Docker image tar archives are allowed (.tar, .tar.gz, .tgz, .tar.xz)"}})
+ return
+ }
+
+ result, err := h.imageService.LoadImageFromReader(ctx, part, fileName, *currentUser, maxSizeBytes)
+ if err != nil {
+ // Check if it's a size limit error
+ if strings.Contains(err.Error(), "exceeds maximum allowed size") {
+ c.JSON(http.StatusRequestEntityTooLarge, gin.H{"success": false, "data": dto.MessageDto{Message: err.Error()}})
+ return
+ }
+ c.JSON(http.StatusInternalServerError, gin.H{"success": false, "data": dto.MessageDto{Message: "Failed to load image: " + err.Error()}})
+ return
+ }
+
+ c.JSON(http.StatusOK, gin.H{
+ "success": true,
+ "data": result,
+ })
+}
diff --git a/backend/internal/bootstrap/router_bootstrap.go b/backend/internal/bootstrap/router_bootstrap.go
index bb4ff8583..abb91c1ee 100644
--- a/backend/internal/bootstrap/router_bootstrap.go
+++ b/backend/internal/bootstrap/router_bootstrap.go
@@ -98,7 +98,7 @@ func setupRouter(cfg *config.Config, appServices *Services) *gin.Engine {
api.NewHealthHandler(apiGroup)
api.NewContainerHandler(apiGroup, appServices.Docker, appServices.Container, appServices.Image, authMiddleware, cfg)
- api.NewImageHandler(apiGroup, appServices.Docker, appServices.Image, appServices.ImageUpdate, authMiddleware)
+ api.NewImageHandler(apiGroup, appServices.Docker, appServices.Image, appServices.ImageUpdate, appServices.Settings, authMiddleware)
api.NewImageUpdateHandler(apiGroup, appServices.ImageUpdate, authMiddleware)
api.NewNetworkHandler(apiGroup, appServices.Docker, appServices.Network, authMiddleware)
api.NewProjectHandler(apiGroup, appServices.Project, authMiddleware, cfg)
diff --git a/backend/internal/dto/image_dto.go b/backend/internal/dto/image_dto.go
index 58abb7597..64f8c718b 100644
--- a/backend/internal/dto/image_dto.go
+++ b/backend/internal/dto/image_dto.go
@@ -193,3 +193,7 @@ func NewImagePruneReportDto(src image.PruneReport) ImagePruneReportDto {
type MessageDto struct {
Message string `json:"message"`
}
+
+type ImageLoadResultDto struct {
+ Stream string `json:"stream,omitempty"`
+}
diff --git a/backend/internal/dto/settings_dto.go b/backend/internal/dto/settings_dto.go
index c885b33c5..398ac587f 100644
--- a/backend/internal/dto/settings_dto.go
+++ b/backend/internal/dto/settings_dto.go
@@ -19,6 +19,7 @@ type UpdateSettingsDto struct {
PollingEnabled *string `json:"pollingEnabled,omitempty"`
PollingInterval *string `json:"pollingInterval,omitempty"`
PruneMode *string `json:"dockerPruneMode,omitempty" binding:"omitempty,oneof=all dangling"`
+ MaxImageUploadSize *string `json:"maxImageUploadSize,omitempty"`
BaseServerURL *string `json:"baseServerUrl,omitempty"`
EnableGravatar *string `json:"enableGravatar,omitempty"`
DefaultShell *string `json:"defaultShell,omitempty"`
diff --git a/backend/internal/models/event.go b/backend/internal/models/event.go
index 06becd74f..f5b235fdf 100644
--- a/backend/internal/models/event.go
+++ b/backend/internal/models/event.go
@@ -19,6 +19,7 @@ const (
EventTypeContainerError EventType = "container.error"
EventTypeImagePull EventType = "image.pull"
+ EventTypeImageLoad EventType = "image.load"
EventTypeImageDelete EventType = "image.delete"
EventTypeImageScan EventType = "image.scan"
EventTypeImageError EventType = "image.error"
diff --git a/backend/internal/models/settings.go b/backend/internal/models/settings.go
index dbc2c9c38..12732dc53 100644
--- a/backend/internal/models/settings.go
+++ b/backend/internal/models/settings.go
@@ -67,6 +67,7 @@ type Settings struct {
PollingEnabled SettingVariable `key:"pollingEnabled" meta:"label=Enable Polling;type=boolean;keywords=polling,check,monitor,watch,scan,detection,automatic;category=docker;description=Enable automatic checking for image updates"`
PollingInterval SettingVariable `key:"pollingInterval" meta:"label=Polling Interval;type=number;keywords=interval,frequency,schedule,time,minutes,period,delay;category=docker;description=How often to check for image updates"`
PruneMode SettingVariable `key:"dockerPruneMode" meta:"label=Docker Prune Action;type=select;keywords=prune,cleanup,clean,remove,delete,unused,dangling,space,disk;category=docker;description=Configure how unused Docker images are cleaned up"`
+ MaxImageUploadSize SettingVariable `key:"maxImageUploadSize" meta:"label=Max Image Upload Size;type=number;keywords=upload,size,limit,maximum,image,tar,file,megabytes,mb,storage;category=docker;description=Maximum size in MB for image archive uploads (default: 500)"`
DockerHost SettingVariable `key:"dockerHost,public,envOverride" meta:"label=Docker Host;type=text;keywords=docker,host,daemon,socket,unix,remote;category=docker;description=URI for Docker daemon"`
// Security category
diff --git a/backend/internal/services/event_service.go b/backend/internal/services/event_service.go
index e409d66f4..7d547b7c9 100644
--- a/backend/internal/services/event_service.go
+++ b/backend/internal/services/event_service.go
@@ -407,6 +407,8 @@ func (s *EventService) generateEventTitle(eventType models.EventType, resourceNa
return fmt.Sprintf("Container error: %s", resourceName)
case models.EventTypeImagePull:
return fmt.Sprintf("Image pulled: %s", resourceName)
+ case models.EventTypeImageLoad:
+ return fmt.Sprintf("Image loaded: %s", resourceName)
case models.EventTypeImageDelete:
return fmt.Sprintf("Image deleted: %s", resourceName)
case models.EventTypeImageScan:
@@ -474,6 +476,8 @@ func (s *EventService) generateEventDescription(eventType models.EventType, reso
return fmt.Sprintf("An error occurred with container '%s'", resourceName)
case models.EventTypeImagePull:
return fmt.Sprintf("Image '%s' has been pulled", resourceName)
+ case models.EventTypeImageLoad:
+ return fmt.Sprintf("Image '%s' has been loaded from archive", resourceName)
case models.EventTypeImageDelete:
return fmt.Sprintf("Image '%s' has been deleted", resourceName)
case models.EventTypeImageError:
@@ -523,7 +527,7 @@ func (s *EventService) getEventSeverity(eventType models.EventType) models.Event
switch eventType {
case models.EventTypeContainerDelete, models.EventTypeImageDelete, models.EventTypeProjectDelete, models.EventTypeVolumeDelete, models.EventTypeNetworkDelete:
return models.EventSeverityWarning
- case models.EventTypeContainerStart, models.EventTypeContainerCreate, models.EventTypeImagePull, models.EventTypeProjectDeploy, models.EventTypeProjectStart, models.EventTypeProjectCreate, models.EventTypeVolumeCreate, models.EventTypeNetworkCreate:
+ case models.EventTypeContainerStart, models.EventTypeContainerCreate, models.EventTypeImagePull, models.EventTypeImageLoad, models.EventTypeProjectDeploy, models.EventTypeProjectStart, models.EventTypeProjectCreate, models.EventTypeVolumeCreate, models.EventTypeNetworkCreate:
return models.EventSeveritySuccess
case models.EventTypeContainerStop, models.EventTypeContainerRestart, models.EventTypeContainerScan, models.EventTypeContainerUpdate, models.EventTypeImageScan, models.EventTypeProjectStop, models.EventTypeProjectUpdate, models.EventTypeSystemPrune, models.EventTypeSystemAutoUpdate, models.EventTypeSystemUpgrade, models.EventTypeUserLogin, models.EventTypeUserLogout:
return models.EventSeverityInfo
diff --git a/backend/internal/services/image_service.go b/backend/internal/services/image_service.go
index 7c6ed7f29..3458d34c1 100644
--- a/backend/internal/services/image_service.go
+++ b/backend/internal/services/image_service.go
@@ -172,8 +172,50 @@ func (s *ImageService) PullImage(ctx context.Context, imageName string, progress
return nil
}
-// ImageExistsLocally checks if an image reference exists in the local Docker daemon.
-// Returns (true, nil) if found, (false, nil) if not found, or (false, err) for unexpected errors.
+func (s *ImageService) LoadImageFromReader(ctx context.Context, reader io.Reader, fileName string, user models.User, maxSizeBytes int64) (*dto.ImageLoadResultDto, error) {
+ // Wrap reader with size limit enforcement
+ limitedReader := io.LimitReader(reader, maxSizeBytes+1)
+
+ dockerClient, err := s.dockerService.CreateConnection(ctx)
+ if err != nil {
+ s.eventService.LogErrorEvent(ctx, models.EventTypeImageError, "image", "", fileName, user.ID, user.Username, "0", err, models.JSON{"action": "load"})
+ return nil, fmt.Errorf("failed to connect to Docker: %w", err)
+ }
+ defer dockerClient.Close()
+
+ // ImageLoad accepts a tar archive reader and optional load options
+ loadResp, err := dockerClient.ImageLoad(ctx, limitedReader)
+ if err != nil {
+ // Check if error is due to size limit being exceeded
+ if err.Error() == "unexpected EOF" || strings.Contains(err.Error(), "unexpected EOF") {
+ return nil, fmt.Errorf("file size exceeds maximum allowed size of %d MB", maxSizeBytes/(1024*1024))
+ }
+ s.eventService.LogErrorEvent(ctx, models.EventTypeImageError, "image", "", fileName, user.ID, user.Username, "0", err, models.JSON{"action": "load", "file": fileName})
+ return nil, fmt.Errorf("failed to load image from tar: %w", err)
+ }
+ defer loadResp.Body.Close()
+
+ var result dto.ImageLoadResultDto
+ responseBytes, err := io.ReadAll(loadResp.Body)
+ if err != nil {
+ s.eventService.LogErrorEvent(ctx, models.EventTypeImageError, "image", "", fileName, user.ID, user.Username, "0", err, models.JSON{"action": "load", "file": fileName, "step": "read_response"})
+ return nil, fmt.Errorf("failed to read load response: %w", err)
+ }
+
+ responseStr := string(responseBytes)
+ result.Stream = responseStr
+
+ metadata := models.JSON{
+ "action": "load",
+ "fileName": fileName,
+ }
+ if logErr := s.eventService.LogImageEvent(ctx, models.EventTypeImageLoad, "", fileName, user.ID, user.Username, "0", metadata); logErr != nil {
+ slog.Warn("could not log image load action", slog.Any("err", logErr), slog.String("file", fileName))
+ }
+
+ return &result, nil
+}
+
func (s *ImageService) ImageExistsLocally(ctx context.Context, imageName string) (bool, error) {
dockerClient, err := s.dockerService.CreateConnection(ctx)
if err != nil {
diff --git a/backend/internal/services/settings_service.go b/backend/internal/services/settings_service.go
index e48be610b..6c4deb4c2 100644
--- a/backend/internal/services/settings_service.go
+++ b/backend/internal/services/settings_service.go
@@ -100,6 +100,7 @@ func (s *SettingsService) getDefaultSettings() *models.Settings {
SidebarHoverExpansion: models.SettingVariable{Value: "true"},
GlassEffectEnabled: models.SettingVariable{Value: "false"},
AccentColor: models.SettingVariable{Value: "oklch(0.606 0.25 292.717)"},
+ MaxImageUploadSize: models.SettingVariable{Value: "500"},
InstanceID: models.SettingVariable{Value: ""},
}
@@ -491,6 +492,27 @@ func (s *SettingsService) ListSettings(all bool) []models.SettingVariable {
return s.GetSettingsConfig().ToSettingVariableSlice(all, true)
}
+// GetSettingType returns the type from the setting metadata
+func (s *SettingsService) GetSettingType(key string) string {
+ rt := reflect.TypeOf(models.Settings{})
+ for i := 0; i < rt.NumField(); i++ {
+ field := rt.Field(i)
+ keyTag := field.Tag.Get("key")
+ fieldKey, _, _ := strings.Cut(keyTag, ",")
+ if fieldKey == key {
+ metaTag := field.Tag.Get("meta")
+ parts := strings.Split(metaTag, ";")
+ for _, part := range parts {
+ if strings.HasPrefix(part, "type=") {
+ return strings.TrimPrefix(part, "type=")
+ }
+ }
+ return "text" // default type
+ }
+ }
+ return "text" // default if not found
+}
+
func (s *SettingsService) setupInstanceID(ctx context.Context) error {
instanceID := s.GetSettingsConfig().InstanceID.Value
if instanceID != "" {
diff --git a/frontend/messages/en.json b/frontend/messages/en.json
index 2f1a132ff..2bf606312 100644
--- a/frontend/messages/en.json
+++ b/frontend/messages/en.json
@@ -518,6 +518,7 @@
"images_showing_of_total": "Showing {shown} of {total} images",
"images_pull": "Pull",
"images_pull_image": "Pull Image",
+ "images_upload_image": "Upload Image",
"images_check_updates": "Check Updates",
"images_prune_unused": "Prune Unused",
"images_prune_failed": "Failed to Prune Images",
@@ -561,6 +562,14 @@
"images_image_required": "Image name is required",
"images_pull_failed": "Failed to pull image",
"images_pull_success": "Image {repoTag} pulled successfully",
+ "images_upload_failed": "Failed to upload image",
+ "images_upload_success": "Image uploaded successfully",
+ "images_upload_description": "Upload a Docker image archive (.tar, .tar.gz) from your local machine.",
+ "images_upload_select_file": "Select Image Archive",
+ "images_upload_file_label": "Image Archive File",
+ "images_upload_file_placeholder": "Choose a .tar or .tar.gz file",
+ "images_upload_file_required": "Please select a file to upload",
+ "images_uploading": "Uploading images...",
"images_remove_failed": "Failed to remove image",
"images_remove_success": "Image removed successfully",
"images_remove_success_one": "Image removed successfully",
@@ -884,6 +893,9 @@
"docker_prune_dangling_description": "Remove only dangling (untagged) images and anonymous volumes during System Prune.",
"docker_prune_mode_description": "Choose how unused images and volumes should be pruned.",
"docker_prune_action_label": "Docker Prune Action Behavior",
+ "docker_max_upload_size_label": "Max Image Upload Size (MB)",
+ "docker_max_upload_size_placeholder": "500",
+ "docker_max_upload_size_description": "Maximum size in megabytes for image archive uploads (50-5000 MB)",
"docker_prune_placeholder": "Docker PruneMode",
"docker_prune_group_label": "Prune Modes",
"docker_auto_updates_title": "Auto Updates",
@@ -1331,6 +1343,10 @@
"volume_labels_placeholder": "com.example.description=Production data\ncom.example.department=Finance",
"_comment_misc": "=== MISCELLANEOUS ===",
+ "file_drop_zone_drag_drop": "Drag 'n' drop files here, or click to select files",
+ "file_drop_zone_max_files": "You can upload {maxFiles} files",
+ "file_drop_zone_up_to_each": "(up to {maxSize} each)",
+ "file_drop_zone_max_size": "Maximum size {maxSize}",
"editor_placeholder": "Enter code…",
"language": "Language",
"bridge": "Bridge",
diff --git a/frontend/src/lib/components/ui/file-drop-zone/file-drop-zone.svelte b/frontend/src/lib/components/ui/file-drop-zone/file-drop-zone.svelte
new file mode 100644
index 000000000..b1e9fb860
--- /dev/null
+++ b/frontend/src/lib/components/ui/file-drop-zone/file-drop-zone.svelte
@@ -0,0 +1,167 @@
+<script lang="ts">
+ import { cn } from '$lib/utils';
+ import UploadIcon from '@lucide/svelte/icons/upload';
+ import { displaySize } from '.';
+ import { useId } from 'bits-ui';
+ import type { FileDropZoneProps, FileRejectedReason } from './types';
+ import { m } from '$lib/paraglide/messages';
+
+ let {
+ id = useId(),
+ children,
+ maxFiles,
+ maxFileSize,
+ fileCount,
+ disabled = false,
+ onUpload,
+ onFileRejected,
+ accept,
+ class: className,
+ ...rest
+ }: FileDropZoneProps = $props();
+
+ if (maxFiles !== undefined && fileCount === undefined) {
+ console.warn('Make sure to provide FileDropZone with `fileCount` when using the `maxFiles` prompt');
+ }
+
+ let uploading = $state(false);
+
+ const drop = async (
+ e: DragEvent & {
+ currentTarget: EventTarget & HTMLLabelElement;
+ }
+ ) => {
+ if (disabled || !canUploadFiles) return;
+
+ e.preventDefault();
+
+ const droppedFiles = Array.from(e.dataTransfer?.files ?? []);
+
+ await upload(droppedFiles);
+ };
+
+ const change = async (
+ e: Event & {
+ currentTarget: EventTarget & HTMLInputElement;
+ }
+ ) => {
+ if (disabled) return;
+
+ const selectedFiles = e.currentTarget.files;
+
+ if (!selectedFiles) return;
+
+ await upload(Array.from(selectedFiles));
+
+ // this if a file fails and we upload the same file again we still get feedback
+ (e.target as HTMLInputElement).value = '';
+ };
+
+ const shouldAcceptFile = (file: File, fileNumber: number): FileRejectedReason | undefined => {
+ if (maxFileSize !== undefined && file.size > maxFileSize) return 'Maximum file size exceeded';
+
+ if (maxFiles !== undefined && fileNumber > maxFiles) return 'Maximum files uploaded';
+
+ if (!accept) return undefined;
+
+ const acceptedTypes = accept.split(',').map((a) => a.trim().toLowerCase());
+ const fileType = file.type.toLowerCase();
+ const fileName = file.name.toLowerCase();
+
+ const isAcceptable = acceptedTypes.some((pattern) => {
+ // check extension like .mp4
+ if (pattern.startsWith('.')) {
+ return fileName.endsWith(pattern);
+ }
+
+ // if pattern has wild card like video/*
+ if (pattern.endsWith('/*')) {
+ const baseType = pattern.slice(0, pattern.indexOf('/*'));
+ return fileType.startsWith(baseType + '/');
+ }
+
+ // otherwise it must be a specific type like video/mp4
+ return fileType === pattern;
+ });
+
+ if (!isAcceptable) return 'File type not allowed';
+
+ return undefined;
+ };
+
+ const upload = async (uploadFiles: File[]) => {
+ uploading = true;
+
+ const validFiles: File[] = [];
+
+ for (let i = 0; i < uploadFiles.length; i++) {
+ const file = uploadFiles[i];
+
+ const rejectedReason = shouldAcceptFile(file, (fileCount ?? 0) + i + 1);
+
+ if (rejectedReason) {
+ onFileRejected?.({ file, reason: rejectedReason });
+ continue;
+ }
+
+ validFiles.push(file);
+ }
+
+ await onUpload(validFiles);
+
+ uploading = false;
+ };
+
+ const canUploadFiles = $derived(
+ !disabled && !uploading && !(maxFiles !== undefined && fileCount !== undefined && fileCount >= maxFiles)
+ );
+</script>
+
+<label
+ ondragover={(e) => e.preventDefault()}
+ ondrop={drop}
+ for={id}
+ aria-disabled={!canUploadFiles}
+ class={cn(
+ 'border-border hover:bg-accent/25 flex h-48 w-full place-items-center justify-center rounded-lg border-2 border-dashed p-6 transition-all hover:cursor-pointer aria-disabled:opacity-50 aria-disabled:hover:cursor-not-allowed',
+ className
+ )}
+>
+ {#if children}
+ {@render children()}
+ {:else}
+ <div class="flex flex-col place-items-center justify-center gap-2">
+ <div
+ class="border-border text-muted-foreground flex size-14 place-items-center justify-center rounded-full border border-dashed"
+ >
+ <UploadIcon class="size-7" />
+ </div>
+ <div class="flex flex-col gap-0.5 text-center">
+ <span class="text-muted-foreground font-medium">{m.file_drop_zone_drag_drop()}</span>
+ {#if maxFiles || maxFileSize}
+ <span class="text-muted-foreground/75 text-sm">
+ {#if maxFiles}
+ <span>{m.file_drop_zone_max_files({ maxFiles: maxFiles.toString() })}</span>
+ {/if}
+ {#if maxFiles && maxFileSize}
+ <span> {m.file_drop_zone_up_to_each({ maxSize: displaySize(maxFileSize) })}</span>
+ {/if}
+ {#if maxFileSize && !maxFiles}
+ <span>{m.file_drop_zone_max_size({ maxSize: displaySize(maxFileSize) })}</span>
+ {/if}
+ </span>
+ {/if}
+ </div>
+ </div>
+ {/if}
+ <input
+ {...rest}
+ disabled={!canUploadFiles}
+ {id}
+ {accept}
+ multiple={maxFiles === undefined || maxFiles - (fileCount ?? 0) > 1}
+ type="file"
+ onchange={change}
+ class="hidden"
+ />
+</label>
diff --git a/frontend/src/lib/components/ui/file-drop-zone/index.ts b/frontend/src/lib/components/ui/file-drop-zone/index.ts
new file mode 100644
index 000000000..938586870
--- /dev/null
+++ b/frontend/src/lib/components/ui/file-drop-zone/index.ts
@@ -0,0 +1,25 @@
+import FileDropZone from './file-drop-zone.svelte';
+import { type FileRejectedReason, type FileDropZoneProps } from './types';
+
+export const displaySize = (bytes: number): string => {
+ if (bytes < KILOBYTE) return `${bytes.toFixed(0)} B`;
+
+ if (bytes < MEGABYTE) return `${(bytes / KILOBYTE).toFixed(0)} KB`;
+
+ if (bytes < GIGABYTE) return `${(bytes / MEGABYTE).toFixed(0)} MB`;
+
+ return `${(bytes / GIGABYTE).toFixed(0)} GB`;
+};
+
+// Utilities for working with file sizes
+export const BYTE = 1;
+export const KILOBYTE = 1024;
+export const MEGABYTE = 1024 * KILOBYTE;
+export const GIGABYTE = 1024 * MEGABYTE;
+
+// utilities for limiting accepted files
+export const ACCEPT_IMAGE = 'image/*';
+export const ACCEPT_VIDEO = 'video/*';
+export const ACCEPT_AUDIO = 'audio/*';
+
+export { FileDropZone, type FileRejectedReason, type FileDropZoneProps };
diff --git a/frontend/src/lib/components/ui/file-drop-zone/types.ts b/frontend/src/lib/components/ui/file-drop-zone/types.ts
new file mode 100644
index 000000000..00531b4a9
--- /dev/null
+++ b/frontend/src/lib/components/ui/file-drop-zone/types.ts
@@ -0,0 +1,43 @@
+import type { WithChildren } from 'bits-ui';
+import type { HTMLInputAttributes } from 'svelte/elements';
+
+export type FileRejectedReason = 'Maximum file size exceeded' | 'File type not allowed' | 'Maximum files uploaded';
+
+export type FileDropZonePropsWithoutHTML = WithChildren<{
+ ref?: HTMLInputElement | null;
+ /** Called with the uploaded files when the user drops or clicks and selects their files.
+ *
+ * @param files
+ */
+ onUpload: (files: File[]) => Promise<void>;
+ /** The maximum amount files allowed to be uploaded */
+ maxFiles?: number;
+ fileCount?: number;
+ /** The maximum size of a file in bytes */
+ maxFileSize?: number;
+ /** Called when a file does not meet the upload criteria (size, or type) */
+ onFileRejected?: (opts: { reason: FileRejectedReason; file: File }) => void;
+
+ // just for extra documentation
+ /** Takes a comma separated list of one or more file types.
+ *
+ * [MDN Reference](https://developer.mozilla.org/en-US/docs/Web/HTML/Attributes/accept)
+ *
+ * ### Usage
+ * ```svelte
+ * <FileDropZone
+ * accept=".doc,.docx,application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document"
+ * />
+ * ```
+ *
+ * ### Common Values
+ * ```svelte
+ * <FileDropZone accept="audio/*"/>
+ * <FileDropZone accept="image/*"/>
+ * <FileDropZone accept="video/*"/>
+ * ```
+ */
+ accept?: string;
+}>;
+
+export type FileDropZoneProps = FileDropZonePropsWithoutHTML & Omit<HTMLInputAttributes, 'multiple' | 'files'>;
diff --git a/frontend/src/lib/services/image-service.ts b/frontend/src/lib/services/image-service.ts
index 83156eb18..29bffd2b1 100644
--- a/frontend/src/lib/services/image-service.ts
+++ b/frontend/src/lib/services/image-service.ts
@@ -54,6 +54,19 @@ export class ImageService extends BaseAPIService {
const envId = await environmentStore.getCurrentEnvironmentId();
return this.handleResponse(this.api.post(`/environments/${envId}/updater/run`, options));
}
+
+ async uploadImage(file: File): Promise<any> {
+ const envId = await environmentStore.getCurrentEnvironmentId();
+ const formData = new FormData();
+ formData.append('file', file);
+ return this.handleResponse(
+ this.api.post(`/environments/${envId}/images/upload`, formData, {
+ headers: {
+ 'Content-Type': 'multipart/form-data'
+ }
+ })
+ );
+ }
}
export const imageService = new ImageService();
diff --git a/frontend/src/lib/types/image.type.ts b/frontend/src/lib/types/image.type.ts
index 730983f30..8c5d5c96d 100644
--- a/frontend/src/lib/types/image.type.ts
+++ b/frontend/src/lib/types/image.type.ts
@@ -81,3 +81,7 @@ export interface ImageVersions {
versions: string[];
latest?: string;
}
+
+export interface ImageLoadResult {
+ stream?: string;
+}
diff --git a/frontend/src/lib/types/settings.type.ts b/frontend/src/lib/types/settings.type.ts
index 3fd5460a0..44813c2d6 100644
--- a/frontend/src/lib/types/settings.type.ts
+++ b/frontend/src/lib/types/settings.type.ts
@@ -15,6 +15,7 @@ export type Settings = {
pollingEnabled: boolean;
pollingInterval: number;
dockerPruneMode: 'all' | 'dangling';
+ maxImageUploadSize: number;
baseServerUrl: string;
enableGravatar: boolean;
uiConfigDisabled: boolean;
diff --git a/frontend/src/routes/images/+page.svelte b/frontend/src/routes/images/+page.svelte
index 98534f37a..3541aa2db 100644
--- a/frontend/src/routes/images/+page.svelte
+++ b/frontend/src/routes/images/+page.svelte
@@ -3,17 +3,18 @@
import { Spinner } from '$lib/components/ui/spinner/index.js';
import HardDriveIcon from '@lucide/svelte/icons/hard-drive';
import PackageIcon from '@lucide/svelte/icons/package';
+ import XIcon from '@lucide/svelte/icons/x';
import { toast } from 'svelte-sonner';
import ImagePullSheet from '$lib/components/sheets/image-pull-sheet.svelte';
import bytes from 'bytes';
import * as Dialog from '$lib/components/ui/dialog/index.js';
+ import { displaySize, FileDropZone, MEGABYTE, type FileDropZoneProps } from '$lib/components/ui/file-drop-zone';
import { handleApiResultWithCallbacks } from '$lib/utils/api.util';
import { tryCatch } from '$lib/utils/try-catch';
import ImageTable from './image-table.svelte';
import { m } from '$lib/paraglide/messages';
import { imageService } from '$lib/services/image-service';
import { environmentStore } from '$lib/stores/environment.store.svelte';
- import type { Environment } from '$lib/types/environment.type';
import { ResourcePageLayout, type ActionButton, type StatCardConfig } from '$lib/layouts/index.js';
let { data } = $props();
@@ -23,13 +24,19 @@
let isLoading = $state({
pulling: false,
+ uploading: false,
refreshing: false,
pruning: false,
checking: false
});
let isPullDialogOpen = $state(false);
+ let isUploadDialogOpen = $state(false);
let isConfirmPruneDialogOpen = $state(false);
+ let uploadedFiles = $state<File[]>([]);
+
+ // Get max upload size from settings (default 500MB)
+ const maxUploadSizeMB = $derived(parseInt(String(data.settings?.maxImageUploadSize || '500'), 10));
async function handlePruneImages() {
isLoading.pruning = true;
@@ -46,6 +53,43 @@
});
}
+ const onUpload: FileDropZoneProps['onUpload'] = async (files) => {
+ uploadedFiles = [...uploadedFiles, ...files];
+ };
+
+ const onFileRejected: FileDropZoneProps['onFileRejected'] = async ({ reason, file }) => {
+ toast.error(`${file.name} failed to upload!`, { description: reason });
+ };
+
+ const removeFile = (index: number) => {
+ uploadedFiles = [...uploadedFiles.slice(0, index), ...uploadedFiles.slice(index + 1)];
+ };
+
+ async function handleUploadImages() {
+ if (uploadedFiles.length === 0) {
+ toast.error(m.images_upload_file_required());
+ return;
+ }
+
+ isLoading.uploading = true;
+
+ for (const file of uploadedFiles) {
+ handleApiResultWithCallbacks({
+ result: await tryCatch(imageService.uploadImage(file)),
+ message: m.images_upload_failed(),
+ setLoadingState: (value) => (isLoading.uploading = value),
+ onSuccess: async () => {
+ toast.success(m.images_upload_success());
+ }
+ });
+ }
+
+ images = await imageService.getImages(requestOptions);
+ uploadedFiles = [];
+ isUploadDialogOpen = false;
+ isLoading.uploading = false;
+ }
+
async function handleTriggerBulkUpdateCheck() {
isLoading.checking = true;
try {
@@ -109,6 +153,12 @@
label: m.images_pull_image(),
onclick: () => (isPullDialogOpen = true)
},
+ {
+ id: 'upload',
+ action: 'create',
+ label: m.images_upload_image(),
+ onclick: () => (isUploadDialogOpen = true)
+ },
{
id: 'check-updates',
action: 'inspect',
@@ -173,6 +223,68 @@
onPullFinished={async () => (images = await imageService.getImages(requestOptions))}
/>
+ <Dialog.Root bind:open={isUploadDialogOpen}>
+ <Dialog.Content class="max-w-2xl">
+ <Dialog.Header>
+ <Dialog.Title>{m.images_upload_image()}</Dialog.Title>
+ <Dialog.Description>
+ {m.images_upload_description()}
+ </Dialog.Description>
+ </Dialog.Header>
+ <div class="space-y-4 py-4">
+ <FileDropZone
+ {onUpload}
+ {onFileRejected}
+ maxFileSize={maxUploadSizeMB * MEGABYTE}
+ accept=".tar,.tar.gz,.tgz,.tar.xz"
+ maxFiles={10}
+ fileCount={uploadedFiles.length}
+ disabled={isLoading.uploading}
+ />
+ {#if uploadedFiles.length > 0}
+ <div class="flex flex-col gap-2">
+ {#each uploadedFiles as file, i (file.name)}
+ <div class="border-border bg-muted/50 flex items-center justify-between gap-2 rounded-lg border p-3">
+ <div class="flex flex-col">
+ <span class="text-sm font-medium">{file.name}</span>
+ <span class="text-muted-foreground text-xs">{displaySize(file.size)}</span>
+ </div>
+ <Button variant="ghost" size="icon" onclick={() => removeFile(i)} disabled={isLoading.uploading}>
+ <XIcon class="size-4" />
+ </Button>
+ </div>
+ {/each}
+ </div>
+ {/if}
+
+ {#if isLoading.uploading}
+ <div class="text-muted-foreground flex items-center gap-2 text-sm">
+ <Spinner class="size-4" />
+ {m.images_uploading()}
+ </div>
+ {/if}
+ </div>
+ <div class="flex justify-end gap-3">
+ <Button
+ variant="outline"
+ onclick={() => {
+ isUploadDialogOpen = false;
+ uploadedFiles = [];
+ }}
+ disabled={isLoading.uploading}
+ >
+ {m.common_cancel()}
+ </Button>
+ <Button onclick={handleUploadImages} disabled={isLoading.uploading || uploadedFiles.length === 0}>
+ {#if isLoading.uploading}
+ <Spinner class="mr-2 size-4" />
+ {/if}
+ {m.images_upload_image()}
+ </Button>
+ </div>
+ </Dialog.Content>
+ </Dialog.Root>
+
<Dialog.Root bind:open={isConfirmPruneDialogOpen}>
<Dialog.Content>
<Dialog.Header>
diff --git a/frontend/src/routes/settings/docker/+page.svelte b/frontend/src/routes/settings/docker/+page.svelte
index 3c782e516..4b5f7fcab 100644
--- a/frontend/src/routes/settings/docker/+page.svelte
+++ b/frontend/src/routes/settings/docker/+page.svelte
@@ -30,6 +30,7 @@
autoUpdate: z.boolean(),
autoUpdateInterval: z.number().int(),
dockerPruneMode: z.enum(['all', 'dangling']),
+ maxImageUploadSize: z.number().int().min(50).max(5000),
defaultShell: z.string()
});
@@ -111,6 +112,7 @@
$formInputs.autoUpdate.value !== currentSettings.autoUpdate ||
$formInputs.autoUpdateInterval.value != currentSettings.autoUpdateInterval ||
$formInputs.dockerPruneMode.value != currentSettings.dockerPruneMode ||
+ $formInputs.maxImageUploadSize.value != currentSettings.maxImageUploadSize ||
$formInputs.defaultShell.value != currentSettings.defaultShell
});
@@ -149,6 +151,7 @@
$formInputs.autoUpdate.value = currentSettings.autoUpdate;
$formInputs.autoUpdateInterval.value = currentSettings.autoUpdateInterval;
$formInputs.dockerPruneMode.value = currentSettings.dockerPruneMode;
+ $formInputs.maxImageUploadSize.value = currentSettings.maxImageUploadSize;
$formInputs.defaultShell.value = currentSettings.defaultShell;
}
@@ -262,17 +265,28 @@
</div>
</Card.Header>
<Card.Content class="px-3 py-4 sm:px-6">
- <SelectWithLabel
- id="dockerPruneMode"
- name="pruneMode"
- bind:value={$formInputs.dockerPruneMode.value}
- error={$formInputs.dockerPruneMode.error}
- label={m.docker_prune_action_label()}
- description={pruneModeDescription}
- placeholder={m.docker_prune_placeholder()}
- options={pruneModeOptions}
- onValueChange={(v) => (pruneMode = v as 'all' | 'dangling')}
- />
+ <div class="space-y-3">
+ <SelectWithLabel
+ id="dockerPruneMode"
+ name="pruneMode"
+ bind:value={$formInputs.dockerPruneMode.value}
+ error={$formInputs.dockerPruneMode.error}
+ label={m.docker_prune_action_label()}
+ description={pruneModeDescription}
+ placeholder={m.docker_prune_placeholder()}
+ options={pruneModeOptions}
+ onValueChange={(v) => (pruneMode = v as 'all' | 'dangling')}
+ />
+
+ <TextInputWithLabel
+ bind:value={$formInputs.maxImageUploadSize.value}
+ error={$formInputs.maxImageUploadSize.error}
+ label={m.docker_max_upload_size_label()}
+ placeholder={m.docker_max_upload_size_placeholder()}
+ helpText={m.docker_max_upload_size_description()}
+ type="number"
+ />
+ </div>
</Card.Content>
</Card.Root>