Fix image loading flow and update/prune behaviors

Author: rsousa88

app/routes/images.py

@@ -38,9 +38,10 @@ def list_images():
         """List all images across all Docker hosts."""
         try:
             refresh = request.args.get('refresh', '0') == '1'
+            host_id = request.args.get('host_id', type=int)
             if refresh:
                 clear_image_usage_cache()
-            images = fetch_all_images()
+            images = fetch_all_images(host_id)
             return jsonify(images)
         except Exception as e:
             logger.error(f"Failed to list images: {e}")
@@ -132,7 +133,10 @@ def prune_images():
             if not client:
                 return jsonify({'error': 'Cannot connect to Docker host. Check the host URL and socket availability.'}), 400
 
-            filters = {'dangling': True} if dangling_only else None
+            if dangling_only:
+                filters = {'dangling': ['true']}
+            else:
+                filters = {'dangling': ['false']}
             result = client.images.prune(filters=filters)
             if logs_repo:
                 reclaimed = result.get('SpaceReclaimed', 0)

app/services/container_service.py

@@ -351,35 +351,91 @@ def update_container(self, container_id: str, container_name: str, schedule_id:
             if not docker_client:
                 raise Exception("Cannot connect to Docker host")
 
-            container = docker_client.containers.get(container_id)
-            attrs = container.attrs
-            image_name = attrs.get('Config', {}).get('Image', '')
+            container, _ = self.resolve_container(docker_client, container_id, container_name)
+            if not container:
+                raise docker.errors.NotFound(f"No such container: {container_id}")
+
+            container.reload()
+            attrs = container.attrs or {}
+            config = attrs.get('Config', {}) or {}
+            host_config = attrs.get('HostConfig', {}) or {}
+            image_name = config.get('Image', '')
 
             if not image_name:
                 return ContainerActionResult(False, "Unable to determine container image")
 
-            config = attrs.get('Config', {})
-            host_config = attrs.get('HostConfig', {})
+            mounts = []
+            for mount in attrs.get('Mounts', []) or []:
+                target = mount.get('Destination')
+                if not target:
+                    continue
+                mount_type = mount.get('Type', 'volume')
+                read_only = not mount.get('RW', True)
+                mounts.append(
+                    docker.types.Mount(
+                        target=target,
+                        source=mount.get('Source'),
+                        type=mount_type,
+                        read_only=read_only,
+                        propagation=mount.get('Propagation'),
+                    )
+                )
 
-            container_settings = {
-                'name': container.name,
-                'image': image_name,
-                'command': config.get('Cmd'),
-                'environment': config.get('Env', []),
-                'volumes': host_config.get('Binds', []),
-                'ports': config.get('ExposedPorts', {}),
-                'labels': config.get('Labels', {}),
-                'restart_policy': host_config.get('RestartPolicy', {}),
-                'network_mode': host_config.get('NetworkMode'),
-                'detach': True,
-            }
+            exposed_ports = config.get('ExposedPorts') or {}
+            port_bindings = host_config.get('PortBindings') or None
+            network_mode = host_config.get('NetworkMode')
+
+            new_host_config = docker.types.HostConfig(
+                binds=host_config.get('Binds'),
+                port_bindings=port_bindings,
+                restart_policy=host_config.get('RestartPolicy'),
+                network_mode=network_mode,
+                privileged=host_config.get('Privileged', False),
+                cap_add=host_config.get('CapAdd'),
+                cap_drop=host_config.get('CapDrop'),
+                extra_hosts=host_config.get('ExtraHosts'),
+                devices=host_config.get('Devices'),
+                mounts=mounts or None,
+            )
 
             container.stop(timeout=10)
             container.remove()
 
             docker_client.images.pull(image_name)
 
-            docker_client.containers.run(**container_settings)
+            create_kwargs = {
+                'image': image_name,
+                'name': container.name,
+                'command': config.get('Cmd'),
+                'environment': config.get('Env'),
+                'labels': config.get('Labels'),
+                'entrypoint': config.get('Entrypoint'),
+                'working_dir': config.get('WorkingDir'),
+                'user': config.get('User'),
+                'hostname': config.get('Hostname'),
+                'domainname': config.get('Domainname'),
+                'host_config': new_host_config,
+            }
+
+            if exposed_ports:
+                create_kwargs['ports'] = list(exposed_ports.keys())
+
+            new_container = docker_client.api.create_container(**create_kwargs)
+            new_container_id = new_container.get('Id')
+            docker_client.api.start(new_container_id)
+
+            networks = (attrs.get('NetworkSettings') or {}).get('Networks') or {}
+            if networks and network_mode and not str(network_mode).startswith('container:'):
+                for network_name in networks.keys():
+                    if network_name == network_mode:
+                        continue
+                    try:
+                        docker_client.api.connect_container_to_network(new_container_id, network_name)
+                    except Exception:
+                        pass
+
+            if schedule_id:
+                self.update_schedule_container_id(schedule_id, new_container_id[:12])
 
             message = f"Container {container_name} updated successfully"
             self.log_action(schedule_id, container_name, 'update', 'success', message, host_id)

app/services/image_service.py

@@ -87,47 +87,46 @@ def clear_image_usage_cache(self) -> None:
         with self._cache_lock:
             self._cache.clear()
 
-    def fetch_all_images(self) -> list[dict[str, Any]]:
+    def fetch_all_images(self, host_id: Optional[int] = None) -> list[dict[str, Any]]:
         image_list = []
         host_color_map, host_text_color_map = self._get_host_color_maps()
 
-        for host_id, host_name, docker_client in self._docker_manager.get_all_clients():
+        for host_id_row, host_name, docker_client in self._docker_manager.get_all_clients():
+            if host_id is not None and host_id_row != host_id:
+                continue
             df_images = {}
-            cached_df = self.get_cached_image_usage(host_id)
+            cached_df = self.get_cached_image_usage(host_id_row)
             cached_from_images = cached_df is not None
             if not cached_df:
-                cached_df = self._get_cached_disk_usage(host_id)
+                cached_df = self._get_cached_disk_usage(host_id_row)
             if cached_df:
                 df_images = {entry.get('Id'): entry for entry in (cached_df.get('Images', []) or [])}
             if not cached_from_images:
-                self.refresh_image_usage_async(host_id, docker_client, host_name)
+                self.refresh_image_usage_async(host_id_row, docker_client, host_name)
 
-            host_color = host_color_map.get(host_id, self._host_default_color)
-            host_text_color = host_text_color_map.get(host_id, self._get_contrast_text_color(host_color))
+            host_color = host_color_map.get(host_id_row, self._host_default_color)
+            host_text_color = host_text_color_map.get(host_id_row, self._get_contrast_text_color(host_color))
 
             container_repo_map = {}
             container_count_map = {}
+            container_name_count_map = {}
+            container_map_ready = False
             try:
-                containers = docker_client.containers.list(all=True)
+                containers = docker_client.api.containers(all=True)
+                container_map_ready = True
                 for container in containers:
-                    try:
-                        image_id = container.image.id
-                        if not image_id:
-                            continue
-                        stripped_id = image_id.replace('sha256:', '')
-                        container_count_map[image_id] = container_count_map.get(image_id, 0) + 1
-                        container_count_map[stripped_id] = container_count_map.get(stripped_id, 0) + 1
-                        image_name = None
-                        if container.image.tags:
-                            image_name = container.image.tags[0]
-                        else:
-                            image_name = container.attrs.get('Config', {}).get('Image')
-                        if image_name:
-                            repo, _ = self._split_image_reference(image_name)
-                            container_repo_map[image_id] = repo or container_repo_map.get(image_id)
-                            container_repo_map[stripped_id] = repo or container_repo_map.get(stripped_id)
-                    except Exception:
+                    image_id = container.get('ImageID')
+                    if not image_id:
                         continue
+                    stripped_id = image_id.replace('sha256:', '')
+                    container_count_map[image_id] = container_count_map.get(image_id, 0) + 1
+                    container_count_map[stripped_id] = container_count_map.get(stripped_id, 0) + 1
+                    image_name = container.get('Image')
+                    if image_name:
+                        container_name_count_map[image_name] = container_name_count_map.get(image_name, 0) + 1
+                        repo, _ = self._split_image_reference(image_name)
+                        container_repo_map[image_id] = repo or container_repo_map.get(image_id)
+                        container_repo_map[stripped_id] = repo or container_repo_map.get(stripped_id)
             except Exception as error:
                 self._logger.debug("Failed to map container images for host %s: %s", host_name, error)
 
@@ -141,15 +140,21 @@ def fetch_all_images(self) -> list[dict[str, Any]]:
                     containers_count = entry.get('Containers')
                     stripped_id = image_id.replace('sha256:', '')
                     fallback_count = container_count_map.get(image_id) or container_count_map.get(stripped_id)
-                    if containers_count is None:
+                    if containers_count is None or (isinstance(containers_count, int) and containers_count < 0):
                         containers_count = fallback_count
                     elif containers_count == 0 and fallback_count:
                         containers_count = fallback_count
                     if containers_count is None and container_count_map:
                         containers_count = 0
+                    if containers_count == 0 and container_name_count_map:
+                        for tag in entry.get('RepoTags') or []:
+                            tag_count = container_name_count_map.get(tag)
+                            if tag_count:
+                                containers_count = tag_count
+                                break
                     if containers_count is not None and containers_count < 0:
                         containers_count = None
-                    containers_pending = cached_df is None and containers_count is None and not container_count_map
+                    containers_pending = containers_count is None and not container_map_ready
                     repo_tags = entry.get('RepoTags') or []
                     repo_digests = entry.get('RepoDigests') or []
                     if not repo_tags:
@@ -175,7 +180,7 @@ def fetch_all_images(self) -> list[dict[str, Any]]:
                             'containers': containers_count,
                             'containers_pending': containers_pending,
                             'created': created,
-                            'host_id': host_id,
+                            'host_id': host_id_row,
                             'host_name': host_name,
                             'host_color': host_color,
                             'host_text_color': host_text_color,
@@ -193,15 +198,21 @@ def fetch_all_images(self) -> list[dict[str, Any]]:
                     containers_count = entry.get('Containers')
                     stripped_id = image_id.replace('sha256:', '')
                     fallback_count = container_count_map.get(image_id) or container_count_map.get(stripped_id)
-                    if containers_count is None:
+                    if containers_count is None or (isinstance(containers_count, int) and containers_count < 0):
                         containers_count = fallback_count
                     elif containers_count == 0 and fallback_count:
                         containers_count = fallback_count
                     if containers_count is None and container_count_map:
                         containers_count = 0
+                    if containers_count == 0 and container_name_count_map:
+                        for tag in entry.get('RepoTags') or []:
+                            tag_count = container_name_count_map.get(tag)
+                            if tag_count:
+                                containers_count = tag_count
+                                break
                     if containers_count is not None and containers_count < 0:
                         containers_count = None
-                    containers_pending = cached_df is None and containers_count is None and not container_count_map
+                    containers_pending = containers_count is None and not container_map_ready
                     repo_tags = entry.get('RepoTags') or []
                     repo_digests = entry.get('RepoDigests') or []
                     if not repo_tags:
@@ -227,7 +238,7 @@ def fetch_all_images(self) -> list[dict[str, Any]]:
                             'containers': containers_count,
                             'containers_pending': containers_pending,
                             'created': created,
-                            'host_id': host_id,
+                            'host_id': host_id_row,
                             'host_name': host_name,
                             'host_color': host_color,
                             'host_text_color': host_text_color,

frontend/src/components/containers/ContainerActions.vue

@@ -1,5 +1,35 @@
 <template>
   <div ref="rootEl" class="flex flex-nowrap items-center gap-1" :class="align === 'right' ? 'justify-end' : ''">
+    <Button size="icon" variant="ghost" aria-label="Restart" title="Restart" @click="runAction('restart')">
+      <svg class="h-4 w-4" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+        <path d="M3 12a9 9 0 1 1 3 6.7" />
+        <path d="M3 21v-6h6" />
+      </svg>
+    </Button>
+    <Button
+      v-if="canStop"
+      size="icon"
+      variant="ghost"
+      aria-label="Stop"
+      title="Stop"
+      @click="runAction('stop')"
+    >
+      <svg class="h-4 w-4" viewBox="0 0 24 24" fill="currentColor">
+        <rect x="6" y="6" width="12" height="12" rx="2" />
+      </svg>
+    </Button>
+    <Button
+      v-if="canStart"
+      size="icon"
+      variant="ghost"
+      aria-label="Start"
+      title="Start"
+      @click="runAction('start')"
+    >
+      <svg class="h-4 w-4" viewBox="0 0 24 24" fill="currentColor">
+        <path d="M8 5v14l11-7z" />
+      </svg>
+    </Button>
     <Button size="icon" variant="ghost" aria-label="Logs" title="Logs" @click="openLogs">
       <svg class="h-4 w-4" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
         <path d="M4 6h16" />
@@ -8,7 +38,7 @@
       </svg>
     </Button>
     <Button
-      v-if="updateAvailable"
+      v-show="updateAvailable"
       size="icon"
       variant="ghost"
       aria-label="Update"
@@ -22,7 +52,7 @@
       </svg>
     </Button>
     <Button
-      v-else
+      v-show="!updateAvailable"
       size="icon"
       variant="ghost"
       aria-label="Check updates"
@@ -35,30 +65,6 @@
         <path d="M21 3v6h-6" />
       </svg>
     </Button>
-    <Button
-      v-if="canStop"
-      size="icon"
-      variant="ghost"
-      aria-label="Stop"
-      title="Stop"
-      @click="runAction('stop')"
-    >
-      <svg class="h-4 w-4" viewBox="0 0 24 24" fill="currentColor">
-        <rect x="6" y="6" width="12" height="12" rx="2" />
-      </svg>
-    </Button>
-    <Button
-      v-if="canStart"
-      size="icon"
-      variant="ghost"
-      aria-label="Start"
-      title="Start"
-      @click="runAction('start')"
-    >
-      <svg class="h-4 w-4" viewBox="0 0 24 24" fill="currentColor">
-        <path d="M8 5v14l11-7z" />
-      </svg>
-    </Button>
     <div class="relative">
       <Button size="icon" variant="ghost" aria-label="More actions" title="More actions" @click="toggleMenu">
         <svg class="h-4 w-4" viewBox="0 0 24 24" fill="currentColor">
@@ -72,7 +78,6 @@
         v-if="menuOpen"
         class="absolute right-0 z-10 mt-2 w-40 rounded-xl border border-surface-800 bg-surface-900 p-2 text-xs text-surface-200 shadow-xl"
       >
-        <button class="flex w-full items-center gap-2 rounded-lg px-2 py-1 hover:bg-surface-800" @click="runAction('restart')">Restart</button>
         <button
           v-if="isPaused"
           class="flex w-full items-center gap-2 rounded-lg px-2 py-1 hover:bg-surface-800"