Skip to content

Modern Docker Management, Designed for Everyone

fix: volumes not showing containers they are being used by

Kyle Mendell6eac860bcc93
diff --git a/backend/internal/dto/volume_dto.go b/backend/internal/dto/volume_dto.go
index 29f3c1798..c9c1cb9fe 100644
--- a/backend/internal/dto/volume_dto.go
+++ b/backend/internal/dto/volume_dto.go
@@ -19,6 +19,7 @@ type VolumeDto struct {
InUse bool `json:"inUse"`
UsageData *VolumeUsageData `json:"usageData,omitempty"`
Size int64 `json:"size"`
+ Containers []string `json:"containers"`
}
func NewVolumeDto(v volume.Volume) VolumeDto {
@@ -31,6 +32,7 @@ func NewVolumeDto(v volume.Volume) VolumeDto {
Options: v.Options,
Labels: v.Labels,
CreatedAt: v.CreatedAt,
+ Containers: make([]string, 0),
}
if v.UsageData != nil {
diff --git a/backend/internal/services/volume_service.go b/backend/internal/services/volume_service.go
index c73db8967..064e6083a 100644
--- a/backend/internal/services/volume_service.go
+++ b/backend/internal/services/volume_service.go
@@ -6,8 +6,11 @@ import (
"log/slog"
"strings"
+ "github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/filters"
+ "github.com/docker/docker/api/types/mount"
"github.com/docker/docker/api/types/volume"
+ "github.com/docker/docker/client"
"github.com/ofkm/arcane-backend/internal/database"
"github.com/ofkm/arcane-backend/internal/dto"
"github.com/ofkm/arcane-backend/internal/models"
@@ -59,6 +62,16 @@ func (s *VolumeService) GetVolumeByName(ctx context.Context, name string) (*dto.
}
v := dto.NewVolumeDto(vol)
+
+ containerIDs, err := docker.GetContainersUsingVolume(ctx, dockerClient, name)
+ if err != nil {
+ slog.WarnContext(ctx, "failed to get containers using volume",
+ slog.String("volume", name),
+ slog.String("error", err.Error()))
+ } else {
+ v.Containers = containerIDs
+ }
+
return &v, nil
}
@@ -185,19 +198,13 @@ func (s *VolumeService) GetVolumeUsage(ctx context.Context, name string) (bool,
return false, nil, fmt.Errorf("volume not found: %w", err)
}
- usageVolumes, duErr := docker.GetVolumeUsageData(ctx, dockerClient)
- if duErr != nil {
- return false, nil, fmt.Errorf("failed to get volume usage data: %w", duErr)
- }
-
- for _, uv := range usageVolumes {
- if uv.Name == vol.Name && uv.UsageData != nil {
- inUse := uv.UsageData.RefCount >= 1
- return inUse, nil, nil
- }
+ containerIDs, err := docker.GetContainersUsingVolume(ctx, dockerClient, vol.Name)
+ if err != nil {
+ return false, nil, fmt.Errorf("failed to get containers using volume: %w", err)
}
- return false, nil, nil
+ inUse := len(containerIDs) > 0
+ return inUse, containerIDs, nil
}
func (s *VolumeService) enrichVolumesWithUsageData(volumes []*volume.Volume, usageVolumes []volume.Volume) []volume.Volume {
@@ -217,6 +224,24 @@ func (s *VolumeService) enrichVolumesWithUsageData(volumes []*volume.Volume, usa
return result
}
+func (s *VolumeService) buildVolumeContainerMap(ctx context.Context, dockerClient *client.Client) (map[string][]string, error) {
+ containers, err := dockerClient.ContainerList(ctx, container.ListOptions{All: true})
+ if err != nil {
+ return nil, fmt.Errorf("failed to list containers: %w", err)
+ }
+
+ volumeContainerMap := make(map[string][]string)
+ for _, c := range containers {
+ for _, m := range c.Mounts {
+ if m.Type == mount.TypeVolume && m.Name != "" {
+ volumeContainerMap[m.Name] = append(volumeContainerMap[m.Name], c.ID)
+ }
+ }
+ }
+
+ return volumeContainerMap, nil
+}
+
func (s *VolumeService) buildVolumePaginationConfig() pagination.Config[dto.VolumeDto] {
return pagination.Config[dto.VolumeDto]{
SearchAccessors: []pagination.SearchAccessor[dto.VolumeDto]{
@@ -361,9 +386,20 @@ func (s *VolumeService) ListVolumesPaginated(ctx context.Context, params paginat
volumes := s.enrichVolumesWithUsageData(volListBody.Volumes, usageVolumes)
+ volumeContainerMap, err := s.buildVolumeContainerMap(ctx, dockerClient)
+ if err != nil {
+ slog.WarnContext(ctx, "failed to build volume-container map",
+ slog.String("error", err.Error()))
+ volumeContainerMap = make(map[string][]string)
+ }
+
items := make([]dto.VolumeDto, 0, len(volumes))
for _, v := range volumes {
- items = append(items, dto.NewVolumeDto(v))
+ volDto := dto.NewVolumeDto(v)
+ if containerIDs, ok := volumeContainerMap[v.Name]; ok {
+ volDto.Containers = containerIDs
+ }
+ items = append(items, volDto)
}
config := s.buildVolumePaginationConfig()
diff --git a/backend/internal/utils/docker/volume_utils.go b/backend/internal/utils/docker/volume_utils.go
index a98f0ae31..bd3e91895 100644
--- a/backend/internal/utils/docker/volume_utils.go
+++ b/backend/internal/utils/docker/volume_utils.go
@@ -8,6 +8,8 @@ import (
"time"
"github.com/docker/docker/api/types"
+ "github.com/docker/docker/api/types/container"
+ "github.com/docker/docker/api/types/mount"
"github.com/docker/docker/api/types/volume"
"github.com/docker/docker/client"
)
@@ -75,3 +77,26 @@ func SetVolumeUsageCacheTTL(ttl time.Duration) {
defer volumeUsageCacheMutex.Unlock()
volumeUsageCacheTTL = ttl
}
+
+func GetContainersUsingVolume(ctx context.Context, dockerClient *client.Client, volumeName string) ([]string, error) {
+ containers, err := dockerClient.ContainerList(ctx, container.ListOptions{All: true})
+ if err != nil {
+ return nil, fmt.Errorf("failed to list containers: %w", err)
+ }
+
+ containerIDs := make([]string, 0)
+ for _, c := range containers {
+ for _, m := range c.Mounts {
+ if m.Type == mount.TypeVolume && m.Name == volumeName {
+ containerIDs = append(containerIDs, c.ID)
+ break
+ }
+ }
+ }
+
+ slog.DebugContext(ctx, "found containers using volume",
+ slog.String("volume", volumeName),
+ slog.Int("container_count", len(containerIDs)))
+
+ return containerIDs, nil
+}
diff --git a/frontend/src/routes/volumes/[volumeName]/+page.ts b/frontend/src/routes/volumes/[volumeName]/+page.ts
index 74b74bed8..463edda6d 100644
--- a/frontend/src/routes/volumes/[volumeName]/+page.ts
+++ b/frontend/src/routes/volumes/[volumeName]/+page.ts
@@ -1,6 +1,5 @@
import type { PageLoad } from './$types';
import { error } from '@sveltejs/kit';
-import type { VolumeUsageDto } from '$lib/types/volume.type';
import { volumeService } from '$lib/services/volume-service';
import { containerService } from '$lib/services/container-service';
@@ -8,20 +7,10 @@ export const load: PageLoad = async ({ params }) => {
const { volumeName } = params;
try {
- const volumeBase = await volumeService.getVolume(volumeName);
- const usageRes = await volumeService.getVolumeUsage(volumeName);
-
- const usage: VolumeUsageDto = (
- usageRes && typeof usageRes === 'object' && 'data' in usageRes ? (usageRes as any).data : usageRes
- ) as VolumeUsageDto;
-
- const volume = {
- ...volumeBase,
- containers: Array.isArray(usage?.containers) ? usage.containers : []
- };
+ const volume = await volumeService.getVolume(volumeName);
let containersDetailed: { id: string; name: string }[] = [];
- if (volume.containers.length > 0) {
+ if (volume.containers && volume.containers.length > 0) {
containersDetailed = await Promise.all(
volume.containers.map(async (id: string) => {
try {