Skip to content

Modern Docker Management, Designed for Everyone

feat: add image history, tagging, registry search and local comitting (#3039)

Kyle Mendellc39757596bd1
diff --git a/backend/api/handlers/activities_test.go b/backend/api/handlers/activities_test.go
index 295671b50..3383597a5 100644
--- a/backend/api/handlers/activities_test.go
+++ b/backend/api/handlers/activities_test.go
@@ -139,7 +139,7 @@ func runStreamAllInternal(t *testing.T, ctx context.Context, cancel context.Canc
done := make(chan struct{})
go func() {
defer close(done)
- defer pw.Close()
+ defer func() { _ = pw.Close() }()
handler.streamAllActivitiesInternal(ctx, 50, json.NewEncoder(pw), func() {})
}()
diff --git a/backend/api/handlers/containers.go b/backend/api/handlers/containers.go
index f809129f5..01a7b9f73 100644
--- a/backend/api/handlers/containers.go
+++ b/backend/api/handlers/containers.go
@@ -2,6 +2,7 @@ package handlers
import (
"context"
+ "fmt"
"io"
"maps"
"net/http"
@@ -149,6 +150,16 @@ type KillContainerInput struct {
Signal string `query:"signal" doc:"Signal to send (for example SIGTERM, SIGKILL). Defaults to SIGKILL."`
}
+type CommitContainerInput struct {
+ EnvironmentID string `path:"id" doc:"Environment ID"`
+ ContainerID string `path:"containerId" doc:"Container ID"`
+ Body containertypes.CommitRequest
+}
+
+type CommitContainerOutput struct {
+ Body base.ApiResponse[containertypes.CommitResult]
+}
+
func RegisterContainers(api huma.API, containerSvc *services.ContainerService, dockerSvc *services.DockerClientService, settingsSvc *services.SettingsService, activitySvc *services.ActivityService, appCtx ActivityAppContext) {
h := &ContainerHandler{
containerService: containerSvc,
@@ -250,6 +261,16 @@ func RegisterContainers(api huma.API, containerSvc *services.ContainerService, d
Security: []map[string][]string{{"BearerAuth": {}}, {"ApiKeyAuth": {}}},
}, authz.PermContainersPause, h.UnpauseContainer)
+ humamw.RegisterWithPermission(api, huma.Operation{
+ OperationID: "commit-container",
+ Method: http.MethodPost,
+ Path: "/environments/{id}/containers/{containerId}/commit",
+ Summary: "Commit container",
+ Description: "Create an image from a container",
+ Tags: []string{"Containers", "Images"},
+ Security: []map[string][]string{{"BearerAuth": {}}, {"ApiKeyAuth": {}}},
+ }, authz.PermImagesCommit, h.CommitContainer)
+
humamw.RegisterWithPermission(api, huma.Operation{
OperationID: "redeploy-container",
Method: http.MethodPost,
@@ -752,6 +773,33 @@ func (h *ContainerHandler) runContainerActionInternal(ctx context.Context, input
}, nil
}
+func (h *ContainerHandler) CommitContainer(ctx context.Context, input *CommitContainerInput) (*CommitContainerOutput, error) {
+ if h.containerService == nil {
+ return nil, huma.Error500InternalServerError("service not available")
+ }
+
+ if strings.TrimSpace(input.ContainerID) == "" {
+ return nil, huma.Error400BadRequest("container ID is required")
+ }
+
+ user, err := requireUserInternal(ctx)
+ if err != nil {
+ return nil, err
+ }
+
+ out, err := h.containerService.CommitContainer(ctx, input.ContainerID, input.Body, *user)
+ if err != nil {
+ return nil, huma.Error500InternalServerError(fmt.Sprintf("failed to commit container: %v", err))
+ }
+
+ return &CommitContainerOutput{
+ Body: base.ApiResponse[containertypes.CommitResult]{
+ Success: true,
+ Data: *out,
+ },
+ }, nil
+}
+
func (h *ContainerHandler) RedeployContainer(ctx context.Context, input *ContainerActionInput) (*GetContainerOutput, error) {
if h.containerService == nil {
return nil, huma.Error500InternalServerError("service not available")
diff --git a/backend/api/handlers/images.go b/backend/api/handlers/images.go
index ee5ce2918..51cb6c881 100644
--- a/backend/api/handlers/images.go
+++ b/backend/api/handlers/images.go
@@ -4,6 +4,7 @@ import (
"context"
"errors"
"fmt"
+ "io"
"mime/multipart"
"net/http"
"net/url"
@@ -81,6 +82,39 @@ type GetImageAttestationsOutput struct {
Body base.ApiResponse[image.AttestationList]
}
+type TagImageInput struct {
+ EnvironmentID string `path:"id" doc:"Environment ID"`
+ ImageName string `path:"name" doc:"Image ID or image reference"`
+ Body image.TagRequest
+}
+
+type TagImageOutput struct {
+ Body base.ApiResponse[base.MessageResponse]
+}
+
+type GetImageHistoryInput struct {
+ EnvironmentID string `path:"id" doc:"Environment ID"`
+ ImageName string `path:"name" doc:"Image ID or image reference"`
+}
+
+type GetImageHistoryOutput struct {
+ Body base.ApiResponse[[]image.HistoryItem]
+}
+
+type SearchImagesInput struct {
+ EnvironmentID string `path:"id" doc:"Environment ID"`
+ Term string `query:"term" doc:"Search term"`
+}
+
+type SearchImagesOutput struct {
+ Body base.ApiResponse[[]image.SearchResult]
+}
+
+type ExportImageInput struct {
+ EnvironmentID string `path:"id" doc:"Environment ID"`
+ ImageName string `path:"name" doc:"Image ID or image reference"`
+}
+
type RemoveImageInput struct {
EnvironmentID string `path:"id" doc:"Environment ID"`
ImageID string `path:"imageId" doc:"Image ID"`
@@ -219,6 +253,58 @@ func RegisterImages(api huma.API, dockerService *services.DockerClientService, i
},
}, authz.PermImagesRead, h.GetImageAttestations)
+ humamw.RegisterWithPermission(api, huma.Operation{
+ OperationID: "search-images",
+ Method: http.MethodGet,
+ Path: "/environments/{id}/images/search",
+ Summary: "Search images",
+ Description: "Search Docker Hub images",
+ Tags: []string{"Images"},
+ Security: []map[string][]string{
+ {"BearerAuth": {}},
+ {"ApiKeyAuth": {}},
+ },
+ }, authz.PermImagesRead, h.SearchImages)
+
+ humamw.RegisterWithPermission(api, huma.Operation{
+ OperationID: "tag-image",
+ Method: http.MethodPost,
+ Path: "/environments/{id}/images/{name}/tag",
+ Summary: "Tag image",
+ Description: "Add a repository tag to an image",
+ Tags: []string{"Images"},
+ Security: []map[string][]string{
+ {"BearerAuth": {}},
+ {"ApiKeyAuth": {}},
+ },
+ }, authz.PermImagesTag, h.TagImage)
+
+ humamw.RegisterWithPermission(api, huma.Operation{
+ OperationID: "get-image-history",
+ Method: http.MethodGet,
+ Path: "/environments/{id}/images/{name}/history",
+ Summary: "Get image history",
+ Description: "Get Docker image layer history",
+ Tags: []string{"Images"},
+ Security: []map[string][]string{
+ {"BearerAuth": {}},
+ {"ApiKeyAuth": {}},
+ },
+ }, authz.PermImagesRead, h.GetImageHistory)
+
+ humamw.RegisterWithPermission(api, huma.Operation{
+ OperationID: "export-image",
+ Method: http.MethodGet,
+ Path: "/environments/{id}/images/{name}/export",
+ Summary: "Export image",
+ Description: "Download a Docker image as a tar archive",
+ Tags: []string{"Images"},
+ Security: []map[string][]string{
+ {"BearerAuth": {}},
+ {"ApiKeyAuth": {}},
+ },
+ }, authz.PermImagesRead, h.ExportImage)
+
humamw.RegisterWithPermission(api, huma.Operation{
OperationID: "get-image",
Method: http.MethodGet,
@@ -434,6 +520,138 @@ func (h *ImageHandler) GetImageAttestations(ctx context.Context, input *GetImage
}, nil
}
+// TagImage adds a repository tag to an image.
+func (h *ImageHandler) TagImage(ctx context.Context, input *TagImageInput) (*TagImageOutput, error) {
+ if h.imageService == nil {
+ return nil, huma.Error500InternalServerError("service not available")
+ }
+
+ imageName, err := decodeImageNameInternal(input.ImageName)
+ if err != nil {
+ return nil, err
+ }
+ if strings.TrimSpace(input.Body.Repository) == "" {
+ return nil, huma.Error400BadRequest("repository is required")
+ }
+
+ user, err := requireUserInternal(ctx)
+ if err != nil {
+ return nil, err
+ }
+
+ if err := h.imageService.TagImage(ctx, imageName, input.Body, *user); err != nil {
+ return nil, huma.Error500InternalServerError(fmt.Sprintf("failed to tag image: %v", err))
+ }
+
+ return &TagImageOutput{
+ Body: base.ApiResponse[base.MessageResponse]{
+ Success: true,
+ Data: base.MessageResponse{Message: "Image tagged successfully"},
+ },
+ }, nil
+}
+
+// GetImageHistory returns Docker image layer history.
+func (h *ImageHandler) GetImageHistory(ctx context.Context, input *GetImageHistoryInput) (*GetImageHistoryOutput, error) {
+ if h.imageService == nil {
+ return nil, huma.Error500InternalServerError("service not available")
+ }
+
+ imageName, err := decodeImageNameInternal(input.ImageName)
+ if err != nil {
+ return nil, err
+ }
+
+ history, err := h.imageService.GetImageHistory(ctx, imageName)
+ if err != nil {
+ return nil, huma.Error500InternalServerError(fmt.Sprintf("failed to get image history: %v", err))
+ }
+ if history == nil {
+ history = []image.HistoryItem{}
+ }
+
+ return &GetImageHistoryOutput{
+ Body: base.ApiResponse[[]image.HistoryItem]{
+ Success: true,
+ Data: history,
+ },
+ }, nil
+}
+
+// SearchImages searches Docker Hub images.
+func (h *ImageHandler) SearchImages(ctx context.Context, input *SearchImagesInput) (*SearchImagesOutput, error) {
+ if h.imageService == nil {
+ return nil, huma.Error500InternalServerError("service not available")
+ }
+
+ results, err := h.imageService.SearchImages(ctx, input.Term)
+ if err != nil {
+ if strings.Contains(err.Error(), "term is required") {
+ return nil, huma.Error400BadRequest(err.Error())
+ }
+ return nil, huma.Error500InternalServerError(fmt.Sprintf("failed to search images: %v", err))
+ }
+ if results == nil {
+ results = []image.SearchResult{}
+ }
+
+ return &SearchImagesOutput{
+ Body: base.ApiResponse[[]image.SearchResult]{
+ Success: true,
+ Data: results,
+ },
+ }, nil
+}
+
+// ExportImage streams a Docker image tar archive.
+func (h *ImageHandler) ExportImage(ctx context.Context, input *ExportImageInput) (*huma.StreamResponse, error) {
+ if h.imageService == nil {
+ return nil, huma.Error500InternalServerError("service not available")
+ }
+
+ imageName, err := decodeImageNameInternal(input.ImageName)
+ if err != nil {
+ return nil, err
+ }
+
+ reader, err := h.imageService.ExportImage(ctx, imageName)
+ if err != nil {
+ return nil, huma.Error500InternalServerError(fmt.Sprintf("failed to export image: %v", err))
+ }
+
+ return &huma.StreamResponse{
+ Body: func(humaCtx huma.Context) {
+ defer func() { _ = reader.Close() }()
+
+ humaCtx.SetHeader("Content-Type", "application/x-tar")
+ humaCtx.SetHeader("Content-Disposition", fmt.Sprintf("attachment; filename=%q", imageExportFileNameInternal(imageName)))
+
+ _, _ = io.Copy(humaCtx.BodyWriter(), reader)
+ },
+ }, nil
+}
+
+func decodeImageNameInternal(raw string) (string, error) {
+ imageName, err := url.PathUnescape(raw)
+ if err != nil {
+ return "", huma.Error400BadRequest(fmt.Sprintf("invalid image name %q", raw))
+ }
+ imageName = strings.TrimSpace(imageName)
+ if imageName == "" {
+ return "", huma.Error400BadRequest("image name is required")
+ }
+ return imageName, nil
+}
+
+func imageExportFileNameInternal(imageName string) string {
+ name := strings.NewReplacer("/", "_", ":", "_", "@", "_").Replace(imageName)
+ name = strings.Trim(name, "._-")
+ if name == "" {
+ name = "image"
+ }
+ return name + ".tar"
+}
+
// RemoveImage removes a Docker image.
func (h *ImageHandler) RemoveImage(ctx context.Context, input *RemoveImageInput) (*RemoveImageOutput, error) {
if h.imageService == nil {
diff --git a/backend/api/handlers/settings.go b/backend/api/handlers/settings.go
index 75bf56320..f9d096579 100644
--- a/backend/api/handlers/settings.go
+++ b/backend/api/handlers/settings.go
@@ -390,7 +390,9 @@ func (h *SettingsHandler) updateSettingsForLocalEnvironment(ctx context.Context,
if err != nil {
return nil, huma.Error400BadRequest(fmt.Sprintf("cannot read projects directory %q: %v", resolved, err))
}
- f.Close()
+ if err := f.Close(); err != nil {
+ return nil, huma.Error400BadRequest(fmt.Sprintf("cannot read projects directory %q: %v", resolved, err))
+ }
}
}
diff --git a/backend/internal/models/event.go b/backend/internal/models/event.go
index 40e9ec4a9..26bfa78d6 100644
--- a/backend/internal/models/event.go
+++ b/backend/internal/models/event.go
@@ -26,6 +26,8 @@ const (
EventTypeImagePull EventType = "image.pull"
EventTypeImageLoad EventType = "image.load"
+ EventTypeImageTag EventType = "image.tag"
+ EventTypeImageCommit EventType = "image.commit"
EventTypeImageDelete EventType = "image.delete"
EventTypeImageScan EventType = "image.scan"
EventTypeImageError EventType = "image.error"
diff --git a/backend/internal/services/api_key_service_test.go b/backend/internal/services/api_key_service_test.go
index 4ad5e2dbc..1665d9cf7 100644
--- a/backend/internal/services/api_key_service_test.go
+++ b/backend/internal/services/api_key_service_test.go
@@ -134,10 +134,10 @@ func TestCreateDefaultAdminAPIKeyUsesProvidedRawKey(t *testing.T) {
created, err := service.CreateDefaultAdminAPIKey(ctx, user.ID, rawKey)
require.NoError(t, err)
require.Equal(t, rawKey, created.Key)
- require.Equal(t, defaultAdminAPIKeyName, created.ApiKey.Name)
- require.True(t, created.ApiKey.IsStatic)
+ require.Equal(t, defaultAdminAPIKeyName, created.Name)
+ require.True(t, created.IsStatic)
- stored := fetchAPIKey(t, db, created.ApiKey.ID)
+ stored := fetchAPIKey(t, db, created.ID)
require.NotEqual(t, rawKey, stored.KeyHash)
require.Equal(t, rawKey[:len(apiKeyPrefix)+apiKeyPrefixLen], stored.KeyPrefix)
require.NotNil(t, stored.ManagedBy)
@@ -174,12 +174,12 @@ func TestDeleteApiKeyRejectsStaticKey(t *testing.T) {
created, err := service.CreateDefaultAdminAPIKey(ctx, adminUser.ID, "arc_bootstrapprotected1234567890")
require.NoError(t, err)
- err = service.DeleteApiKey(ctx, created.ApiKey.ID)
+ err = service.DeleteApiKey(ctx, created.ID)
require.ErrorIs(t, err, ErrApiKeyProtected)
apiKeys := listAPIKeysForUser(t, db, adminUser.ID)
require.Len(t, apiKeys, 1)
- require.Equal(t, created.ApiKey.ID, apiKeys[0].ID)
+ require.Equal(t, created.ID, apiKeys[0].ID)
}
func TestUpdateApiKeyRejectsStaticKey(t *testing.T) {
@@ -190,7 +190,7 @@ func TestUpdateApiKeyRejectsStaticKey(t *testing.T) {
created, err := service.CreateDefaultAdminAPIKey(ctx, adminUser.ID, "arc_bootstrapupdateprotected1234567890")
require.NoError(t, err)
- updated, err := service.UpdateApiKey(ctx, authz.SudoPermissionSet(), created.ApiKey.ID, apikey.UpdateApiKey{
+ updated, err := service.UpdateApiKey(ctx, authz.SudoPermissionSet(), created.ID, apikey.UpdateApiKey{
Name: new("renamed"),
Description: new("updated description"),
})
@@ -219,7 +219,7 @@ func TestUpdateApiKeyRollsBackMetadataWhenPermissionUpdateFails(t *testing.T) {
created, err := service.CreateApiKey(ctx, admin.ID, authz.SudoPermissionSet(), apikey.CreateApiKey{Name: "original"})
require.NoError(t, err)
- updated, err := service.UpdateApiKey(ctx, authz.SudoPermissionSet(), created.ApiKey.ID, apikey.UpdateApiKey{
+ updated, err := service.UpdateApiKey(ctx, authz.SudoPermissionSet(), created.ID, apikey.UpdateApiKey{
Name: new("renamed"),
Permissions: []apikey.PermissionGrant{
{Permission: authz.PermContainersList},
@@ -229,7 +229,7 @@ func TestUpdateApiKeyRollsBackMetadataWhenPermissionUpdateFails(t *testing.T) {
require.Nil(t, updated)
require.Error(t, err)
- stored := fetchAPIKey(t, db, created.ApiKey.ID)
+ stored := fetchAPIKey(t, db, created.ID)
require.Equal(t, "original", stored.Name)
}
@@ -254,7 +254,7 @@ func TestCreateApiKeyRejectsGrantsBeyondCallerPermissions(t *testing.T) {
Permissions: []apikey.PermissionGrant{{Permission: authz.PermContainersList}},
})
require.NoError(t, err)
- require.Equal(t, models.ApiKeyKindScoped, created.ApiKey.Kind)
+ require.Equal(t, models.ApiKeyKindScoped, created.Kind)
}
func TestApiKeyGrantsAreCappedByOwnerRoles(t *testing.T) {
@@ -278,7 +278,7 @@ func TestApiKeyGrantsAreCappedByOwnerRoles(t *testing.T) {
// Update path: a grantless key cannot gain permissions the owner lacks.
created, err := service.CreateApiKey(ctx, owner.ID, authz.SudoPermissionSet(), apikey.CreateApiKey{Name: "grantless"})
require.NoError(t, err)
- _, err = service.UpdateApiKey(ctx, authz.SudoPermissionSet(), created.ApiKey.ID, apikey.UpdateApiKey{
+ _, err = service.UpdateApiKey(ctx, authz.SudoPermissionSet(), created.ID, apikey.UpdateApiKey{
Permissions: []apikey.PermissionGrant{{Permission: authz.PermContainersList}},
})
require.ErrorIs(t, err, ErrApiKeyPermissionEscalation)
@@ -305,12 +305,12 @@ func TestCreatePersonalApiKeyHasNoGrantsAndCannotGainAny(t *testing.T) {
created, err := service.CreatePersonalApiKey(ctx, user.ID, apikey.CreateUserApiKey{Name: "personal"})
require.NoError(t, err)
- require.Equal(t, models.ApiKeyKindPersonal, created.ApiKey.Kind)
- require.Empty(t, created.ApiKey.Permissions)
- require.Equal(t, models.ApiKeyKindPersonal, fetchAPIKey(t, db, created.ApiKey.ID).Kind)
+ require.Equal(t, models.ApiKeyKindPersonal, created.Kind)
+ require.Empty(t, created.Permissions)
+ require.Equal(t, models.ApiKeyKindPersonal, fetchAPIKey(t, db, created.ID).Kind)
// Attaching grants to a personal key is rejected even for sudo callers.
- _, err = service.UpdateApiKey(ctx, authz.SudoPermissionSet(), created.ApiKey.ID, apikey.UpdateApiKey{
+ _, err = service.UpdateApiKey(ctx, authz.SudoPermissionSet(), created.ID, apikey.UpdateApiKey{
Permissions: []apikey.PermissionGrant{{Permission: authz.PermContainersList}},
})
require.ErrorIs(t, err, ErrApiKeyPersonalNoGrants)
@@ -384,7 +384,7 @@ func TestReconcileDefaultAdminAPIKeyPreservesUserManagedKeys(t *testing.T) {
foundUserKey := false
foundManagedKey := false
for _, apiKey := range apiKeys {
- if apiKey.ID == userCreated.ApiKey.ID {
+ if apiKey.ID == userCreated.ID {
foundUserKey = true
require.Nil(t, apiKey.ManagedBy)
require.Equal(t, "manual-key", apiKey.Name)
@@ -413,7 +413,7 @@ func TestReconcileDefaultAdminAPIKeyDeletesDuplicateManagedKeys(t *testing.T) {
apiKeys := listAPIKeysForUser(t, db, adminUser.ID)
require.Len(t, apiKeys, 1)
- require.Equal(t, first.ApiKey.ID, apiKeys[0].ID)
+ require.Equal(t, first.ID, apiKeys[0].ID)
}
func TestReconcileDefaultAdminAPIKeySkipsWhenDefaultAdminMissing(t *testing.T) {
@@ -446,13 +446,13 @@ func TestValidateAPIKeyUpdatesLastUsedAt(t *testing.T) {
created, err := service.CreateApiKey(ctx, user.ID, authz.SudoPermissionSet(), apikey.CreateApiKey{Name: "validate-key"})
require.NoError(t, err)
- require.Nil(t, fetchAPIKey(t, db, created.ApiKey.ID).LastUsedAt)
+ require.Nil(t, fetchAPIKey(t, db, created.ID).LastUsedAt)
validatedUser, err := service.ValidateApiKey(ctx, created.Key)
require.NoError(t, err)
require.Equal(t, user.ID, validatedUser.ID)
- apiKey := requireAPIKeyLastUsedEventually(t, db, created.ApiKey.ID)
+ apiKey := requireAPIKeyLastUsedEventually(t, db, created.ID)
require.NotNil(t, apiKey.LastUsedAt)
}
@@ -463,14 +463,14 @@ func TestGetEnvironmentByAPIKeyUpdatesLastUsedAt(t *testing.T) {
created, err := service.CreateEnvironmentApiKey(ctx, "env-123", user.ID)
require.NoError(t, err)
- require.Nil(t, fetchAPIKey(t, db, created.ApiKey.ID).LastUsedAt)
+ require.Nil(t, fetchAPIKey(t, db, created.ID).LastUsedAt)
environmentID, err := service.GetEnvironmentByApiKey(ctx, created.Key)
require.NoError(t, err)
require.NotNil(t, environmentID)
require.Equal(t, "env-123", *environmentID)
- apiKey := requireAPIKeyLastUsedEventually(t, db, created.ApiKey.ID)
+ apiKey := requireAPIKeyLastUsedEventually(t, db, created.ID)
require.NotNil(t, apiKey.LastUsedAt)
}
@@ -485,8 +485,8 @@ func TestValidateAPIKeyInvalidDoesNotUpdateLastUsedAt(t *testing.T) {
_, err = service.ValidateApiKey(ctx, invalidateAPIKey(created.Key))
require.ErrorIs(t, err, ErrApiKeyInvalid)
- assertAPIKeyLastUsedStable(t, db, created.ApiKey.ID, nil, 500*time.Millisecond)
- apiKey := fetchAPIKey(t, db, created.ApiKey.ID)
+ assertAPIKeyLastUsedStable(t, db, created.ID, nil, 500*time.Millisecond)
+ apiKey := fetchAPIKey(t, db, created.ID)
require.Nil(t, apiKey.LastUsedAt)
}
@@ -507,14 +507,14 @@ func TestGetEnvironmentByAPIKeyExpiredDoesNotUpdateLastUsedAt(t *testing.T) {
require.NoError(t, err)
expiredAt := time.Now().Add(-time.Minute)
- err = db.WithContext(ctx).Model(&models.ApiKey{}).Where("id = ?", created.ApiKey.ID).Update("expires_at", expiredAt).Error
+ err = db.WithContext(ctx).Model(&models.ApiKey{}).Where("id = ?", created.ID).Update("expires_at", expiredAt).Error
require.NoError(t, err)
_, err = service.GetEnvironmentByApiKey(ctx, created.Key)
require.ErrorIs(t, err, ErrApiKeyExpired)
- assertAPIKeyLastUsedStable(t, db, created.ApiKey.ID, nil, 500*time.Millisecond)
- apiKey := fetchAPIKey(t, db, created.ApiKey.ID)
+ assertAPIKeyLastUsedStable(t, db, created.ID, nil, 500*time.Millisecond)
+ apiKey := fetchAPIKey(t, db, created.ID)
require.Nil(t, apiKey.LastUsedAt)
}
@@ -536,7 +536,7 @@ func TestCreateEnvironmentApiKeySeedsAllPermissionsScopedToEnv(t *testing.T) {
// Resolve the per-key permission set and confirm every permission is
// present, scoped to the bootstrap env (not global).
- ps, err := roleSvc.ResolveApiKeyPermissions(ctx, created.ApiKey.ID)
+ ps, err := roleSvc.ResolveApiKeyPermissions(ctx, created.ID)
require.NoError(t, err)
require.Empty(t, ps.Global, "bootstrap key permissions must land in PerEnv, not Global")
envPerms, ok := ps.PerEnv[envID]
@@ -587,10 +587,10 @@ func TestGetEnvironmentByAPIKeyRecentLastUsedAtDoesNotRewriteImmediately(t *test
require.NoError(t, err)
recent := time.Now().Add(-time.Minute)
- err = db.WithContext(ctx).Model(&models.ApiKey{}).Where("id = ?", created.ApiKey.ID).Update("last_used_at", recent).Error
+ err = db.WithContext(ctx).Model(&models.ApiKey{}).Where("id = ?", created.ID).Update("last_used_at", recent).Error
require.NoError(t, err)
- before := fetchAPIKey(t, db, created.ApiKey.ID)
+ before := fetchAPIKey(t, db, created.ID)
require.NotNil(t, before.LastUsedAt)
environmentID, err := service.GetEnvironmentByApiKey(ctx, created.Key)
@@ -598,8 +598,8 @@ func TestGetEnvironmentByAPIKeyRecentLastUsedAtDoesNotRewriteImmediately(t *test
require.NotNil(t, environmentID)
require.Equal(t, "env-456", *environmentID)
- assertAPIKeyLastUsedStable(t, db, created.ApiKey.ID, before.LastUsedAt, 2*time.Second)
- after := fetchAPIKey(t, db, created.ApiKey.ID)
+ assertAPIKeyLastUsedStable(t, db, created.ID, before.LastUsedAt, 2*time.Second)
+ after := fetchAPIKey(t, db, created.ID)
require.NotNil(t, after.LastUsedAt)
require.Equal(t, before.LastUsedAt.UTC().Unix(), after.LastUsedAt.UTC().Unix())
}
diff --git a/backend/internal/services/build_workspace_service.go b/backend/internal/services/build_workspace_service.go
index d3b3c6f8d..4225eaa64 100644
--- a/backend/internal/services/build_workspace_service.go
+++ b/backend/internal/services/build_workspace_service.go
@@ -120,7 +120,7 @@ func (s *BuildWorkspaceService) GetFileContent(ctx context.Context, filePath str
if err != nil {
return nil, "", fmt.Errorf("failed to open file: %w", err)
}
- defer file.Close()
+ defer func() { _ = file.Close() }()
content, err := io.ReadAll(io.LimitReader(file, maxBytes))
if err != nil {
@@ -195,7 +195,7 @@ func (s *BuildWorkspaceService) UploadFile(ctx context.Context, destPath string,
if err != nil {
return fmt.Errorf("failed to create file: %w", err)
}
- defer file.Close()
+ defer func() { _ = file.Close() }()
if _, err := io.Copy(file, content); err != nil {
return fmt.Errorf("failed to write file: %w", err)
diff --git a/backend/internal/services/container_registry_service_test.go b/backend/internal/services/container_registry_service_test.go
index 421e2960d..b58e8124d 100644
--- a/backend/internal/services/container_registry_service_test.go
+++ b/backend/internal/services/container_registry_service_test.go
@@ -52,7 +52,7 @@ func newTestDockerClient(t *testing.T, server *httptest.Server) *client.Client {
httpClient := server.Client()
cli, err := client.New(
client.WithHost(server.URL),
- client.WithVersion("1.41"),
+ client.WithAPIVersion("1.41"),
client.WithHTTPClient(httpClient),
)
require.NoError(t, err)
diff --git a/backend/internal/services/container_service.go b/backend/internal/services/container_service.go
index c778efe4e..1b5805110 100644
--- a/backend/internal/services/container_service.go
+++ b/backend/internal/services/container_service.go
@@ -390,6 +390,54 @@ func (s *ContainerService) UnpauseContainer(ctx context.Context, containerID str
})
}
+// CommitContainer creates an image from a container's current filesystem.
+func (s *ContainerService) CommitContainer(ctx context.Context, containerID string, req containertypes.CommitRequest, user models.User) (*containertypes.CommitResult, error) {
+ containerID = strings.TrimSpace(containerID)
+ if containerID == "" {
+ return nil, errors.New("container ID is required")
+ }
+
+ dockerClient, err := s.dockerService.GetClient(ctx)
+ if err != nil {
+ s.eventService.LogErrorEvent(ctx, models.EventTypeImageError, "container", containerID, "", user.ID, user.Username, "0", err, models.JSON{"action": "commit"})
+ return nil, fmt.Errorf("failed to connect to Docker: %w", err)
+ }
+
+ repository := strings.TrimSpace(req.Repository)
+ tag := strings.TrimSpace(req.Tag)
+ reference := repository
+ if repository != "" && tag != "" {
+ reference = repository + ":" + tag
+ }
+
+ result, err := dockerClient.ContainerCommit(ctx, containerID, client.ContainerCommitOptions{
+ Reference: reference,
+ Comment: strings.TrimSpace(req.Comment),
+ Author: strings.TrimSpace(req.Author),
+ Changes: req.Changes,
+ NoPause: req.NoPause,
+ })
+ if err != nil {
+ s.eventService.LogErrorEvent(ctx, models.EventTypeImageError, "container", containerID, reference, user.ID, user.Username, "0", err, models.JSON{"action": "commit", "reference": reference})
+ return nil, fmt.Errorf("failed to commit container: %w", err)
+ }
+
+ metadata := models.JSON{
+ "action": "commit",
+ "containerId": containerID,
+ "imageId": result.ID,
+ "repository": repository,
+ "tag": tag,
+ "reference": reference,
+ "noPause": req.NoPause,
+ }
+ if logErr := s.eventService.LogImageEvent(ctx, models.EventTypeImageCommit, containerID, reference, user.ID, user.Username, "0", metadata); logErr != nil {
+ slog.WarnContext(ctx, "could not log container commit action", "container", containerID, "image", result.ID, "error", logErr)
+ }
+
+ return &containertypes.CommitResult{ID: result.ID}, nil
+}
+
// tryRedeployViaComposeProjectInternal attempts to redeploy a compose-managed
// container by delegating to ProjectService.UpdateProjectServices, which loads
// the compose project with full project_directory / env-file / include context
diff --git a/backend/internal/services/container_service_test.go b/backend/internal/services/container_service_test.go
index 231897866..81de396ba 100644
--- a/backend/internal/services/container_service_test.go
+++ b/backend/internal/services/container_service_test.go
@@ -1,9 +1,14 @@
package services
import (
+ "context"
+ "encoding/json"
+ "net/http"
+ "net/http/httptest"
"net/netip"
"testing"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"
"github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
"github.com/getarcaneapp/arcane/backend/v2/pkg/projects"
containertypes "github.com/getarcaneapp/arcane/types/v2/container"
@@ -208,6 +213,97 @@ func TestCompareContainerPortsForSortDesc_KeepsContainersWithoutPortsLast(t *tes
require.Equal(t, 1, compareContainerPortsForSortDescInternal(withoutPorts, withPublished))
}
+func TestContainerServiceCommitContainerCallsDockerAPIInternal(t *testing.T) {
+ db := setupProjectTestDB(t)
+ var gotRequest map[string]any
+ server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+ if r.Method != http.MethodPost || dockerTestPathInternal(r.URL.Path) != "/commit" {
+ http.NotFound(w, r)
+ return
+ }
+ gotRequest = map[string]any{
+ "container": r.URL.Query().Get("container"),
+ "repo": r.URL.Query().Get("repo"),
+ "tag": r.URL.Query().Get("tag"),
+ "comment": r.URL.Query().Get("comment"),
+ "author": r.URL.Query().Get("author"),
+ }
+ _ = json.NewEncoder(w).Encode(map[string]string{"ID": "sha256:new-image"})
+ }))
+ t.Cleanup(server.Close)
+
+ svc := NewContainerService(
+ context.Background(),
+ db,
+ NewEventService(db, nil, nil),
+ &DockerClientService{client: newTestDockerClient(t, server)},
+ nil,
+ nil,
+ nil,
+ )
+
+ out, err := svc.CommitContainer(context.Background(), "container-1", containertypes.CommitRequest{
+ Repository: "registry.example.com/team/app",
+ Tag: "snapshot",
+ Comment: "manual snapshot",
+ Author: "arcane",
+ }, systemUser)
+ require.NoError(t, err)
+ require.NotNil(t, out)
+ require.Equal(t, "sha256:new-image", out.ID)
+ require.Equal(t, map[string]any{
+ "container": "container-1",
+ "repo": "registry.example.com/team/app",
+ "tag": "snapshot",
+ "comment": "manual snapshot",
+ "author": "arcane",
+ }, gotRequest)
+
+ var event models.Event
+ require.NoError(t, db.WithContext(context.Background()).Where("type = ?", models.EventTypeImageCommit).First(&event).Error)
+ require.Equal(t, "container-1", *event.ResourceID)
+}
+
+func TestContainerServiceCommitContainerOmitsReferenceWhenRepositoryEmptyInternal(t *testing.T) {
+ db := setupProjectTestDB(t)
+ var gotRequest map[string]any
+ server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+ if r.Method != http.MethodPost || dockerTestPathInternal(r.URL.Path) != "/commit" {
+ http.NotFound(w, r)
+ return
+ }
+ gotRequest = map[string]any{
+ "container": r.URL.Query().Get("container"),
+ "repo": r.URL.Query().Get("repo"),
+ "tag": r.URL.Query().Get("tag"),
+ }
+ _ = json.NewEncoder(w).Encode(map[string]string{"ID": "sha256:new-image"})
+ }))
+ t.Cleanup(server.Close)
+
+ svc := NewContainerService(
+ context.Background(),
+ db,
+ NewEventService(db, nil, nil),
+ &DockerClientService{client: newTestDockerClient(t, server)},
+ nil,
+ nil,
+ nil,
+ )
+
+ out, err := svc.CommitContainer(context.Background(), "container-1", containertypes.CommitRequest{
+ Tag: "latest",
+ }, systemUser)
+ require.NoError(t, err)
+ require.NotNil(t, out)
+ require.Equal(t, "sha256:new-image", out.ID)
+ require.Equal(t, map[string]any{
+ "container": "container-1",
+ "repo": "",
+ "tag": "",
+ }, gotRequest)
+}
+
func newGroupedContainerSummary(name string, project string) containertypes.Summary {
labels := map[string]string{}
if project != "" {
diff --git a/backend/internal/services/dashboard_service_test.go b/backend/internal/services/dashboard_service_test.go
index e1edad2e1..f19867646 100644
--- a/backend/internal/services/dashboard_service_test.go
+++ b/backend/internal/services/dashboard_service_test.go
@@ -69,9 +69,9 @@ func newDashboardTestDockerService(
}))
t.Cleanup(server.Close)
- dockerClient, err := client.NewClientWithOpts(
+ dockerClient, err := client.New(
client.WithHost(server.URL),
- client.WithVersion("1.41"),
+ client.WithAPIVersion("1.41"),
)
require.NoError(t, err)
t.Cleanup(func() {
@@ -148,10 +148,11 @@ func TestDashboardService_GetSnapshot_ReturnsDashboardSnapshot(t *testing.T) {
require.NoError(t, settingsSvc.SetStringSetting(context.Background(), "projectsDirectory", projectsDir))
projectPath := createComposeProjectDir(t, projectsDir, "project-with-update")
require.NoError(t, os.WriteFile(filepath.Join(projectPath, "compose.yaml"), []byte("services:\n app:\n image: repo/worker:latest\n"), 0o644))
+ dirName := "project-with-update"
require.NoError(t, db.WithContext(context.Background()).Create(&models.Project{
BaseModel: models.BaseModel{ID: "project-with-update"},
Name: "project-with-update",
- DirName: ptr("project-with-update"),
+ DirName: &dirName,
Path: projectPath,
Status: models.ProjectStatusStopped,
}).Error)
diff --git a/backend/internal/services/docker_client_service_test.go b/backend/internal/services/docker_client_service_test.go
index 7732634df..0e22a3811 100644
--- a/backend/internal/services/docker_client_service_test.go
+++ b/backend/internal/services/docker_client_service_test.go
@@ -5,6 +5,7 @@ import (
"net"
"net/http"
"net/http/httptest"
+ "regexp"
"sync/atomic"
"testing"
"time"
@@ -200,6 +201,10 @@ func newDockerClientServiceForTestInternal(host string) *DockerClientService {
return NewDockerClientService(context.Background(), nil, &config.Config{DockerHost: host}, nil)
}
+func dockerTestPathInternal(path string) string {
+ return regexp.MustCompile(`^/v[0-9]+\.[0-9]+`).ReplaceAllString(path, "")
+}
+
func newDockerPingTestServerInternal(t *testing.T, apiVersion string) *httptest.Server {
t.Helper()
diff --git a/backend/internal/services/git_repository_service_test.go b/backend/internal/services/git_repository_service_test.go
index 21de7ebe9..7bae7a244 100644
--- a/backend/internal/services/git_repository_service_test.go
+++ b/backend/internal/services/git_repository_service_test.go
@@ -60,10 +60,6 @@ func createGitRepositoryServiceTestRepoInternal(t *testing.T, svc *GitRepository
return repo
}
-func gitRepositoryStringPtrInternal(value string) *string {
- return &value
-}
-
func TestGitRepositoryService_UpdateRepository_RejectsURLChangeWhenStoredTokenWouldBeReused(t *testing.T) {
svc, _ := setupGitRepositoryServiceTestInternal(t)
repo := createGitRepositoryServiceTestRepoInternal(t, svc, models.CreateGitRepositoryRequest{
diff --git a/backend/internal/services/gitops_sync_service_test.go b/backend/internal/services/gitops_sync_service_test.go
index 5db8de6e2..7c656c151 100644
--- a/backend/internal/services/gitops_sync_service_test.go
+++ b/backend/internal/services/gitops_sync_service_test.go
@@ -77,6 +77,7 @@ func TestGitOpsSyncService_GetSyncByID_ReturnsNotFoundError(t *testing.T) {
func TestGitOpsSyncService_DeleteSync_DeletesStaleProjectReference(t *testing.T) {
ctx := context.Background()
svc, db, _ := setupGitOpsSyncDirectoryTestService(t)
+ missingProjectID := "missing-project"
sync := &models.GitOpsSync{
BaseModel: models.BaseModel{ID: "sync-delete-stale-project"},
@@ -85,7 +86,7 @@ func TestGitOpsSyncService_DeleteSync_DeletesStaleProjectReference(t *testing.T)
RepositoryID: "repo-1",
ComposePath: "apps/demo/docker-compose.yaml",
ProjectName: "demo-project",
- ProjectID: ptr("missing-project"),
+ ProjectID: &missingProjectID,
SyncInterval: 60,
}
require.NoError(t, db.Create(sync).Error)
@@ -345,10 +346,11 @@ func TestGitOpsSyncService_DirectorySync_OverwritesExistingDirectoryAtFilePath(t
require.NoError(t, os.MkdirAll(filepath.Join(projectPath, "letsencrypt"), 0o755))
require.NoError(t, os.MkdirAll(filepath.Join(projectPath, "logs"), 0o755))
+ dirName := "traefik-project"
project := &models.Project{
BaseModel: models.BaseModel{ID: "proj-directory-docker-dir-conflict"},
Name: "traefik-project",
- DirName: ptr("traefik-project"),
+ DirName: &dirName,
Path: projectPath,
Status: models.ProjectStatusStopped,
}
@@ -425,11 +427,11 @@ func TestGitOpsSyncService_CreateDirectorySyncProjectInternal_RollsBackProjectOn
callbackName := "test:fail_project_gitops_update"
require.NoError(t, db.Callback().Update().Before("gorm:update").Register(callbackName, func(tx *gorm.DB) {
if tx.Statement != nil && tx.Statement.Table == "projects" {
- tx.AddError(errors.New("forced project update failure"))
+ _ = tx.AddError(errors.New("forced project update failure"))
}
}))
defer func() {
- db.Callback().Update().Remove(callbackName)
+ _ = db.Callback().Update().Remove(callbackName)
}()
project, err := svc.createDirectorySyncProjectInternal(ctx, sync, stage, models.User{})
@@ -478,6 +480,7 @@ func TestGitOpsSyncService_GetDirectorySyncProjectInternal_RelinksManagedProject
require.NoError(t, os.MkdirAll(projectPath, 0o755))
require.NoError(t, os.WriteFile(filepath.Join(projectPath, "radarr.yaml"), []byte("services:\n app:\n image: lscr.io/linuxserver/radarr:latest\n"), 0o644))
+ missingProjectID := "missing-project"
sync := &models.GitOpsSync{
BaseModel: models.BaseModel{ID: "sync-directory-relink"},
Name: "radarr-sync",
@@ -485,15 +488,16 @@ func TestGitOpsSyncService_GetDirectorySyncProjectInternal_RelinksManagedProject
RepositoryID: "repo-1",
ComposePath: "apps/media/radarr.yaml",
ProjectName: "Radarr",
- ProjectID: ptr("missing-project"),
+ ProjectID: &missingProjectID,
SyncDirectory: true,
}
require.NoError(t, db.Create(sync).Error)
+ dirName := "Radarr-3"
project := &models.Project{
BaseModel: models.BaseModel{ID: "proj-directory-relink"},
Name: "Radarr",
- DirName: ptr("Radarr-3"),
+ DirName: &dirName,
Path: projectPath,
Status: models.ProjectStatusStopped,
GitOpsManagedBy: &sync.ID,
@@ -519,6 +523,7 @@ func TestGitOpsSyncService_GetDirectorySyncProjectInternal_RecoversUniqueDirecto
require.NoError(t, os.MkdirAll(projectPath, 0o755))
require.NoError(t, os.WriteFile(filepath.Join(projectPath, "radarr.yaml"), []byte("services:\n app:\n image: lscr.io/linuxserver/radarr:latest\n"), 0o644))
+ missingProjectID := "missing-project"
sync := &models.GitOpsSync{
BaseModel: models.BaseModel{ID: "sync-directory-disk-recovery"},
Name: "radarr-sync",
@@ -526,7 +531,7 @@ func TestGitOpsSyncService_GetDirectorySyncProjectInternal_RecoversUniqueDirecto
RepositoryID: "repo-1",
ComposePath: "apps/media/radarr.yaml",
ProjectName: "Radarr",
- ProjectID: ptr("missing-project"),
+ ProjectID: &missingProjectID,
SyncDirectory: true,
}
require.NoError(t, db.Create(sync).Error)
@@ -559,6 +564,7 @@ func TestGitOpsSyncService_ReconcileDirectorySyncProjectsOnStartup_SkipsAmbiguou
require.NoError(t, os.WriteFile(filepath.Join(projectPath, "radarr.yaml"), []byte("services:\n app:\n image: lscr.io/linuxserver/radarr:latest\n"), 0o644))
}
+ missingProjectID := "missing-project"
sync := &models.GitOpsSync{
BaseModel: models.BaseModel{ID: "sync-directory-ambiguous"},
Name: "radarr-sync",
@@ -566,7 +572,7 @@ func TestGitOpsSyncService_ReconcileDirectorySyncProjectsOnStartup_SkipsAmbiguou
RepositoryID: "repo-1",
ComposePath: "apps/media/radarr.yaml",
ProjectName: "Radarr",
- ProjectID: ptr("missing-project"),
+ ProjectID: &missingProjectID,
SyncDirectory: true,
}
require.NoError(t, db.Create(sync).Error)
@@ -589,6 +595,7 @@ func TestGitOpsSyncService_SyncProjectDirectory_FailsWhenBoundProjectMissing(t *
testScheduler := &gitOpsSyncTestSchedulerInternal{}
svc.SetScheduler(ctx, testScheduler)
+ missingProjectID := "missing-project"
sync := &models.GitOpsSync{
BaseModel: models.BaseModel{ID: "sync-directory-missing-bound-project"},
Name: "demo-sync",
@@ -596,7 +603,7 @@ func TestGitOpsSyncService_SyncProjectDirectory_FailsWhenBoundProjectMissing(t *
RepositoryID: "repo-1",
ComposePath: "apps/demo/docker-compose.yaml",
ProjectName: "demo-project",
- ProjectID: ptr("missing-project"),
+ ProjectID: &missingProjectID,
SyncDirectory: true,
AutoSync: true,
}
@@ -650,6 +657,7 @@ func TestGitOpsSyncService_SyncProjectDirectory_DisablesAutoSyncWhenBoundProject
require.NoError(t, os.WriteFile(filepath.Join(projectPath, "radarr.yaml"), []byte("services:\n app:\n image: lscr.io/linuxserver/radarr:latest\n"), 0o644))
}
+ missingProjectID := "missing-project"
sync := &models.GitOpsSync{
BaseModel: models.BaseModel{ID: "sync-directory-ambiguous-bound-project"},
Name: "radarr-sync",
@@ -657,7 +665,7 @@ func TestGitOpsSyncService_SyncProjectDirectory_DisablesAutoSyncWhenBoundProject
RepositoryID: "repo-1",
ComposePath: "apps/media/radarr.yaml",
ProjectName: "Radarr",
- ProjectID: ptr("missing-project"),
+ ProjectID: &missingProjectID,
SyncDirectory: true,
AutoSync: true,
}
@@ -699,6 +707,7 @@ func TestGitOpsSyncService_GetOrCreateProjectInternal_FailsWhenBoundProjectMissi
testScheduler := &gitOpsSyncTestSchedulerInternal{}
svc.SetScheduler(ctx, testScheduler)
+ missingProjectID := "missing-project"
sync := &models.GitOpsSync{
BaseModel: models.BaseModel{ID: "sync-file-missing-bound-project"},
Name: "demo-sync",
@@ -706,7 +715,7 @@ func TestGitOpsSyncService_GetOrCreateProjectInternal_FailsWhenBoundProjectMissi
RepositoryID: "repo-1",
ComposePath: "apps/demo/docker-compose.yaml",
ProjectName: "demo-project",
- ProjectID: ptr("missing-project"),
+ ProjectID: &missingProjectID,
AutoSync: true,
}
require.NoError(t, db.Create(sync).Error)
diff --git a/backend/internal/services/image_attestations_service.go b/backend/internal/services/image_attestations_service.go
index ba4732c79..6ef878325 100644
--- a/backend/internal/services/image_attestations_service.go
+++ b/backend/internal/services/image_attestations_service.go
@@ -566,7 +566,7 @@ func decompressAttestationStatementInternal(data []byte) ([]byte, error) {
if err != nil {
return nil, err
}
- defer reader.Close()
+ defer func() { _ = reader.Close() }()
return io.ReadAll(reader)
case len(data) >= 4 && data[0] == 0x28 && data[1] == 0xb5 && data[2] == 0x2f && data[3] == 0xfd:
reader, err := zstd.NewReader(nil)
diff --git a/backend/internal/services/image_service.go b/backend/internal/services/image_service.go
index 311042581..42656f654 100644
--- a/backend/internal/services/image_service.go
+++ b/backend/internal/services/image_service.go
@@ -255,6 +255,128 @@ func (s *ImageService) ReconcilePulledImageUpdate(ctx context.Context, imageName
return s.imageUpdateService.MarkImageRefUpToDateAfterPull(ctx, imageName)
}
+// TagImage adds a repository tag to an existing image.
+func (s *ImageService) TagImage(ctx context.Context, source string, req imagetypes.TagRequest, user models.User) error {
+ source = strings.TrimSpace(source)
+ repository := strings.TrimSpace(req.Repository)
+ tag := strings.TrimSpace(req.Tag)
+ if source == "" {
+ return errors.New("image name is required")
+ }
+ if repository == "" {
+ return errors.New("repository is required")
+ }
+
+ target := repository
+ if tag != "" {
+ target = repository + ":" + tag
+ }
+
+ dockerClient, err := s.dockerService.GetClient(ctx)
+ if err != nil {
+ s.eventService.LogErrorEvent(ctx, models.EventTypeImageError, "image", "", source, user.ID, user.Username, "0", err, models.JSON{"action": "tag", "target": target})
+ return fmt.Errorf("failed to connect to Docker: %w", err)
+ }
+
+ _, err = dockerClient.ImageTag(ctx, client.ImageTagOptions{Source: source, Target: target})
+ if err != nil {
+ s.eventService.LogErrorEvent(ctx, models.EventTypeImageError, "image", "", source, user.ID, user.Username, "0", err, models.JSON{"action": "tag", "target": target})
+ return fmt.Errorf("failed to tag image: %w", err)
+ }
+
+ metadata := models.JSON{
+ "action": "tag",
+ "imageName": source,
+ "repository": repository,
+ "tag": tag,
+ "target": target,
+ }
+ if logErr := s.eventService.LogImageEvent(ctx, models.EventTypeImageTag, "", source, user.ID, user.Username, "0", metadata); logErr != nil {
+ slog.Warn("could not log image tag action", "err", logErr, "image", source, "target", target)
+ }
+
+ return nil
+}
+
+// GetImageHistory returns layer history for an image.
+func (s *ImageService) GetImageHistory(ctx context.Context, imageName string) ([]imagetypes.HistoryItem, error) {
+ imageName = strings.TrimSpace(imageName)
+ if imageName == "" {
+ return nil, errors.New("image name is required")
+ }
+
+ dockerClient, err := s.dockerService.GetClient(ctx)
+ if err != nil {
+ return nil, fmt.Errorf("failed to connect to Docker: %w", err)
+ }
+
+ result, err := dockerClient.ImageHistory(ctx, imageName)
+ if err != nil {
+ return nil, fmt.Errorf("failed to get image history: %w", err)
+ }
+
+ items := make([]imagetypes.HistoryItem, 0, len(result.Items))
+ for _, item := range result.Items {
+ items = append(items, imagetypes.HistoryItem{
+ ID: item.ID,
+ Created: item.Created,
+ CreatedBy: item.CreatedBy,
+ Tags: item.Tags,
+ Size: item.Size,
+ Comment: item.Comment,
+ })
+ }
+ return items, nil
+}
+
+// SearchImages searches the configured Docker registry for images.
+func (s *ImageService) SearchImages(ctx context.Context, term string) ([]imagetypes.SearchResult, error) {
+ term = strings.TrimSpace(term)
+ if term == "" {
+ return nil, errors.New("search term is required")
+ }
+
+ dockerClient, err := s.dockerService.GetClient(ctx)
+ if err != nil {
+ return nil, fmt.Errorf("failed to connect to Docker: %w", err)
+ }
+
+ result, err := dockerClient.ImageSearch(ctx, term, client.ImageSearchOptions{})
+ if err != nil {
+ return nil, fmt.Errorf("failed to search images: %w", err)
+ }
+
+ items := make([]imagetypes.SearchResult, 0, len(result.Items))
+ for _, item := range result.Items {
+ items = append(items, imagetypes.SearchResult{
+ Name: item.Name,
+ Description: item.Description,
+ StarCount: item.StarCount,
+ Official: item.IsOfficial,
+ })
+ }
+ return items, nil
+}
+
+// ExportImage returns a tar stream for one Docker image.
+func (s *ImageService) ExportImage(ctx context.Context, imageName string) (io.ReadCloser, error) {
+ imageName = strings.TrimSpace(imageName)
+ if imageName == "" {
+ return nil, errors.New("image name is required")
+ }
+
+ dockerClient, err := s.dockerService.GetClient(ctx)
+ if err != nil {
+ return nil, fmt.Errorf("failed to connect to Docker: %w", err)
+ }
+
+ reader, err := dockerClient.ImageSave(ctx, []string{imageName})
+ if err != nil {
+ return nil, fmt.Errorf("failed to export image: %w", err)
+ }
+ return reader, nil
+}
+
func (s *ImageService) LoadImageFromReader(ctx context.Context, reader io.Reader, fileName string, user models.User, maxSizeBytes int64) (*imagetypes.LoadResult, error) {
// Wrap reader with size limit enforcement
limitedReader := io.LimitReader(reader, maxSizeBytes+1)
diff --git a/backend/internal/services/image_service_test.go b/backend/internal/services/image_service_test.go
index f8990663b..d53f95d45 100644
--- a/backend/internal/services/image_service_test.go
+++ b/backend/internal/services/image_service_test.go
@@ -2,10 +2,12 @@ package services
import (
"context"
+ "encoding/json"
"errors"
"io"
"net/http"
"net/http/httptest"
+ "net/url"
"strings"
"testing"
"time"
@@ -228,6 +230,106 @@ func TestImageServicePullImageRetriesAnonymouslyAfterAuthRejectedInternal(t *tes
assert.Empty(t, authHeaders[1])
}
+func TestImageServiceTagImageCallsDockerAPIInternal(t *testing.T) {
+ db := setupProjectTestDB(t)
+ var gotRepo, gotTag string
+ server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+ if r.Method != http.MethodPost || dockerTestPathInternal(r.URL.Path) != "/images/source:latest/tag" {
+ http.NotFound(w, r)
+ return
+ }
+ gotRepo = r.URL.Query().Get("repo")
+ gotTag = r.URL.Query().Get("tag")
+ w.WriteHeader(http.StatusCreated)
+ }))
+ t.Cleanup(server.Close)
+
+ imageSvc := NewImageService(db, &DockerClientService{client: newTestDockerClient(t, server)}, nil, nil, nil, NewEventService(db, nil, nil))
+
+ err := imageSvc.TagImage(context.Background(), "source:latest", imagetypes.TagRequest{Repository: "registry.example.com/team/app", Tag: "v2"}, systemUser)
+ require.NoError(t, err)
+ assert.Equal(t, "registry.example.com/team/app", gotRepo)
+ assert.Equal(t, "v2", gotTag)
+}
+
+func TestImageServiceGetImageHistoryCallsDockerAPIInternal(t *testing.T) {
+ db := setupProjectTestDB(t)
+ server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+ if r.Method != http.MethodGet || dockerTestPathInternal(r.URL.Path) != "/images/source:latest/history" {
+ http.NotFound(w, r)
+ return
+ }
+ _ = json.NewEncoder(w).Encode([]map[string]any{
+ {"Id": "layer-1", "Created": 1710000000, "CreatedBy": "/bin/sh", "Size": 123},
+ })
+ }))
+ t.Cleanup(server.Close)
+
+ imageSvc := NewImageService(db, &DockerClientService{client: newTestDockerClient(t, server)}, nil, nil, nil, NewEventService(db, nil, nil))
+
+ history, err := imageSvc.GetImageHistory(context.Background(), "source:latest")
+ require.NoError(t, err)
+ require.Len(t, history, 1)
+ assert.Equal(t, "layer-1", history[0].ID)
+ assert.Equal(t, int64(123), history[0].Size)
+}
+
+func TestImageServiceSearchImagesRequiresTermInternal(t *testing.T) {
+ imageSvc := NewImageService(nil, &DockerClientService{}, nil, nil, nil, nil)
+
+ _, err := imageSvc.SearchImages(context.Background(), " ")
+ require.Error(t, err)
+ assert.Contains(t, err.Error(), "search term is required")
+}
+
+func TestImageServiceExportImageReturnsTarStreamInternal(t *testing.T) {
+ db := setupProjectTestDB(t)
+ server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+ if r.Method != http.MethodGet || dockerTestPathInternal(r.URL.Path) != "/images/get" {
+ http.NotFound(w, r)
+ return
+ }
+ names := r.URL.Query()["names"]
+ require.Equal(t, []string{"source:latest"}, names)
+ _, _ = w.Write([]byte("tar-bytes"))
+ }))
+ t.Cleanup(server.Close)
+
+ imageSvc := NewImageService(db, &DockerClientService{client: newTestDockerClient(t, server)}, nil, nil, nil, NewEventService(db, nil, nil))
+
+ reader, err := imageSvc.ExportImage(context.Background(), "source:latest")
+ require.NoError(t, err)
+ t.Cleanup(func() { _ = reader.Close() })
+ body, err := io.ReadAll(reader)
+ require.NoError(t, err)
+ assert.Equal(t, "tar-bytes", string(body))
+}
+
+func TestImageServiceSearchImagesCallsDockerAPIInternal(t *testing.T) {
+ db := setupProjectTestDB(t)
+ var gotTerm string
+ server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+ if r.Method != http.MethodGet || dockerTestPathInternal(r.URL.Path) != "/images/search" {
+ http.NotFound(w, r)
+ return
+ }
+ gotTerm, _ = url.QueryUnescape(r.URL.Query().Get("term"))
+ _ = json.NewEncoder(w).Encode([]map[string]any{
+ {"name": "library/nginx", "description": "web server", "star_count": 1, "is_official": true},
+ })
+ }))
+ t.Cleanup(server.Close)
+
+ imageSvc := NewImageService(db, &DockerClientService{client: newTestDockerClient(t, server)}, nil, nil, nil, NewEventService(db, nil, nil))
+
+ results, err := imageSvc.SearchImages(context.Background(), "nginx")
+ require.NoError(t, err)
+ require.Len(t, results, 1)
+ assert.Equal(t, "nginx", gotTerm)
+ assert.Equal(t, "library/nginx", results[0].Name)
+ assert.True(t, results[0].Official)
+}
+
func TestShouldRetryAnonymousPullInternal_UnauthorizedWithAuth(t *testing.T) {
err := errors.New(`Error response from daemon: Head "registry-1.docker.io/v2/library/nginx/manifests/latest": unauthorized: incorrect username or password`)
diff --git a/backend/internal/services/project_service_test.go b/backend/internal/services/project_service_test.go
index 423bec424..2ea7dbc4a 100644
--- a/backend/internal/services/project_service_test.go
+++ b/backend/internal/services/project_service_test.go
@@ -104,10 +104,11 @@ func TestProjectService_DestroyProject_RemovesFilesWhenRequested(t *testing.T) {
require.NoError(t, os.MkdirAll(projectPath, 0o755))
require.NoError(t, os.WriteFile(filepath.Join(projectPath, "project-data.txt"), []byte("keep until destroy\n"), 0o644))
+ dirName := "demo-remove"
project := &models.Project{
BaseModel: models.BaseModel{ID: "project-destroy-remove-files"},
Name: "demo-remove",
- DirName: ptr("demo-remove"),
+ DirName: &dirName,
Path: projectPath,
Status: models.ProjectStatusStopped,
}
@@ -128,10 +129,11 @@ func TestProjectService_DestroyProject_PreservesFilesWhenRequested(t *testing.T)
projectDataPath := filepath.Join(projectPath, "project-data.txt")
require.NoError(t, os.WriteFile(projectDataPath, []byte("preserve on destroy\n"), 0o644))
+ dirName := "demo-preserve"
project := &models.Project{
BaseModel: models.BaseModel{ID: "project-destroy-preserve-files"},
Name: "demo-preserve",
- DirName: ptr("demo-preserve"),
+ DirName: &dirName,
Path: projectPath,
Status: models.ProjectStatusStopped,
}
@@ -659,10 +661,11 @@ func TestProjectService_PullProjectImages_UpdatesCurrentImageRecordAfterPull(t *
composeContent := fmt.Sprintf("services:\n app:\n image: %s\n builder:\n build: .\n", imageRef)
require.NoError(t, os.WriteFile(filepath.Join(projectPath, "compose.yaml"), []byte(composeContent), 0o644))
+ dirName := "compose-pull"
projectRecord := &models.Project{
BaseModel: models.BaseModel{ID: "project-pull"},
Name: "compose-pull",
- DirName: ptr("compose-pull"),
+ DirName: &dirName,
Path: projectPath,
Status: models.ProjectStatusStopped,
}
@@ -1409,7 +1412,7 @@ func TestProjectService_ApplyProjectUpdateWithRenameJournal_RollsBackVolumeMigra
require.NoError(t, db.Callback().Update().Before("gorm:update").Register("arcane_test_project_save_failure", func(tx *gorm.DB) {
if tx.Statement != nil && tx.Statement.Schema != nil && tx.Statement.Schema.Name == "Project" {
- tx.AddError(errors.New("forced project save failure"))
+ _ = tx.AddError(errors.New("forced project save failure"))
}
}))
@@ -5067,7 +5070,6 @@ func dockerHostFromProjectRuntimeServerURLInternal(t *testing.T, serverURL strin
return "tcp://" + parsed.Host
}
-//go:fix inline
func ptr(v string) *string {
return new(v)
}
diff --git a/backend/internal/services/swarm_service_test.go b/backend/internal/services/swarm_service_test.go
index 07e4219ee..ce4d174e0 100644
--- a/backend/internal/services/swarm_service_test.go
+++ b/backend/internal/services/swarm_service_test.go
@@ -105,7 +105,7 @@ func TestSwarmService_UpdateAndGetStackSource_UsesStoredFilesWithoutSwarmManager
require.Equal(t, updated.EnvContent, source.EnvContent)
// Test with additional files
- updated, err = svc.UpdateStackSource(ctx, "0", "demo-stack", swarmtypes.StackSourceUpdateRequest{
+ _, err = svc.UpdateStackSource(ctx, "0", "demo-stack", swarmtypes.StackSourceUpdateRequest{
ComposeContent: "services:\n web:\n image: nginx:alpine\n",
Files: []swarmtypes.SyncFile{
{RelativePath: "config/nginx.conf", Content: []byte("worker_processes 1;")},
diff --git a/backend/pkg/authz/catalog.go b/backend/pkg/authz/catalog.go
index 311bf9649..59e54596f 100644
--- a/backend/pkg/authz/catalog.go
+++ b/backend/pkg/authz/catalog.go
@@ -129,6 +129,8 @@ var permissionCatalog = []PermissionCatalogResource{
{"pull", PermImagesPull, "Pull", ""},
{"push", PermImagesPush, "Push", ""},
{"build", PermImagesBuild, "Build", ""},
+ {"tag", PermImagesTag, "Tag", ""},
+ {"commit", PermImagesCommit, "Commit container", ""},
{"prune", PermImagesPrune, "Prune", ""},
{"delete", PermImagesDelete, "Delete", ""},
{"upload", PermImagesUpload, "Upload", ""},
diff --git a/backend/pkg/authz/permissions.go b/backend/pkg/authz/permissions.go
index 0dfa2d7c0..47779b691 100644
--- a/backend/pkg/authz/permissions.go
+++ b/backend/pkg/authz/permissions.go
@@ -119,6 +119,8 @@ const (
PermImagesPull = "images:pull"
PermImagesPush = "images:push"
PermImagesBuild = "images:build"
+ PermImagesTag = "images:tag"
+ PermImagesCommit = "images:commit"
PermImagesPrune = "images:prune"
PermImagesDelete = "images:delete"
PermImagesUpload = "images:upload"
@@ -282,7 +284,7 @@ func BuiltInEditorPermissions() []string {
// Full env-scoped Docker management
PermContainersList, PermContainersRead, PermContainersLogs, PermContainersCreate, PermContainersStart, PermContainersStop, PermContainersRestart, PermContainersRedeploy, PermContainersKill, PermContainersPause, PermContainersDelete, PermContainersExec, PermContainersAutoUpdate,
PermProjectsList, PermProjectsRead, PermProjectsLogs, PermProjectsCreate, PermProjectsUpdate, PermProjectsDeploy, PermProjectsDown, PermProjectsRestart, PermProjectsDelete, PermProjectsArchive,
- PermImagesList, PermImagesRead, PermImagesPull, PermImagesPush, PermImagesBuild, PermImagesPrune, PermImagesDelete, PermImagesUpload,
+ PermImagesList, PermImagesRead, PermImagesPull, PermImagesPush, PermImagesBuild, PermImagesTag, PermImagesCommit, PermImagesPrune, PermImagesDelete, PermImagesUpload,
PermVolumesList, PermVolumesRead, PermVolumesCreate, PermVolumesDelete, PermVolumesPrune, PermVolumesBrowse, PermVolumesUpload, PermVolumesBackup,
PermNetworksList, PermNetworksRead, PermNetworksCreate, PermNetworksDelete, PermNetworksPrune,
PermSwarmRead, PermSwarmSpec, PermSwarmNodes, PermSwarmServices, PermSwarmServicesLogs, PermSwarmStacks, PermSwarmConfigs, PermSwarmSecrets,
@@ -308,7 +310,7 @@ func BuiltInDeployerPermissions() []string {
PermEventsRead,
PermContainersList, PermContainersRead, PermContainersLogs, PermContainersStart, PermContainersStop, PermContainersRestart, PermContainersRedeploy, PermContainersKill, PermContainersPause,
PermProjectsList, PermProjectsRead, PermProjectsLogs, PermProjectsDeploy, PermProjectsDown, PermProjectsRestart,
- PermImagesList, PermImagesRead, PermImagesPull,
+ PermImagesList, PermImagesRead, PermImagesPull, PermImagesTag, PermImagesCommit,
PermVolumesList, PermVolumesRead, PermVolumesBrowse,
PermNetworksList, PermNetworksRead,
PermSwarmRead, PermSwarmServicesLogs,
diff --git a/frontend/messages/en.json b/frontend/messages/en.json
index 2b30a97bf..56d909099 100644
--- a/frontend/messages/en.json
+++ b/frontend/messages/en.json
@@ -108,6 +108,7 @@
"common_user": "User",
"common_description": "Description",
"common_no_description": "No description provided",
+ "common_verified": "Verified",
"common_no_default_value": "No default value",
"common_view_details": "View Details",
"common_yes": "Yes",
@@ -507,6 +508,15 @@
"containers_kill_confirm": "Kill container",
"containers_kill_failed": "Failed to kill container \"{name}\"",
"containers_kill_success": "Signal sent to container \"{name}\"",
+ "containers_commit_action": "Commit",
+ "containers_commit_title": "Commit \"{name}\"",
+ "containers_commit_description": "Create a new image from this container's current filesystem.",
+ "containers_commit_registry_note": "This creates a local Docker image only. It does not push the image to a registry.",
+ "containers_commit_comment_placeholder": "Snapshot before upgrade",
+ "containers_commit_author_placeholder": "Arcane",
+ "containers_commit_no_pause": "Do not pause the container during commit",
+ "containers_commit_failed": "Failed to commit container \"{name}\"",
+ "containers_commit_success": "Created image {imageId}",
"containers_check_updates": "Update Containers",
"containers_check_updates_failed": "Failed to Check Containers for Updates",
"containers_check_updates_success": "Containers Updated Successfully.",
@@ -745,6 +755,32 @@
"images_updates": "Updates",
"images_os": "OS",
"images_tag": "Tag",
+ "images_tag_image": "Tag Image",
+ "images_tag_dialog_description": "Add a repository tag to this image.",
+ "images_tag_repository": "Repository",
+ "images_tag_repository_placeholder": "registry.example.com/team/app",
+ "images_tag_repository_required": "Repository is required",
+ "images_tag_failed": "Failed to tag image",
+ "images_tag_success": "Image tagged successfully",
+ "images_export": "Export",
+ "images_details_title": "Image Details",
+ "images_history_title": "History",
+ "images_history_description": "Layer history for this image.",
+ "images_history_loading": "Loading image history…",
+ "images_history_load_failed": "Failed to load image history",
+ "images_history_empty": "No history entries found.",
+ "images_history_missing_layer": "missing",
+ "images_search_registry": "Search Registry",
+ "images_search_registry_description": "Search registry images and pull a selected result into this environment.",
+ "images_search_query": "Search Query",
+ "images_search_query_placeholder": "nginx, redis, postgres",
+ "images_search_failed": "Failed to search registry",
+ "images_search_empty": "No registry results found.",
+ "images_search_stars": "{count} stars",
+ "images_search_pull_result": "Pull",
+ "images_search_pulling": "Pulling",
+ "images_pull_stream_missing": "Image pull response did not include a stream.",
+ "images_pull_stream_failed": "Image pull failed.",
"images_none_label": "<none>",
"images_tag_latest": "latest",
"images_has_updates": "Has Updates",
diff --git a/frontend/src/lib/components/arcane-button/variants.ts b/frontend/src/lib/components/arcane-button/variants.ts
index f9ad61cc7..fffb88727 100644
--- a/frontend/src/lib/components/arcane-button/variants.ts
+++ b/frontend/src/lib/components/arcane-button/variants.ts
@@ -25,7 +25,10 @@ import {
HammerIcon,
PauseIcon,
PlayIcon,
- ZapIcon
+ ZapIcon,
+ TagIcon,
+ ScanIcon,
+ ImagesIcon
} from '$lib/icons';
export const arcaneButtonVariants = tv({
@@ -62,6 +65,18 @@ export const arcaneButtonVariants = tv({
'bg-amber-500/5 text-foreground! border-amber-500/20 hover:bg-amber-500/10 hover:border-amber-500/40 ' +
'dark:bg-amber-500/10 dark:text-amber-300 dark:border-amber-500/30 dark:hover:bg-amber-500/20 ' +
'shadow-sm hover:shadow-md',
+ 'outline-tag':
+ 'bg-teal-500/5 text-foreground! border-teal-500/20 hover:bg-teal-500/10 hover:border-teal-500/40 ' +
+ 'dark:bg-teal-500/10 dark:text-teal-300 dark:border-teal-500/30 dark:hover:bg-teal-500/20 ' +
+ 'shadow-sm hover:shadow-md',
+ 'outline-scan':
+ 'bg-indigo-500/5 text-foreground! border-indigo-500/20 hover:bg-indigo-500/10 hover:border-indigo-500/40 ' +
+ 'dark:bg-indigo-500/10 dark:text-indigo-300 dark:border-indigo-500/30 dark:hover:bg-indigo-500/20 ' +
+ 'shadow-sm hover:shadow-md',
+ 'outline-commit':
+ 'bg-cyan-500/5 text-foreground! border-cyan-500/20 hover:bg-cyan-500/10 hover:border-cyan-500/40 ' +
+ 'dark:bg-cyan-500/10 dark:text-cyan-300 dark:border-cyan-500/30 dark:hover:bg-cyan-500/20 ' +
+ 'shadow-sm hover:shadow-md',
'outline-build':
'bg-violet-500/5 text-foreground! border-violet-500/20 hover:bg-violet-500/10 hover:border-violet-500/40 ' +
'dark:bg-violet-500/10 dark:text-violet-300 dark:border-violet-500/30 dark:hover:bg-violet-500/20 ' +
@@ -185,6 +200,24 @@ export const actionConfigs = {
tone: 'outline-primary',
loadingLabel: m.common_action_pulling()
},
+ tag: {
+ defaultLabel: m.images_tag_image(),
+ IconComponent: TagIcon,
+ tone: 'outline-tag',
+ loadingLabel: m.common_processing()
+ },
+ scan: {
+ defaultLabel: m.vuln_scan(),
+ IconComponent: ScanIcon,
+ tone: 'outline-scan',
+ loadingLabel: m.common_processing()
+ },
+ commit: {
+ defaultLabel: m.containers_commit_action(),
+ IconComponent: ImagesIcon,
+ tone: 'outline-commit',
+ loadingLabel: m.common_processing()
+ },
redeploy: {
defaultLabel: m.common_redeploy(),
IconComponent: RedeployIcon,
diff --git a/frontend/src/lib/components/dialogs/image-registry-search-dialog.svelte b/frontend/src/lib/components/dialogs/image-registry-search-dialog.svelte
new file mode 100644
index 000000000..80471da93
--- /dev/null
+++ b/frontend/src/lib/components/dialogs/image-registry-search-dialog.svelte
@@ -0,0 +1,187 @@
+<script lang="ts">
+ import * as ResponsiveDialog from '$lib/components/ui/responsive-dialog/index.js';
+ import * as InputGroup from '$lib/components/ui/input-group/index.js';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
+ import { Label } from '$lib/components/ui/label/index.js';
+ import { imageService } from '$lib/services/image-service';
+ import { m } from '$lib/paraglide/messages';
+ import type { ImageSearchResultDto } from '$lib/types/docker';
+ import { SearchIcon, DownloadIcon, VerifiedCheckIcon } from '$lib/icons';
+ import { toast } from 'svelte-sonner';
+
+ type Props = {
+ open: boolean;
+ onOpenChange?: (open: boolean) => void;
+ onPullFinished?: (success: boolean, imageName?: string, error?: string) => Promise<void> | void;
+ };
+
+ let { open = $bindable(false), onOpenChange, onPullFinished = () => {} }: Props = $props();
+
+ let query = $state('');
+ let tag = $state('latest');
+ let results = $state<ImageSearchResultDto[]>([]);
+ let hasSearched = $state(false);
+ let isSearching = $state(false);
+ let pullingImageName = $state<string | null>(null);
+
+ const normalizedTag = $derived(tag.trim() || 'latest');
+ const canSearch = $derived(query.trim().length > 0 && !isSearching);
+
+ function resetDialog() {
+ query = '';
+ tag = 'latest';
+ results = [];
+ hasSearched = false;
+ }
+
+ function handleOpenChange(nextOpen: boolean) {
+ if (!nextOpen && pullingImageName) return;
+ open = nextOpen;
+ onOpenChange?.(nextOpen);
+ if (!nextOpen) {
+ resetDialog();
+ }
+ }
+
+ async function handleSearch() {
+ const term = query.trim();
+ if (!term) {
+ toast.error(m.images_image_required());
+ return;
+ }
+ isSearching = true;
+ hasSearched = true;
+ try {
+ results = await imageService.searchImages(term);
+ } catch (error) {
+ console.error('Failed to search images:', error);
+ toast.error(m.images_search_failed());
+ } finally {
+ isSearching = false;
+ }
+ }
+
+ function buildPullRef(name: string) {
+ const trimmedName = name.trim();
+ if (!trimmedName) return '';
+ if (trimmedName.includes(':')) return trimmedName;
+ return `${trimmedName}:${normalizedTag}`;
+ }
+
+ async function pullImage(name: string) {
+ const imageRef = buildPullRef(name);
+ if (!imageRef || pullingImageName) return;
+
+ pullingImageName = imageRef;
+ open = false;
+ onOpenChange?.(false);
+ resetDialog();
+
+ const result = await imageService.pullImageStream(imageRef);
+ pullingImageName = null;
+ if (!result.success) {
+ const message = result.error || m.images_pull_failed();
+ toast.error(message);
+ await onPullFinished(false, imageRef, message);
+ return;
+ }
+
+ toast.success(m.images_pull_success({ repoTag: imageRef }));
+ await onPullFinished(true, imageRef);
+ }
+</script>
+
+<ResponsiveDialog.Root
+ {open}
+ onOpenChange={handleOpenChange}
+ title={m.images_search_registry()}
+ description={m.images_search_registry_description()}
+ contentClass="sm:max-w-[720px]"
+>
+ {#snippet children()}
+ <div class="grid gap-4 py-4">
+ <div class="grid gap-3 sm:grid-cols-[1fr_9rem_auto]">
+ <div class="space-y-2">
+ <Label for="image-registry-search-query">{m.images_search_query()}</Label>
+ <InputGroup.Root>
+ <InputGroup.Addon>
+ <SearchIcon class="size-4" />
+ </InputGroup.Addon>
+ <InputGroup.Input
+ id="image-registry-search-query"
+ placeholder={m.images_search_query_placeholder()}
+ bind:value={query}
+ disabled={isSearching || !!pullingImageName}
+ onkeydown={(event) => {
+ if (event.key === 'Enter') {
+ event.preventDefault();
+ void handleSearch();
+ }
+ }}
+ />
+ </InputGroup.Root>
+ </div>
+
+ <div class="space-y-2">
+ <Label for="image-registry-search-tag">{m.images_tag()}</Label>
+ <InputGroup.Root>
+ <InputGroup.Input
+ id="image-registry-search-tag"
+ placeholder={m.images_tag_latest()}
+ bind:value={tag}
+ disabled={isSearching || !!pullingImageName}
+ />
+ </InputGroup.Root>
+ </div>
+
+ <div class="flex items-end">
+ <ArcaneButton
+ action="inspect"
+ type="button"
+ customLabel={m.images_search_registry()}
+ loading={isSearching}
+ disabled={!canSearch}
+ onclick={handleSearch}
+ />
+ </div>
+ </div>
+
+ {#if results.length > 0}
+ <div class="border-border max-h-[420px] overflow-auto rounded-lg border">
+ {#each results as result (result.name)}
+ <div class="grid gap-3 border-b p-3 last:border-b-0 sm:grid-cols-[1fr_auto] sm:items-center">
+ <div class="min-w-0 space-y-1">
+ <div class="flex flex-wrap items-center gap-2">
+ <span class="font-mono text-sm font-medium break-all">{result.name}</span>
+ {#if result.official}
+ <span class="text-emerald-400" title={m.common_verified()} aria-label={m.common_verified()}>
+ <VerifiedCheckIcon class="size-3.5" aria-hidden="true" />
+ </span>
+ {/if}
+ </div>
+ <p class="text-muted-foreground line-clamp-2 text-sm">
+ {result.description || m.common_no_description()}
+ </p>
+ <p class="text-muted-foreground text-xs">{m.images_search_stars({ count: result.starCount })}</p>
+ </div>
+ <ArcaneButton
+ action="pull"
+ type="button"
+ size="sm"
+ icon={DownloadIcon}
+ customLabel={m.images_search_pull_result()}
+ loading={pullingImageName === buildPullRef(result.name)}
+ disabled={!!pullingImageName}
+ onclick={() => pullImage(result.name)}
+ />
+ </div>
+ {/each}
+ </div>
+ {:else if hasSearched && !isSearching}
+ <div class="border-border bg-muted/30 text-muted-foreground rounded-lg border px-4 py-8 text-center text-sm">
+ {m.images_search_empty()}
+ </div>
+ {/if}
+ </div>
+ {/snippet}
+</ResponsiveDialog.Root>
diff --git a/frontend/src/lib/components/sheets/image-pull-sheet.svelte b/frontend/src/lib/components/sheets/image-pull-sheet.svelte
index 31cfb092e..7d7f7dd93 100644
--- a/frontend/src/lib/components/sheets/image-pull-sheet.svelte
+++ b/frontend/src/lib/components/sheets/image-pull-sheet.svelte
@@ -5,9 +5,8 @@
import { z } from 'zod/v4';
import { createForm, preventDefault } from '$lib/utils/settings';
import { toast } from 'svelte-sonner';
- import { environmentStore } from '$lib/stores/environment.store.svelte';
import { m } from '$lib/paraglide/messages';
- import { readNdjsonStream } from '$lib/utils/streaming';
+ import { imageService } from '$lib/services/image-service';
type ImagePullFormProps = {
open: boolean;
@@ -49,60 +48,20 @@
}
const fullImageName = `${imageName}:${imageTag}`;
- const envId = await environmentStore.getCurrentEnvironmentId();
-
- try {
- const response = await fetch(`/api/environments/${envId}/images/pull`, {
- method: 'POST',
- headers: { 'Content-Type': 'application/json' },
- body: JSON.stringify({ imageName: fullImageName })
- });
-
- if (!response.ok || !response.body) {
- const errorData = await response.json().catch(() => ({
- data: { message: m.images_pull_server_error() }
- }));
- const errorMessage =
- errorData.data?.message ||
- errorData.error ||
- errorData.message ||
- `${m.images_pull_server_error()}: HTTP ${response.status}`;
- throw new Error(errorMessage);
- }
-
- open = false;
- isPulling = false;
+ open = false;
+ isPulling = false;
+ void drainPullStream(fullImageName);
+ }
- drainPullStream(response.body, fullImageName);
- } catch (error: any) {
- const message = error.message || m.images_pull_unexpected_error();
+ async function drainPullStream(fullImageName: string) {
+ const result = await imageService.pullImageStream(fullImageName);
+ if (!result.success) {
+ const message = result.error || m.images_pull_unexpected_error();
toast.error(message);
onPullFinished(false, fullImageName, message);
- isPulling = false;
+ return;
}
- }
-
- function drainPullStream(body: ReadableStream<Uint8Array>, fullImageName: string) {
- (async () => {
- let streamFailed = false;
- try {
- await readNdjsonStream(body, (parsed) => {
- if (parsed?.error) {
- const errMsg = typeof parsed.error === 'string' ? parsed.error : parsed.error.message || m.images_pull_stream_error();
- streamFailed = true;
- toast.error(errMsg);
- onPullFinished(false, fullImageName, errMsg);
- throw new Error(errMsg);
- }
- });
- onPullFinished(true, fullImageName);
- } catch (error: any) {
- if (streamFailed) return;
- const message = error.message || m.images_pull_unexpected_error();
- toast.error(message);
- onPullFinished(false, fullImageName, message);
- }
- })();
+ onPullFinished(true, fullImageName);
}
function handleOpenChange(newOpenState: boolean) {
diff --git a/frontend/src/lib/icons/index.ts b/frontend/src/lib/icons/index.ts
index 8e43c0b42..56e7074cc 100644
--- a/frontend/src/lib/icons/index.ts
+++ b/frontend/src/lib/icons/index.ts
@@ -8,7 +8,7 @@ export { default as ProjectsIcon } from 'virtual:icons/solar/folder-with-files-b
export { default as EnvironmentsIcon } from 'virtual:icons/solar/server-minimalistic-linear';
export { default as CustomizeIcon } from 'virtual:icons/material-symbols/inbox-customize-outline-rounded';
export { default as ContainersIcon } from 'virtual:icons/carbon/web-services-container';
-export { default as ImagesIcon } from 'virtual:icons/solar/gallery-linear';
+export { default as ImagesIcon } from 'virtual:icons/gravity-ui/layers-3-diagonal';
export { default as NetworksIcon } from 'virtual:icons/fluent/virtual-network-16-filled';
export { default as VolumesIcon } from 'virtual:icons/fluent/hard-drive-20-filled';
export { default as EventsIcon } from 'virtual:icons/material-symbols/event-list';
@@ -38,7 +38,6 @@ export { default as EyeOnIcon } from 'virtual:icons/fluent/eye-20-filled';
export { default as FolderXIcon } from 'virtual:icons/solar/folder-error-linear';
export { default as ResetIcon } from 'virtual:icons/fluent/arrow-reset-32-filled';
export { default as CheckIcon } from 'virtual:icons/material-symbols/fitbit-check-small';
-/** @lintignore Knip misses this Svelte component import. */
export { default as FilterIcon } from 'virtual:icons/fluent/filter-32-filled';
export { default as LoadingSpinnerIcon } from 'virtual:icons/svg-spinners/ring-resize';
export { default as AddIcon } from 'virtual:icons/ic/outline-add-circle';
@@ -82,7 +81,7 @@ export { default as DockIcon } from 'virtual:icons/lucide/dock';
export { default as EditIcon } from 'virtual:icons/solar/pen-linear';
export { default as SearchIcon } from 'virtual:icons/solar/minimalistic-magnifer-linear';
export { default as InspectIcon } from 'virtual:icons/solar/card-search-linear';
-export { default as UpdateIcon } from 'virtual:icons/solar/upload-square-linear';
+export { default as UpdateIcon } from 'virtual:icons/mage/box-3d-upload';
export { default as RestartIcon } from 'virtual:icons/solar/restart-linear';
export { default as FileTextIcon } from 'virtual:icons/solar/file-text-linear';
export { default as CreateFileIcon } from 'virtual:icons/lucide/file-plus';
@@ -105,7 +104,6 @@ export { default as LocalFolderComputerIcon } from 'virtual:icons/streamline/loc
export { default as SendEmailIcon } from 'virtual:icons/solar/plain-2-linear';
export { default as VolumeUnusedIcon } from 'virtual:icons/clarity/hard-disk-solid-alerted';
export { default as OpenIdIcon } from 'virtual:icons/simple-icons/openid';
-/** @lintignore Knip misses this Svelte component import. */
export { default as LoginIcon } from 'virtual:icons/solar/login-3-linear';
export { default as GitBranchIcon } from 'virtual:icons/tabler/git-branch';
export { default as JobsIcon } from 'virtual:icons/solar/alarm-linear';
diff --git a/frontend/src/lib/services/container-service.ts b/frontend/src/lib/services/container-service.ts
index aa483dcb6..aa306220b 100644
--- a/frontend/src/lib/services/container-service.ts
+++ b/frontend/src/lib/services/container-service.ts
@@ -5,7 +5,9 @@ import type {
ContainerSummaryDto,
ContainerSummaryGroupDto,
ContainerCreateRequest,
- ContainerDetailsDto
+ ContainerDetailsDto,
+ ContainerCommitRequest,
+ ContainerCommitResult
} from '$lib/types/docker';
import type { SearchPaginationSortRequest, Paginated } from '$lib/types/shared';
import { transformPaginationParams } from '$lib/utils/tables';
@@ -100,6 +102,11 @@ class ContainerService extends BaseAPIService {
return this.handleResponse(this.api.post(`/environments/${envId}/containers/${containerId}/unpause`));
}
+ async commitContainer(containerId: string, request: ContainerCommitRequest): Promise<ContainerCommitResult> {
+ const envId = await environmentStore.getCurrentEnvironmentId();
+ return this.handleResponse(this.api.post(`/environments/${envId}/containers/${containerId}/commit`, request));
+ }
+
async deleteContainer(containerId: string, opts?: { force?: boolean; volumes?: boolean }): Promise<any> {
const envId = await environmentStore.getCurrentEnvironmentId();
const params: Record<string, string> = {};
diff --git a/frontend/src/lib/services/image-service.ts b/frontend/src/lib/services/image-service.ts
index 7be1bacb3..eef830b30 100644
--- a/frontend/src/lib/services/image-service.ts
+++ b/frontend/src/lib/services/image-service.ts
@@ -6,12 +6,23 @@ import type {
ImageUpdateInfoDto,
ImageBuildRecord,
ImageAttestationListDto,
- ImageAttestationRequestOptions
+ ImageAttestationRequestOptions,
+ ImageHistoryItemDto,
+ ImageSearchResultDto,
+ ImageTagRequest
} from '$lib/types/docker';
import type { SearchPaginationSortRequest, Paginated } from '$lib/types/shared';
import type { AutoUpdateCheck, AutoUpdateResult } from '$lib/types/automation';
import type { PruneImagesOptions } from '$lib/types/automation';
import { transformPaginationParams } from '$lib/utils/tables';
+import { readNdjsonStream } from '$lib/utils/streaming';
+import { m } from '$lib/paraglide/messages';
+
+export type ImagePullResult = {
+ success: boolean;
+ imageName: string;
+ error?: string;
+};
class ImageService extends BaseAPIService {
private async resolveEnvironmentId(environmentId?: string): Promise<string> {
@@ -68,6 +79,64 @@ class ImageService extends BaseAPIService {
);
}
+ async tagImage(imageId: string, request: ImageTagRequest): Promise<any> {
+ const envId = await environmentStore.getCurrentEnvironmentId();
+ return this.handleResponse(this.api.post(`/environments/${envId}/images/${encodeURIComponent(imageId)}/tag`, request));
+ }
+
+ async getImageHistory(imageId: string): Promise<ImageHistoryItemDto[]> {
+ const envId = await environmentStore.getCurrentEnvironmentId();
+ return this.handleResponse(this.api.get(`/environments/${envId}/images/${encodeURIComponent(imageId)}/history`));
+ }
+
+ async searchImages(term: string): Promise<ImageSearchResultDto[]> {
+ const envId = await environmentStore.getCurrentEnvironmentId();
+ return this.handleResponse(this.api.get(`/environments/${envId}/images/search`, { params: { term } }));
+ }
+
+ async getImageExportUrl(imageId: string): Promise<string> {
+ const envId = await environmentStore.getCurrentEnvironmentId();
+ return `/api/environments/${envId}/images/${encodeURIComponent(imageId)}/export`;
+ }
+
+ async pullImageStream(imageName: string, onLine?: (data: any) => void): Promise<ImagePullResult> {
+ const envId = await environmentStore.getCurrentEnvironmentId();
+ try {
+ const response = await fetch(`/api/environments/${envId}/images/pull`, {
+ method: 'POST',
+ headers: { 'Content-Type': 'application/json' },
+ body: JSON.stringify({ imageName })
+ });
+
+ if (!response.ok || !response.body) {
+ const errorData = await response.json().catch(() => ({
+ data: { message: m.images_pull_server_error() }
+ }));
+ const errorMessage =
+ errorData.data?.message ||
+ errorData.error ||
+ errorData.message ||
+ `${m.images_pull_server_error()}: HTTP ${response.status}`;
+ throw new Error(errorMessage);
+ }
+
+ await readNdjsonStream(response.body, (parsed) => {
+ onLine?.(parsed);
+ if (parsed?.error) {
+ const message = typeof parsed.error === 'string' ? parsed.error : parsed.error.message || m.images_pull_stream_failed();
+ throw new Error(message);
+ }
+ });
+ return { success: true, imageName };
+ } catch (error) {
+ return {
+ success: false,
+ imageName,
+ error: error instanceof Error ? error.message : m.images_pull_stream_failed()
+ };
+ }
+ }
+
async pullImage(imageName: string, tag: string = 'latest', auth?: any): Promise<any> {
const envId = await environmentStore.getCurrentEnvironmentId();
return this.handleResponse(this.api.post(`/environments/${envId}/images/pull`, { imageName, tag, auth }));
diff --git a/frontend/src/lib/types/docker.ts b/frontend/src/lib/types/docker.ts
index f2b07e721..553729e5c 100644
--- a/frontend/src/lib/types/docker.ts
+++ b/frontend/src/lib/types/docker.ts
@@ -202,6 +202,19 @@ export interface ContainerDetailsDto {
redeployDisabled?: boolean;
}
+export interface ContainerCommitRequest {
+ repository?: string;
+ tag?: string;
+ comment?: string;
+ author?: string;
+ changes?: string[];
+ noPause?: boolean;
+}
+
+export interface ContainerCommitResult {
+ id: string;
+}
+
// --- Container stats ---
export interface BlkioStatEntry {
@@ -415,6 +428,28 @@ export interface ImageDetailSummaryDto {
};
}
+export interface ImageTagRequest {
+ repository: string;
+ tag?: string;
+}
+
+export interface ImageHistoryItemDto {
+ id: string;
+ created: number;
+ createdBy: string;
+ tags: string[];
+ size: number;
+ comment: string;
+}
+
+export interface ImageSearchResultDto {
+ name: string;
+ description: string;
+ starCount: number;
+ official: boolean;
+ automated: boolean;
+}
+
export interface ImageAttestationSubjectDto {
name: string;
digest: Record<string, string>;
diff --git a/frontend/src/routes/(app)/containers/[containerId]/+page.svelte b/frontend/src/routes/(app)/containers/[containerId]/+page.svelte
index 8215b8886..43e75cb7c 100644
--- a/frontend/src/routes/(app)/containers/[containerId]/+page.svelte
+++ b/frontend/src/routes/(app)/containers/[containerId]/+page.svelte
@@ -22,6 +22,7 @@
import ContainerInspect from '../components/ContainerInspect.svelte';
import ContainerDetailStatsSync from '../components/container-detail-stats-sync.svelte';
import ContainerHealthcheck from '../components/ContainerHealthcheck.svelte';
+ import ContainerCommitDialog from '../components/container-commit-dialog.svelte';
import IconImage from '$lib/components/icon-image.svelte';
import { calculateMemoryUsage, getThemedIconUrl } from '$lib/utils/docker';
import { mode } from 'mode-watcher';
@@ -45,7 +46,7 @@
import { environmentStore } from '$lib/stores/environment.store.svelte';
import { hasPermission } from '$lib/utils/auth';
import * as DropdownMenu from '$lib/components/ui/dropdown-menu/index.js';
- import { PauseIcon, PlayIcon, ZapIcon } from '$lib/icons';
+ import { ImagesIcon, PauseIcon, PlayIcon, ZapIcon } from '$lib/icons';
import { runContainerLifecycleAction } from '$lib/utils/container-actions';
import KillContainerDialog from '../components/kill-container-dialog.svelte';
let { data } = $props();
@@ -146,11 +147,13 @@
const canExecShell = $derived(hasPermission('containers:exec', currentEnvId));
const canPauseContainer = $derived(hasPermission('containers:pause', currentEnvId));
const canKillContainer = $derived(hasPermission('containers:kill', currentEnvId));
+ const canCommitImage = $derived(hasPermission('images:commit', currentEnvId));
const containerStatus = $derived(container?.state?.status ?? '');
const isContainerRunning = $derived(containerStatus === 'running' || !!container?.state?.running);
const isContainerPaused = $derived(containerStatus === 'paused');
let killDialogOpen = $state(false);
+ let commitDialogOpen = $state(false);
let lifecycleStatus = $state<'pausing' | 'unpausing' | ''>('');
const isLifecycleActionPending = $derived(lifecycleStatus !== '');
@@ -355,6 +358,15 @@
onclick={handlePauseContainer}
/>
{/if}
+ {#if canCommitImage}
+ <ArcaneButton
+ action="commit"
+ {size}
+ {showLabel}
+ disabled={actionButtonsLifecyclePending}
+ onclick={() => (commitDialogOpen = true)}
+ />
+ {/if}
{#if canKillContainer && (isContainerRunning || isContainerPaused)}
<ArcaneButton
action="kill"
@@ -384,6 +396,12 @@
{m.common_pause()}
</DropdownMenu.Item>
{/if}
+ {#if canCommitImage}
+ <DropdownMenu.Item disabled={actionButtonsLifecyclePending} onclick={() => (commitDialogOpen = true)}>
+ <ImagesIcon class="size-4" />
+ {m.containers_commit_action()}
+ </DropdownMenu.Item>
+ {/if}
{#if canKillContainer && (isContainerRunning || isContainerPaused)}
<DropdownMenu.Item
disabled={isLifecycleActionPending || actionButtonsLifecyclePending}
@@ -503,6 +521,14 @@
onComplete={() => invalidateAll()}
/>
{/if}
+ {#if commitDialogOpen && canCommitImage}
+ <ContainerCommitDialog
+ bind:open={commitDialogOpen}
+ containerId={container.id}
+ containerName={containerDisplayName}
+ onCommitted={() => invalidateAll()}
+ />
+ {/if}
{:else}
<div class="flex min-h-screen items-center justify-center">
<div class="text-center">
diff --git a/frontend/src/routes/(app)/containers/components/container-commit-dialog.svelte b/frontend/src/routes/(app)/containers/components/container-commit-dialog.svelte
new file mode 100644
index 000000000..a9d353d71
--- /dev/null
+++ b/frontend/src/routes/(app)/containers/components/container-commit-dialog.svelte
@@ -0,0 +1,125 @@
+<script lang="ts">
+ import * as ResponsiveDialog from '$lib/components/ui/responsive-dialog/index.js';
+ import * as Alert from '$lib/components/ui/alert/index.js';
+ import { ArcaneButton } from '$lib/components/arcane-button';
+ import FormInput from '$lib/components/form/form-input.svelte';
+ import { createForm, preventDefault } from '$lib/utils/settings';
+ import { containerService } from '$lib/services/container-service';
+ import { m } from '$lib/paraglide/messages';
+ import { toast } from 'svelte-sonner';
+ import { z } from 'zod/v4';
+ import { InfoIcon } from '$lib/icons';
+
+ type Props = {
+ open: boolean;
+ containerId: string;
+ containerName: string;
+ onOpenChange?: (open: boolean) => void;
+ onCommitted?: () => Promise<void> | void;
+ };
+
+ let { open = $bindable(false), containerId, containerName, onOpenChange, onCommitted }: Props = $props();
+
+ const schema = z.object({
+ repository: z.string().optional().default(''),
+ tag: z.string().optional().default('latest'),
+ comment: z.string().optional().default(''),
+ author: z.string().optional().default(''),
+ noPause: z.boolean().optional().default(false)
+ });
+
+ let formData = $derived({
+ repository: '',
+ tag: 'latest',
+ comment: '',
+ author: '',
+ noPause: false
+ });
+
+ let { inputs, ...form } = $derived(createForm<typeof schema>(schema, formData));
+ let isCommitting = $state(false);
+
+ function handleOpenChange(nextOpen: boolean) {
+ if (!nextOpen && isCommitting) return;
+ open = nextOpen;
+ onOpenChange?.(nextOpen);
+ }
+
+ async function handleSubmit() {
+ const data = form.validate();
+ if (!data || isCommitting) return;
+
+ isCommitting = true;
+ let didCommit = false;
+ try {
+ const result = await containerService.commitContainer(containerId, {
+ repository: data.repository.trim() || undefined,
+ tag: data.tag?.trim() || undefined,
+ comment: data.comment.trim() || undefined,
+ author: data.author.trim() || undefined,
+ noPause: data.noPause
+ });
+ toast.success(m.containers_commit_success({ imageId: result.id }));
+ didCommit = true;
+ open = false;
+ onOpenChange?.(false);
+ } catch (error) {
+ console.error('Failed to commit container:', error);
+ toast.error(m.containers_commit_failed({ name: containerName }));
+ } finally {
+ isCommitting = false;
+ }
+
+ if (didCommit) {
+ await onCommitted?.();
+ }
+ }
+</script>
+
+<ResponsiveDialog.Root
+ {open}
+ onOpenChange={handleOpenChange}
+ title={m.containers_commit_title({ name: containerName })}
+ description={m.containers_commit_description()}
+ contentClass="sm:max-w-[560px]"
+>
+ {#snippet children()}
+ <form onsubmit={preventDefault(handleSubmit)} class="grid gap-4 py-4">
+ <Alert.Root class="border-cyan-500/30 bg-cyan-500/10 text-cyan-950 dark:text-cyan-100">
+ <InfoIcon class="size-4" />
+ <Alert.Description class="text-sm">{m.containers_commit_registry_note()}</Alert.Description>
+ </Alert.Root>
+ <FormInput
+ label={m.images_tag_repository()}
+ placeholder={m.images_tag_repository_placeholder()}
+ bind:input={$inputs.repository}
+ />
+ <FormInput label={m.images_tag()} placeholder={m.images_tag_latest()} bind:input={$inputs.tag} />
+ <FormInput
+ label={m.common_description()}
+ placeholder={m.containers_commit_comment_placeholder()}
+ bind:input={$inputs.comment}
+ />
+ <FormInput label={m.common_author()} placeholder={m.containers_commit_author_placeholder()} bind:input={$inputs.author} />
+ <label class="flex items-center gap-2 text-sm">
+ <input type="checkbox" bind:checked={$inputs.noPause.value} class="accent-primary size-4" />
+ <span>{m.containers_commit_no_pause()}</span>
+ </label>
+ </form>
+ {/snippet}
+
+ {#snippet footer()}
+ <div class="flex w-full gap-2">
+ <ArcaneButton action="cancel" tone="outline" type="button" class="flex-1" onclick={() => handleOpenChange(false)} />
+ <ArcaneButton
+ action="commit"
+ tone="outline-primary"
+ type="submit"
+ class="flex-1"
+ loading={isCommitting}
+ disabled={isCommitting}
+ onclick={handleSubmit}
+ />
+ </div>
+ {/snippet}
+</ResponsiveDialog.Root>
diff --git a/frontend/src/routes/(app)/images/+page.svelte b/frontend/src/routes/(app)/images/+page.svelte
index 8c1c6ab22..443dc5f88 100644
--- a/frontend/src/routes/(app)/images/+page.svelte
+++ b/frontend/src/routes/(app)/images/+page.svelte
@@ -3,6 +3,7 @@
import { Spinner } from '$lib/components/ui/spinner/index.js';
import { toast } from 'svelte-sonner';
import ImagePullSheet from '$lib/components/sheets/image-pull-sheet.svelte';
+ import ImageRegistrySearchDialog from '$lib/components/dialogs/image-registry-search-dialog.svelte';
import { bytes } from '$lib/utils/formatting';
import * as Dialog from '$lib/components/ui/dialog/index.js';
import { displaySize, FileDropZone, MEGABYTE, type FileDropZoneProps } from '$lib/components/ui/file-drop-zone';
@@ -15,7 +16,7 @@
import type { ImageUsageCounts } from '$lib/types/docker';
import { untrack } from 'svelte';
import { ResourcePageLayout, type ActionButton, type StatCardConfig } from '$lib/layouts/index.js';
- import { CloseIcon, VolumesIcon, LocalFolderComputerIcon } from '$lib/icons';
+ import { CloseIcon, VolumesIcon, LocalFolderComputerIcon, SearchIcon } from '$lib/icons';
import { createMutation, createQuery } from '@tanstack/svelte-query';
import PruneModeCard from '$lib/components/prune/prune-mode-card.svelte';
import { activityToastOptions, extractActivityId } from '$lib/utils/activity-toast';
@@ -26,6 +27,7 @@
let requestOptions = $state(untrack(() => data.imageRequestOptions));
let selectedIds = $state<string[]>([]);
let isPullDialogOpen = $state(false);
+ let isRegistrySearchDialogOpen = $state(false);
let isUploadDialogOpen = $state(false);
let isConfirmPruneDialogOpen = $state(false);
let uploadedFiles = $state<File[]>([]);
@@ -165,6 +167,13 @@
const buttons: ActionButton[] = [];
if (canPullImage) {
buttons.push({ id: 'pull', action: 'pull', label: m.images_pull_image(), onclick: () => (isPullDialogOpen = true) });
+ buttons.push({
+ id: 'registry-search',
+ action: 'inspect',
+ label: m.images_search_registry(),
+ icon: SearchIcon,
+ onclick: () => (isRegistrySearchDialogOpen = true)
+ });
}
if (canUploadImage) {
buttons.push({
@@ -248,6 +257,13 @@
}}
/>
+ <ImageRegistrySearchDialog
+ bind:open={isRegistrySearchDialogOpen}
+ onPullFinished={async () => {
+ await Promise.all([imagesQuery.refetch(), imageUsageCountsQuery.refetch()]);
+ }}
+ />
+
<Dialog.Root bind:open={isUploadDialogOpen}>
<Dialog.Content class="max-w-2xl">
<Dialog.Header>
diff --git a/frontend/src/routes/(app)/images/[imageId]/+page.svelte b/frontend/src/routes/(app)/images/[imageId]/+page.svelte
index 0202db029..7d9a5f714 100644
--- a/frontend/src/routes/(app)/images/[imageId]/+page.svelte
+++ b/frontend/src/routes/(app)/images/[imageId]/+page.svelte
@@ -22,6 +22,8 @@
} from '$lib/utils/docker';
import { ResourceDetailLayout, type DetailAction } from '$lib/layouts';
import ImageAttestationsPanel from './image-attestations-panel.svelte';
+ import ImageHistoryPanel from './image-history-panel.svelte';
+ import ImageTagDialog from '../components/image-tag-dialog.svelte';
import VulnerabilityScanPanel from '$lib/components/vulnerability/vulnerability-scan-panel.svelte';
import type { VulnerabilityScanResult } from '$lib/types/environment';
import { environmentStore } from '$lib/stores/environment.store.svelte';
@@ -38,13 +40,16 @@
const currentEnvId = $derived(environmentStore.selected?.id || '0');
const canDeleteImage = $derived(hasPermission('images:delete', currentEnvId));
const canScanImage = $derived(hasPermission('vulnerabilities:scan', currentEnvId));
+ const canTagImage = $derived(hasPermission('images:tag', currentEnvId));
+ const canReadImage = $derived(hasPermission('images:read', currentEnvId));
let isLoading = $state({
pulling: false,
removing: false,
- refreshing: false,
+ exporting: false,
scanning: false
});
+ let tagDialogOpen = $state(false);
let vulnerabilityScan = $state<VulnerabilityScanResult | null>(null);
let hasLoadedVulnerabilities = $state(false);
@@ -233,12 +238,40 @@
});
}
+ async function handleExportImage(id: string) {
+ isLoading.exporting = true;
+ try {
+ const url = await imageService.getImageExportUrl(id);
+ window.open(url, '_blank', 'noopener,noreferrer');
+ } finally {
+ isLoading.exporting = false;
+ }
+ }
+
const actions: DetailAction[] = $derived.by(() => {
const list: DetailAction[] = [];
+ if (canTagImage) {
+ list.push({
+ id: 'tag',
+ action: 'tag',
+ label: m.images_tag_image(),
+ onclick: () => (tagDialogOpen = true)
+ });
+ }
+ if (canReadImage) {
+ list.push({
+ id: 'export',
+ action: 'pull',
+ label: m.images_export(),
+ loading: isLoading.exporting,
+ disabled: isLoading.exporting,
+ onclick: () => handleExportImage(image.id)
+ });
+ }
if (canScanImage) {
list.push({
id: 'scan',
- action: 'base',
+ action: 'scan',
label: m.vuln_scan(),
loading: isLoading.scanning,
disabled: isLoading.scanning,
@@ -334,13 +367,17 @@
<div class="space-y-4 border-t pt-6">
<h3 class="flex items-center gap-2 text-sm font-medium">
<ShieldCheckIcon class="size-4" />
- {m.security_title()}
+ {m.images_details_title()}
</h3>
<Tabs.Root bind:value={securityTab} class="space-y-4">
<Tabs.List>
+ <Tabs.Trigger value="history">{m.images_history_title()}</Tabs.Trigger>
<Tabs.Trigger value="attestations">{m.images_attestations_title()}</Tabs.Trigger>
<Tabs.Trigger value="vulnerabilities">{m.vuln_title()}</Tabs.Trigger>
</Tabs.List>
+ <Tabs.Content value="history">
+ <ImageHistoryPanel imageId={image.id} />
+ </Tabs.Content>
<Tabs.Content value="attestations">
<ImageAttestationsPanel {image} />
</Tabs.Content>
@@ -363,3 +400,12 @@
</div>
{/if}
</ResourceDetailLayout>
+
+{#if image && tagDialogOpen}
+ <ImageTagDialog
+ bind:open={tagDialogOpen}
+ imageId={image.id}
+ defaultRepository={image.repoTags?.[0]?.split(':')[0] ?? ''}
+ onTagged={() => goto(`/images/${image.id}`, { invalidateAll: true })}
+ />
+{/if}
diff --git a/frontend/src/routes/(app)/images/[imageId]/image-history-panel.svelte b/frontend/src/routes/(app)/images/[imageId]/image-history-panel.svelte
new file mode 100644
index 000000000..9e5e7ff04
--- /dev/null
+++ b/frontend/src/routes/(app)/images/[imageId]/image-history-panel.svelte
@@ -0,0 +1,91 @@
+<script lang="ts">
+ import * as Card from '$lib/components/ui/card';
+ import { Badge } from '$lib/components/ui/badge';
+ import { Spinner } from '$lib/components/ui/spinner';
+ import { bytes } from '$lib/utils/formatting';
+ import { imageService } from '$lib/services/image-service';
+ import type { ImageHistoryItemDto } from '$lib/types/docker';
+ import { m } from '$lib/paraglide/messages';
+ import { format } from 'date-fns';
+
+ let { imageId }: { imageId: string } = $props();
+
+ let history = $state<ImageHistoryItemDto[]>([]);
+ let loading = $state(true);
+ let error = $state<string | null>(null);
+
+ $effect(() => {
+ if (!imageId) return;
+ void loadHistory(imageId);
+ });
+
+ async function loadHistory(id: string) {
+ loading = true;
+ error = null;
+ try {
+ history = await imageService.getImageHistory(id);
+ } catch (err) {
+ console.error('Failed to load image history:', err);
+ error = m.images_history_load_failed();
+ } finally {
+ loading = false;
+ }
+ }
+
+ function formatCreated(created: number) {
+ if (!created) return m.common_na();
+ return format(new Date(created * 1000), 'PP p');
+ }
+</script>
+
+<Card.Root variant="subtle">
+ <Card.Header>
+ <Card.Title>{m.images_history_title()}</Card.Title>
+ <Card.Description>{m.images_history_description()}</Card.Description>
+ </Card.Header>
+ <Card.Content>
+ {#if loading}
+ <div class="text-muted-foreground flex items-center gap-2 py-8 text-sm">
+ <Spinner class="size-4" />
+ {m.images_history_loading()}
+ </div>
+ {:else if error}
+ <p class="text-destructive py-8 text-sm">{error}</p>
+ {:else if history.length === 0}
+ <p class="text-muted-foreground py-8 text-sm">{m.images_history_empty()}</p>
+ {:else}
+ <div class="overflow-x-auto">
+ <table class="w-full min-w-[720px] text-sm">
+ <thead class="text-muted-foreground border-b text-left text-xs uppercase">
+ <tr>
+ <th class="py-2 pr-4 font-medium">{m.common_id()}</th>
+ <th class="py-2 pr-4 font-medium">{m.common_created()}</th>
+ <th class="py-2 pr-4 font-medium">{m.common_size()}</th>
+ <th class="py-2 pr-4 font-medium">{m.common_command()}</th>
+ <th class="py-2 font-medium">{m.common_tags()}</th>
+ </tr>
+ </thead>
+ <tbody>
+ {#each history as item, index (`${item.id}-${index}`)}
+ <tr class="border-b last:border-0">
+ <td class="max-w-[180px] py-3 pr-4 font-mono text-xs break-all">{item.id || m.images_history_missing_layer()}</td>
+ <td class="py-3 pr-4 whitespace-nowrap">{formatCreated(item.created)}</td>
+ <td class="py-3 pr-4 whitespace-nowrap">{bytes.format(item.size)}</td>
+ <td class="max-w-[320px] py-3 pr-4 font-mono text-xs break-all">{item.createdBy || m.common_na()}</td>
+ <td class="py-3">
+ <div class="flex flex-wrap gap-1">
+ {#each item.tags ?? [] as tag (tag)}
+ <Badge variant="secondary" class="text-xs">{tag}</Badge>
+ {:else}
+ <span class="text-muted-foreground">{m.common_na()}</span>
+ {/each}
+ </div>
+ </td>
+ </tr>
+ {/each}
+ </tbody>
+ </table>
+ </div>
+ {/if}
+ </Card.Content>
+</Card.Root>
diff --git a/frontend/src/routes/(app)/images/components/image-tag-dialog.svelte b/frontend/src/routes/(app)/images/components/image-tag-dialog.svelte
new file mode 100644
index 000000000..8887150f3
--- /dev/null
+++ b/frontend/src/routes/(app)/images/components/image-tag-dialog.svelte
@@ -0,0 +1,94 @@
+<script lang="ts">
+ import * as ResponsiveDialog from '$lib/components/ui/responsive-dialog/index.js';
+ import { ArcaneButton } from '$lib/components/arcane-button';
+ import FormInput from '$lib/components/form/form-input.svelte';
+ import { createForm, preventDefault } from '$lib/utils/settings';
+ import { imageService } from '$lib/services/image-service';
+ import { m } from '$lib/paraglide/messages';
+ import { toast } from 'svelte-sonner';
+ import { z } from 'zod/v4';
+
+ type Props = {
+ open: boolean;
+ imageId: string;
+ defaultRepository?: string;
+ onOpenChange?: (open: boolean) => void;
+ onTagged?: () => Promise<void> | void;
+ };
+
+ let { open = $bindable(false), imageId, defaultRepository = '', onOpenChange, onTagged }: Props = $props();
+
+ const schema = z.object({
+ repository: z.string().min(1, m.images_tag_repository_required()),
+ tag: z.string().optional().default('latest')
+ });
+
+ let formData = $derived({
+ repository: defaultRepository || '',
+ tag: 'latest'
+ });
+
+ let { inputs, ...form } = $derived(createForm<typeof schema>(schema, formData));
+ let isTagging = $state(false);
+
+ function handleOpenChange(nextOpen: boolean) {
+ if (!nextOpen && isTagging) return;
+ open = nextOpen;
+ onOpenChange?.(nextOpen);
+ }
+
+ async function handleSubmit() {
+ const data = form.validate();
+ if (!data || isTagging) return;
+
+ isTagging = true;
+ try {
+ await imageService.tagImage(imageId, {
+ repository: data.repository.trim(),
+ tag: data.tag?.trim() || undefined
+ });
+ toast.success(m.images_tag_success());
+ await onTagged?.();
+ handleOpenChange(false);
+ } catch (error) {
+ console.error('Failed to tag image:', error);
+ toast.error(m.images_tag_failed());
+ } finally {
+ isTagging = false;
+ }
+ }
+</script>
+
+<ResponsiveDialog.Root
+ {open}
+ onOpenChange={handleOpenChange}
+ title={m.images_tag_image()}
+ description={m.images_tag_dialog_description()}
+ contentClass="sm:max-w-[520px]"
+>
+ {#snippet children()}
+ <form onsubmit={preventDefault(handleSubmit)} class="grid gap-4 py-4">
+ <FormInput
+ label={m.images_tag_repository()}
+ placeholder={m.images_tag_repository_placeholder()}
+ bind:input={$inputs.repository}
+ />
+ <FormInput label={m.images_tag()} placeholder={m.images_tag_latest()} bind:input={$inputs.tag} />
+ </form>
+ {/snippet}
+
+ {#snippet footer()}
+ <div class="flex w-full gap-2">
+ <ArcaneButton action="cancel" tone="outline" type="button" class="flex-1" onclick={() => handleOpenChange(false)} />
+ <ArcaneButton
+ action="base"
+ type="submit"
+ class="flex-1"
+ customLabel={m.images_tag_image()}
+ loading={isTagging}
+ disabled={isTagging}
+ onclick={handleSubmit}
+ />
+ </div>
+ {/snippet}
+</ResponsiveDialog.Root>
diff --git a/frontend/src/routes/(app)/images/image-table.svelte b/frontend/src/routes/(app)/images/image-table.svelte
index 76b6d65d5..5213f38f4 100644
--- a/frontend/src/routes/(app)/images/image-table.svelte
+++ b/frontend/src/routes/(app)/images/image-table.svelte
@@ -15,6 +15,7 @@
import ImageUpdateItem from '$lib/components/image-update-item.svelte';
import VulnerabilityScanItem from '$lib/components/vulnerability/vulnerability-scan-item.svelte';
import UniversalMobileCard from '$lib/components/arcane-table/cards/universal-mobile-card.svelte';
+ import ImageTagDialog from './components/image-tag-dialog.svelte';
import * as Tooltip from '$lib/components/ui/tooltip';
import type { Paginated, SearchPaginationSortRequest } from '$lib/types/shared';
import type { ImageSummaryDto, ImageUpdateInfoDto } from '$lib/types/docker';
@@ -40,7 +41,8 @@
EllipsisIcon,
ScanIcon,
ProjectsIcon,
- ContainersIcon
+ ContainersIcon,
+ TagIcon
} from '$lib/icons';
let {
@@ -68,9 +70,12 @@
const canDeleteImage = $derived(hasPermission('images:delete', currentEnvId));
const canPullImage = $derived(hasPermission('images:pull', currentEnvId));
const canScanImage = $derived(hasPermission('vulnerabilities:scan', currentEnvId));
+ const canTagImage = $derived(hasPermission('images:tag', currentEnvId));
+ const canReadImage = $derived(hasPermission('images:read', currentEnvId));
let isPullingInline = $state<Record<string, boolean>>({});
let isScanningInline = $state<Record<string, boolean>>({});
+ let tagDialogImage = $state<ImageSummaryDto | null>(null);
let scanRequestedAtByImage = $state<Record<string, string>>({});
let scanPollTimeout: ReturnType<typeof setTimeout> | null = null;
let scanPollInFlight = false;
@@ -202,6 +207,11 @@
isScanningInline[imageId] = false;
}
+ async function handleExportImage(imageId: string) {
+ const url = await imageService.getImageExportUrl(imageId);
+ window.open(url, '_blank', 'noopener,noreferrer');
+ }
+
async function handleUpdateInfoChanged(imageId: string, newUpdateInfo: ImageUpdateInfoDto) {
const imageIndex = images.data.findIndex((img) => img.id === imageId);
const image = imageIndex !== -1 ? images.data[imageIndex] : undefined;
@@ -681,10 +691,24 @@
{m.common_inspect()}
</DropdownMenu.Item>
- {#if canPullImage || canScanImage}
+ {#if canPullImage || canScanImage || canTagImage || canReadImage}
<DropdownMenu.Separator />
{/if}
+ {#if canTagImage}
+ <DropdownMenu.Item onclick={() => (tagDialogImage = item)}>
+ <TagIcon class="size-4" />
+ {m.images_tag_image()}
+ </DropdownMenu.Item>
+ {/if}
+
+ {#if canReadImage}
+ <DropdownMenu.Item onclick={() => handleExportImage(item.id)}>
+ <DownloadIcon class="size-4" />
+ {m.images_export()}
+ </DropdownMenu.Item>
+ {/if}
+
{#if canPullImage}
<DropdownMenu.Item
onclick={() => handleInlineImagePull(item.id, item.repoTags?.[0] || '')}
@@ -745,3 +769,15 @@
rowActions={RowActions}
mobileCard={ImageMobileCardSnippet}
/>
+
+{#if tagDialogImage}
+ <ImageTagDialog
+ open={!!tagDialogImage}
+ imageId={tagDialogImage.id}
+ defaultRepository={tagDialogImage.repo !== '<none>' ? tagDialogImage.repo : ''}
+ onOpenChange={(open) => {
+ if (!open) tagDialogImage = null;
+ }}
+ onTagged={async () => refreshImages()}
+ />
+{/if}
diff --git a/types/container/container.go b/types/container/container.go
index f5d952dc6..fad3c59aa 100644
--- a/types/container/container.go
+++ b/types/container/container.go
@@ -275,6 +275,44 @@ type Create struct {
Credentials []containerregistry.Credential `json:"credentials,omitempty"`
}
+// CommitRequest is used to create an image from a container's current filesystem.
+type CommitRequest struct {
+ // Repository is the target image repository.
+ //
+ // Required: false
+ Repository string `json:"repository,omitempty" doc:"Target image repository"`
+
+ // Tag is the target image tag.
+ //
+ // Required: false
+ Tag string `json:"tag,omitempty" doc:"Target image tag"`
+
+ // Comment records why the image was committed.
+ //
+ // Required: false
+ Comment string `json:"comment,omitempty" doc:"Commit comment"`
+
+ // Author records who created the committed image.
+ //
+ // Required: false
+ Author string `json:"author,omitempty" doc:"Commit author"`
+
+ // Changes contains Dockerfile-style changes to apply during commit.
+ //
+ // Required: false
+ Changes []string `json:"changes,omitempty" doc:"Dockerfile changes to apply"`
+
+ // NoPause disables the default pause during commit.
+ //
+ // Required: false
+ NoPause bool `json:"noPause,omitempty" doc:"Do not pause the container during commit"`
+}
+
+// CommitResult identifies the image created by a container commit.
+type CommitResult struct {
+ ID string `json:"id"`
+}
+
// StatusCounts contains counts of containers by status.
type StatusCounts struct {
// RunningContainers is the number of running containers.
diff --git a/types/image/image.go b/types/image/image.go
index 832771304..b84f3d3a0 100644
--- a/types/image/image.go
+++ b/types/image/image.go
@@ -198,6 +198,38 @@ type PruneReport struct {
SpaceReclaimed int64 `json:"spaceReclaimed"`
}
+// TagRequest is used to add a new repository tag to an existing image.
+type TagRequest struct {
+ // Repository is the target repository name.
+ //
+ // Required: true
+ Repository string `json:"repository" doc:"Target repository name"`
+
+ // Tag is the target tag. Docker defaults to latest when omitted.
+ //
+ // Required: false
+ Tag string `json:"tag,omitempty" doc:"Target tag"`
+}
+
+// HistoryItem describes a single image history layer entry.
+type HistoryItem struct {
+ ID string `json:"id"`
+ Created int64 `json:"created"`
+ CreatedBy string `json:"createdBy"`
+ Tags []string `json:"tags"`
+ Size int64 `json:"size"`
+ Comment string `json:"comment"`
+}
+
+// SearchResult describes an image registry search result.
+type SearchResult struct {
+ Name string `json:"name"`
+ Description string `json:"description"`
+ StarCount int `json:"starCount"`
+ Official bool `json:"official"`
+ Automated bool `json:"automated"`
+}
+
// NewPruneReport creates a PruneReport from a Docker image prune report.
// It extracts deleted and untagged image IDs from the Docker API response,
// combining both types into a single list and converting space reclaimed to int64.