Probably a bad attempt at fixing a huge bug in multiple servers

No special CLI or Liquid support yet and also no refresh support

.github/actions/build-image/Dockerfile

@@ -1,12 +0,0 @@
-FROM --platform=$BUILDPLATFORM alpine AS builder
-
-ARG TARGETARCH
-ARG TARGETOS
-
-COPY binaries/* /
-RUN mv cup-$TARGETOS-$TARGETARCH cup
-RUN chmod +x cup
-
-FROM scratch
-COPY --from=builder /cup /cup
-ENTRYPOINT ["/cup"]

.github/actions/build-image/action.yml

@@ -1,51 +0,0 @@
-name: Build Image
-inputs:
-  tags:
-    description: "Docker image tags"
-    required: true
-  gh-token:
-    description: "Github token"
-    required: true
-
-runs:
-  using: 'composite'
-  steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-
-    - name: Download binaries
-      uses: actions/download-artifact@v4
-      with:
-        path: .
-
-    - name: Set up QEMU
-      uses: docker/setup-qemu-action@v3
-
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v3
-
-    - name: Docker meta
-      id: meta
-      uses: docker/metadata-action@v5
-      with:
-        images: |
-          ghcr.io/sergi0g/cup
-        tags: ${{ inputs.tags }}
-
-    - name: Login to GitHub Container Registry
-      uses: docker/login-action@v3
-      with:
-        registry: ghcr.io
-        username: sergi0g
-        password: ${{ inputs.gh-token }}
-
-    - name: Build and push image
-      uses: docker/build-push-action@v6
-      with:
-        context: .
-        file: ./.github/actions/build-image/Dockerfile
-        platforms: linux/amd64,linux/arm64
-        push: true
-        tags: ${{ steps.meta.outputs.tags }}
-        cache-from: type=gha
-        cache-to: type=gha,mode=max

.github/workflows/nightly.yml

@@ -62,24 +62,38 @@ jobs:
             cup-linux-arm64
 
   build-image:
-    needs:
+    needs: get-tag
-      - get-tag
-      - build-binaries
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - uses: ./.github/actions/build-image
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
         with:
-          tags: |
+          registry: ghcr.io
-            ${{ needs.get-tag.outputs.tag }}
+          username: ${{ github.repository_owner }}
-          gh-token: ${{ secrets.GITHUB_TOKEN }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          platforms: linux/amd64, linux/arm64
+          push: true
+          tags: ghcr.io/sergi0g/cup:${{ needs.get-tag.outputs.tag }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
 
   nightly-release:
     runs-on: ubuntu-latest
-    needs:
+    needs: [build-binaries, get-tag]
-      - build-binaries
-      - build-image
     steps:
       - name: Download binaries
         uses: actions/download-artifact@v4

.github/workflows/release.yml

@@ -60,19 +60,34 @@ jobs:
             cup-linux-arm64
 
   build-image:
-    needs:
+    needs: get-tag
-      - get-tag
-      - build-binaries
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - uses: ./.github/actions/build-image
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
         with:
-          tags: |
+          registry: ghcr.io
-            ${{ needs.get-tag.outputs.tag }}
+          username: ${{ github.repository_owner }}
-            latest
+          password: ${{ secrets.GITHUB_TOKEN }}
-          gh-token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          platforms: linux/amd64, linux/arm64
+          push: true
+          tags: ghcr.io/sergi0g/cup:${{ needs.get-tag.outputs.tag }},ghcr.io/sergi0g/cup:latest
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
 
   release:
     runs-on: ubuntu-latest

Cargo.toml

@@ -1,15 +1,15 @@
 [package]
 name = "cup"
-version = "3.0.2"
+version = "3.0.0"
 edition = "2021"
 
 [dependencies]
 clap = { version = "4.5.7", features = ["derive"] }
 indicatif = { version = "0.17.8", optional = true }
 tokio = { version = "1.38.0", features = ["macros", "rt-multi-thread"] }
-xitca-web = { version = "0.6.2", optional = true }
+xitca-web = { version = "0.5.0", optional = true }
 liquid = { version = "0.26.6", optional = true }
-bollard = "0.18.1"
+bollard = "0.16.1"
 once_cell = "1.19.0"
 http-auth = { version = "0.1.9", default-features = false }
 termsize = { version = "0.1.8", optional = true }
@@ -17,11 +17,11 @@ regex = { version = "1.10.5", default-features = false, features = ["perf"] }
 chrono = { version = "0.4.38", default-features = false, features = ["std", "alloc", "clock"], optional = true }
 reqwest = { version = "0.12.7", default-features = false, features = ["rustls-tls"] }
 futures = "0.3.30"
-reqwest-retry = "0.7.0"
+reqwest-retry = "0.6.1"
 reqwest-middleware = "0.3.3"
 rustc-hash = "2.0.0"
 http-link = "1.0.1"
-itertools = "0.14.0"
+itertools = "0.13.0"
 serde_json = "1.0.133"
 serde = "1.0.215"
 tokio-cron-scheduler = { version = "0.13.0", default-features = false, optional = true }

Dockerfile

@@ -15,7 +15,7 @@ RUN ~/.bun/bin/bun install
 RUN ~/.bun/bin/bun run build
 
 ### Build Cup ###
-FROM rust:1-alpine AS build
+FROM rust:1.80.1-alpine AS build
 
 # Requirements
 RUN apk add musl-dev

README.md

@@ -22,7 +22,7 @@ _If you like this project and/or use Cup, please consider starring the project
 
 ## Documentation 📘
 
-Take a look at https://cup.sergi0g.dev/docs!
+Take a look at https://sergi0g.github.io/cup/docs!
 
 ## Limitations
 
@@ -44,7 +44,7 @@ Here are some ideas to get you started:
 - Help optimize Cup and make it even better!
 - Add more features to the web UI
 
-For more information, check the [docs](https://cup.sergi0g.dev/docs/contributing)!
+For more information, check the [docs](https://sergi0g.github.io/cup/docs/contributing)!
 
 ## Support
 

docs/package.json

@@ -4,7 +4,7 @@
   "private": true,
   "scripts": {
     "dev": "next dev",
-    "build": "next build && pagefind --site out --output-path out/_pagefind",
+    "build": "next build",
     "start": "next start",
     "lint": "next lint",
     "fmt": "bun prettier --write ."
@@ -26,7 +26,6 @@
     "@types/react-dom": "^19.0.3",
     "eslint": "^9.18.0",
     "eslint-config-next": "15.1.5",
-    "pagefind": "^1.3.0",
     "postcss": "^8.5.1",
     "prettier": "^3.4.2",
     "prettier-plugin-tailwindcss": "^0.6.11",

docs/src/app/assets/GitHubIcon.tsx

@@ -0,0 +1,15 @@
+import React from "react";
+
+export function GitHubIcon({ className }: { className?: string | undefined }) {
+  return (
+    <svg
+      width="24"
+      height="24"
+      fill="currentColor"
+      viewBox="3 3 18 18"
+      className={className}
+    >
+      <path d="M12 3C7.0275 3 3 7.12937 3 12.2276C3 16.3109 5.57625 19.7597 9.15374 20.9824C9.60374 21.0631 9.77249 20.7863 9.77249 20.5441C9.77249 20.3249 9.76125 19.5982 9.76125 18.8254C7.5 19.2522 6.915 18.2602 6.735 17.7412C6.63375 17.4759 6.19499 16.6569 5.8125 16.4378C5.4975 16.2647 5.0475 15.838 5.80124 15.8264C6.51 15.8149 7.01625 16.4954 7.18499 16.7723C7.99499 18.1679 9.28875 17.7758 9.80625 17.5335C9.885 16.9337 10.1212 16.53 10.38 16.2993C8.3775 16.0687 6.285 15.2728 6.285 11.7432C6.285 10.7397 6.63375 9.9092 7.20749 9.26326C7.1175 9.03257 6.8025 8.08674 7.2975 6.81794C7.2975 6.81794 8.05125 6.57571 9.77249 7.76377C10.4925 7.55615 11.2575 7.45234 12.0225 7.45234C12.7875 7.45234 13.5525 7.55615 14.2725 7.76377C15.9937 6.56418 16.7475 6.81794 16.7475 6.81794C17.2424 8.08674 16.9275 9.03257 16.8375 9.26326C17.4113 9.9092 17.76 10.7281 17.76 11.7432C17.76 15.2843 15.6563 16.0687 13.6537 16.2993C13.98 16.5877 14.2613 17.1414 14.2613 18.0065C14.2613 19.2407 14.25 20.2326 14.25 20.5441C14.25 20.7863 14.4188 21.0746 14.8688 20.9824C16.6554 20.364 18.2079 19.1866 19.3078 17.6162C20.4077 16.0457 20.9995 14.1611 21 12.2276C21 7.12937 16.9725 3 12 3Z"></path>
+    </svg>
+  );
+}

docs/src/content/docs/community-resources/docker-compose.mdx

@@ -35,9 +35,9 @@ services:
       - /var/run/docker.sock:/var/run/docker.sock
 ```
 
-Cup can run with a non-root user, but needs to be in a docker group. Assuming user id of 1000 and `docker` group id of 999 you can add this to the `services.cup` key in the docker compose:
+This can be customized further of course, if you choose to use a different port, another config location, or would like to change something else.
+
+Cup can run with a non-root user, but needs to be in a docker group. Assuming user id of 1000 and `docker` group id of 999 you can add this to the docker compose:
 ```yaml
     user: "1000:999"
 ```
-
-The compose can be customized further of course, if you choose to use a different port, another config location, or would like to change something else. Have fun!

docs/src/content/docs/community-resources/homepage-widget.mdx

@@ -36,7 +36,7 @@ services:
       homepage.widget.mappings[1].field.metrics: up_to_date
       homepage.widget.mappings[1].format: number
       homepage.widget.mappings[2].label: Updates
-      homepage.widget.mappings[2].field.metrics: updates_available
+      homepage.widget.mappings[2].field.metrics: update_available
       homepage.widget.mappings[2].format: number
 ```
 
@@ -64,7 +64,7 @@ widget:
       label: Up to date
       format: number
     - field:
-        metrics: updates_available
+        metrics: update_available
       label: Available updates
       format: number
     - field:

docs/src/content/docs/configuration/agent.mdx

@@ -1,12 +0,0 @@
-# Agent mode
-
-If you'd like to have only the server API exposed without the dashboard, you can run Cup in agent mode.
-
-Modify your config like this:
-
-```jsonc
-{
-    "agent": true
-    // Other options
-}
-```

docs/src/content/docs/configuration/authentication.mdx

@@ -4,7 +4,7 @@ import { Callout } from "nextra/components";
 
 Some registries (or specific images) may require you to be authenticated. For those, you can modify `cup.json` like this:
 
-```jsonc
+```json
 {
   "registries": {
     "<YOUR_REGISTRY_DOMAIN_1>": {

docs/src/content/docs/configuration/automatic-refresh.mdx

@@ -1,12 +0,0 @@
-# Automatic refresh
-
-Cup can automatically refresh the results when running in server mode. Simply add this to your config:
-
-```jsonc
-{
-  "refresh_interval": "0 0,30 * 0 0" // Check twice an hour
-  // Other options
-}
-```
-
-You can use a cron expression to specify the refresh interval. The reference is [here](https://github.com/Hexagon/croner-rust#pattern)

docs/src/content/docs/configuration/ignore-registry.mdx

@@ -1,22 +0,0 @@
-# Ignored registries
-
-If you want to skip checking images from some registries, you can modify your config like this:
-
-```jsonc
-{
-  "registries": {
-    "<SOME_REGISTRY_DOMAIN_1>": {
-      "ignore": true
-      // Other options
-    },
-    "<SOME_REGISTRY_DOMAIN_2>" {
-      "ignore": false
-      // Other options
-    },
-    // ...
-  }
-  // Other options
-}
-```
-
-This configuration option is a bit redundant, since you can achieve the same with [this option](/docs/configuration/include-exclude-images). It's recommended to use that.

docs/src/content/docs/configuration/include-exclude-images.mdx

@@ -1,35 +0,0 @@
-# Include/Exclude images
-
-If you want to exclude some images (e.g. because they have too many tags and take too long to check), you can add the following to your config:
-
-```jsonc
-{
-  "images": {
-    "exclude": [
-        "ghcr.io/immich-app/immich-machine-learning",
-        "postgres:15"
-    ]
-    // ...
-  }
-  // Other options
-}
-```
-
-For an image to be excluded, it must start with one of the strings you specify above. That means you could use `ghcr.io` to exclude all images from ghcr.io or `ghcr.io/sergi0g` to exclude all my images (why would you do that?).
-
-
-If you want Cup to always check some extra images that aren't available locally, you can modify your config like this:
-```jsonc
-{
-  "images": {
-    "extra": [
-        "mysql:8.0",
-        "nextcloud:30"
-    ]
-    // ...
-  }
-  // Other options
-}
-```
-
-Note that you must specify images with version tags, otherwise Cup will exit with an error!

docs/src/content/docs/configuration/index.mdx

@@ -8,7 +8,7 @@ import {
   IconLockOpen,
   IconKey,
   IconPlug,
-  IconServer,
+  IconServer
 } from "@tabler/icons-react";
 
 # Configuration
@@ -71,21 +71,12 @@ Here's a full example:
 
 ```json
 {
-  "$schema": "https://raw.githubusercontent.com/sergi0g/cup/main/cup.schema.json",
+  "authentication": {
-  "version": 3,
+    "ghcr.io": "<YOUR_TOKEN_HERE>",
-  "images": {
+    "registry-1.docker.io": "<YOUR_TOKEN_HERE>"
-    "exclude": ["ghcr.io/immich-app/immich-machine-learning"],
-    "extra": ["ghcr.io/sergi0g/cup:v3.0.0"]
   },
-  "registries": {
+  "theme": "blue",
-    "myregistry.com": {
+  "insecure_registries": ["localhost:5000", "my-insecure-registry.example.com"]
-      "authentication": "<YOUR_TOKEN_HERE>"
-    }
-  },
-  "servers": {
-    "Raspberry Pi": "https://server.local:8000"
-  },
-  "theme": "blue"
 }
 ```
 

docs/src/content/docs/configuration/insecure-registries.mdx

@@ -8,7 +8,7 @@ To solve this problem, you can specify exceptions in your `cup.json`.
 
 Here's what it looks like:
 
-```jsonc
+```json
 {
   "registries": {
     "<INSECURE_REGISTRY_1>": {

docs/src/content/docs/configuration/servers.mdx

@@ -4,7 +4,7 @@ Besides checking for local image updates, you might want to be able to view upda
 
 Just add something like this to your config:
 
-```jsonc
+```json
 {
     "servers": {
         "Cool server 1": "http://your-other-server-running-cup:8000",

docs/src/content/docs/configuration/socket.mdx

@@ -1,8 +1,8 @@
-# Custom socket
+# Socket
 
 If you need to specify a custom Docker socket (e.g. because you're using Podman), you can use the `socket` option. Here's an example:
 
-```jsonc
+```json
 {
   "socket": "/run/user/1000/podman/podman.sock"
   // Other options
@@ -11,7 +11,7 @@ If you need to specify a custom Docker socket (e.g. because you're using Podman)
 
 You can also specify a TCP socket if you're using a remote Docker host or a [proxy](https://github.com/Tecnativa/docker-socket-proxy):
 
-```jsonc
+```json
 {
   "socket": "tcp://localhost:2375"
   // Other options

docs/src/content/docs/configuration/theme.mdx

@@ -21,7 +21,7 @@ Available options are `default` and `blue`.
 
 Here's an example:
 
-```jsonc
+```json
 {
   "theme": "blue"
   // Other options

docs/src/content/docs/index.mdx

@@ -15,7 +15,7 @@ Cup is a lightweight alternative to [What's up Docker?](https://github.com/getwu
 - Supports most registries, including Docker Hub, ghcr.io, Quay, lscr.io and even Gitea (or derivatives)
 - Doesn't exhaust any rate limits. This is the original reason I created Cup. It was inspired by [What's up docker?](https://github.com/getwud/wud) which would always use it up.
 - Beautiful CLI and web interface for checking on your containers any time.
-- The binary is tiny! At the time of writing it's just 5.4 MB. No more pulling 100+ MB docker images for a such a simple program.
+- The binary is tiny! At the time of writing it's just 5.1 MB. No more pulling 100+ MB docker images for a such a simple program.
 - JSON output for both the CLI and web interface so you can connect Cup to integrations. It's easy to parse and makes webhooks and pretty dashboards simple to set up!
 
 # Installation

docs/src/content/docs/usage/cli.mdx

@@ -12,52 +12,36 @@ Cup's CLI provides the `cup check` command.
 
 ```ansi
 $ cup check
-✓ Done!
+
-~ Local images
+mysql:8.0                                             Major update
- ╭─────────────────────────────────────────┬──────────────────────────────────┬─────────╮
+node:20                                               Major update
- │Reference                                │Status                            │Time (ms)│
+postgres:16-alpine                                    Major update
- ├─────────────────────────────────────────┼──────────────────────────────────┼─────────┤
+rust:1.80.1-alpine                                    Minor update
- │postgres:15-alpine                       │Major update (15 → 17)            │788      │
+redis:7.4.0                                           Patch update
- │ghcr.io/immich-app/immich-server:v1.118.2│Minor update (1.118.2 → 1.127.0)  │2294     │
+nginx:alpine                                      Update available
- │ollama/ollama:0.4.1                      │Minor update (0.4.1 → 0.5.12)     │533      │
+redis:alpine                                      Update available
- │adguard/adguardhome:v0.107.52            │Patch update (0.107.52 → 0.107.57)│1738     │
+ubuntu:latest                                     Update available
- │jc21/nginx-proxy-manager:latest          │Up to date                        │583      │
+node:iron                                               Up to date
- │louislam/uptime-kuma:1                   │Up to date                        │793      │
+2fauth/2fauth:latest                                    Up to date
- │moby/buildkit:buildx-stable-1            │Up to date                        │600      │
+c1982/sdns:latest                                       Up to date
- │tecnativa/docker-socket-proxy:latest     │Up to date                        │564      │
+registry.acme.com/acme-server:latest                       Unknown
- │ubuntu:latest                            │Up to date                        │585      │
+INFO  ✨ Checked 58 images in 3772ms
- │wagoodman/dive:latest                    │Up to date                        │585      │
- │rolebot:latest                           │Unknown                           │174      │
- ╰─────────────────────────────────────────┴──────────────────────────────────┴─────────╯
- INFO ✨ Checked 11 images in 8312ms
 ```
 
 ### Check for updates to specific images
 
 ```ansi
-$ cup check node:latest
+$ cup check node:latest
-✓ Done!
+node:latest                                       Update available
-~ Local images
+INFO  ✨ Checked 1 images in 1310ms
- ╭───────────┬────────────────┬─────────╮
- │Reference  │Status          │Time (ms)│
- ├───────────┼────────────────┼─────────┤
- │node:latest│Update available│788      │
- ╰───────────┴────────────────┴─────────╯
- INFO ✨ Checked 1 images in 310ms
 ```
 
 ```ansi
 $ cup check nextcloud:30 postgres:14 mysql:8.0
-✓ Done!
+nextcloud:30                                      Update available
-~ Local images
+postgres:14                                       Update available
- ╭────────────┬────────────────────────┬─────────╮
+mysql:8.0                                               Up to date
- │Reference   │Status                  │Time (ms)│
+INFO  ✨ Checked 3 images in 1769ms
- ├────────────┼────────────────────────┼─────────┤
- │postgres:14 │Major update (14 → 17)  │195      │
- │mysql:8.0   │Major update (8.0 → 9.2)│382      │
- │nextcloud:30│Up to date              │585      │
- ╰────────────┴────────────────────────┴─────────╯
- INFO ✨ Checked 3 images in 769ms
 ```
 
 ## Enable icons
@@ -78,8 +62,7 @@ $ cup check -r
 ```
 
 <Callout emoji="⚠️">
-  When parsing Cup's output, capture only `stdout`, otherwise you might not get
+When parsing Cup's output, capture only `stdout`, otherwise you might not get valid JSON (if there are warnings)
-  valid JSON (if there are warnings)
 </Callout>
 
 ## Usage with Docker

docs/src/content/docs/usage/index.mdx

@@ -7,7 +7,7 @@ import { Cards } from "nextra/components";
 
 # Usage
 
-You can use Cup in 2 different ways. As a CLI or as a server. You can learn more about each mode on its corresponding page
+You can use Cup in 2 different ways. As a CLI or as a server. You can learn more about each mode in its corresponding page
 
 <Cards>
   <Cards.Card icon={<IconTerminal />} title="CLI" href="/docs/usage/cli" />

src/check.rs

@@ -51,7 +51,10 @@ async fn get_remote_updates(ctx: &Context, client: &Client, refresh: bool) -> Ve
                     if let Some(updates) = json["images"].as_array() {
                         let mut server_updates: Vec<Update> = updates
                             .iter()
-                            .filter_map(|img| serde_json::from_value(img.clone()).ok())
+                            .filter_map(|img| match serde_json::from_value(img.clone()) {
+                                Ok(o) => o,
+                                Err(e) => {dbg!(e);None}
+                            })
                             .collect();
                         // Add server origin to each image
                         for update in &mut server_updates {
@@ -120,16 +123,6 @@ pub async fn get_updates(
         .iter()
         .map(|image| &image.parts.registry)
         .unique()
-        .filter(|&registry| match ctx.config.registries.get(registry) {
-            Some(config) => {
-                if config.ignore {
-                    false
-                } else {
-                    true
-                }
-            }
-            None => true,
-        })
         .collect::<Vec<&String>>();
 
     // Create request client. All network requests share the same client for better performance.
@@ -148,7 +141,7 @@ pub async fn get_updates(
 
     // Retrieve an authentication token (if required) for each registry.
     let mut tokens: FxHashMap<&str, Option<String>> = FxHashMap::default();
-    for registry in registries.clone() {
+    for registry in registries {
         let credentials = if let Some(registry_config) = ctx.config.registries.get(registry) {
             &registry_config.authentication
         } else {
@@ -173,11 +166,24 @@ pub async fn get_updates(
 
     ctx.logger.debug(format!("Tokens: {:?}", tokens));
 
+    let ignored_registries = ctx
+        .config
+        .registries
+        .iter()
+        .filter_map(|(registry, registry_config)| {
+            if registry_config.ignore {
+                Some(registry)
+            } else {
+                None
+            }
+        })
+        .collect::<Vec<&String>>();
+
     let mut handles = Vec::with_capacity(images.len());
 
     // Loop through images check for updates
     for image in &images {
-        let is_ignored = !registries.contains(&&image.parts.registry)
+        let is_ignored = ignored_registries.contains(&&image.parts.registry)
             || ctx
                 .config
                 .images

src/http.rs

@@ -95,10 +95,6 @@ impl Client {
                     let message = format!("{} {}: Connection timed out!", method, url);
                     self.ctx.logger.warn(&message);
                     Err(message)
-                } else if error.is_middleware() {
-                    let message = format!("{} {}: Connection failed after 3 retries!", method, url);
-                    self.ctx.logger.warn(&message);
-                    Err(message)
                 } else {
                     error!(
                         "{} {}: Unexpected error: {}",

src/utils/reference.rs

@@ -16,7 +16,7 @@ pub fn split(reference: &str) -> (String, String, String) {
             }
         }
     };
-    let splits = repository_and_tag.split('@').next().unwrap().split(':').collect::<Vec<&str>>();
+    let splits = repository_and_tag.split(':').collect::<Vec<&str>>();
     let (repository, tag) = match splits.len() {
         1 | 2 => {
             let repository_components = splits[0].split('/').collect::<Vec<&str>>();
@@ -38,7 +38,7 @@ pub fn split(reference: &str) -> (String, String, String) {
             };
             (repository, tag)
         }
-        _ => {dbg!(splits); panic!()},
+        _ => unreachable!(),
     };
     (registry.to_string(), repository, tag.to_string())
 }

web/index.html

@@ -225,16 +225,8 @@
               </div>
               <ul>
                 {% for server in server_ids %}
-                  <li class="mb-4 last:mb-0">
-                    <p
-                      class="my-4 text-lg font-semibold text-{{ theme }}-600 dark:text-{{ theme }}-400 px-6"
-                    >
                   {% if server == '' %}
-                        Local images
+                    <li class="mb-8 last:mb-0">
-                      {% else %}
-                        {{ server }}
-                      {% endif %}
-                    </p>
                       <ul
                         class="dark:divide-{{theme}}-900 divide-y dark:text-white"
                       >
@@ -258,7 +250,8 @@
                             </svg>
                             <span class="font-mono">{{ image.name }}</span>
                             {% case image.status %}
-                            {% when 'Up to date' %}
+                              {% when 'Up to
+                      date' %}
                                 <svg
                                   xmlns="http://www.w3.org/2000/svg"
                                   width="24"
@@ -292,7 +285,8 @@
                                 {% case image.status %}
                                   {% when 'Major update' %}
                                     {% assign color = 'text-red-500' %}
-                                {% when 'Minor update' %}
+                                  {% when 'Minor
+                      update' %}
                                     {% assign color = 'text-yellow-500' %}
                                   {% else %}
                                     {% assign color = 'text-blue-500' %}
@@ -316,6 +310,97 @@
                         {% endfor %}
                       </ul>
                     </li>
+                  {% else %}
+                    <li class="mb-4 last:mb-0">
+                      <p
+                        class="my-4 text-lg font-semibold text-{{ theme }}-600 dark:text-{{ theme }}-400 px-6"
+                      >
+                        {{ server }}
+                      </p>
+                      <ul
+                        class="dark:divide-{{ theme }}-900 divide-y dark:text-white"
+                      >
+                        {% for image in servers[server] %}
+                          <li
+                            class="flex items-center gap-4 break-all px-6 py-4 text-start hover:bg-{{ theme }}-100 hover:dark:bg-{{ theme }}-900/50 transition-colors duration-200"
+                          >
+                            <svg
+                              xmlns="http://www.w3.org/2000/svg"
+                              width="24"
+                              height="24"
+                              viewBox="0 0 24 24"
+                              fill="none"
+                              stroke="currentColor"
+                              stroke-width="2"
+                              stroke-linecap="round"
+                              stroke-linejoin="round"
+                              class="size-6 shrink-0"
+                            >
+                              <path d="M21 8a2 2 0 0 0-1-1.73l-7-4a2 2 0 0 0-2 0l-7 4A2 2 0 0 0 3 8v8a2 2 0 0 0 1 1.73l7 4a2 2 0 0 0 2 0l7-4A2 2 0 0 0 21 16Z"/><path d="m3.3 7 8.7 5 8.7-5"/><path d="M12 22V12"/>
+                            </svg>
+                            {{ image.name }}
+                            {% case image.status %}
+                              {% when 'Up to
+                      date' %}
+                                <svg
+                                  xmlns="http://www.w3.org/2000/svg"
+                                  width="24"
+                                  height="24"
+                                  viewBox="0 0 24 24"
+                                  fill="none"
+                                  stroke="currentColor"
+                                  stroke-width="2"
+                                  stroke-linecap="round"
+                                  stroke-linejoin="round"
+                                  class="ml-auto text-green-500"
+                                >
+                                  <circle cx="12" cy="12" r="10"/><path d="m9 12 2 2 4-4"/>
+                                </svg>
+                              {% when 'Unknown' %}
+                                <svg
+                                  xmlns="http://www.w3.org/2000/svg"
+                                  width="24"
+                                  height="24"
+                                  viewBox="0 0 24 24"
+                                  fill="none"
+                                  stroke="currentColor"
+                                  stroke-width="2"
+                                  stroke-linecap="round"
+                                  stroke-linejoin="round"
+                                  class="text-{{ theme }}-500 ml-auto"
+                                >
+                                  <circle cx="12" cy="12" r="10"/><path d="M9.09 9a3 3 0 0 1 5.83 1c0 2-3 3-3 3"/><path d="M12 17h.01"/>
+                                </svg>
+                              {% else %}
+                                {% case image.status %}
+                                  {% when 'Major update' %}
+                                    {% assign color = 'text-red-500' %}
+                                  {% when 'Minor
+                      update' %}
+                                    {% assign color = 'text-yellow-500' %}
+                                  {% else %}
+                                    {% assign color = 'text-blue-500' %}
+                                {% endcase %}
+                                <svg
+                                  xmlns="http://www.w3.org/2000/svg"
+                                  width="24"
+                                  height="24"
+                                  viewBox="0 0 24 24"
+                                  fill="none"
+                                  stroke="currentColor"
+                                  stroke-width="2"
+                                  stroke-linecap="round"
+                                  stroke-linejoin="round"
+                                  class="ml-auto {{ color }}"
+                                >
+                                  <circle cx="12" cy="12" r="10"/><path d="m16 12-4-4-4 4"/><path d="M12 16V8"/>
+                                </svg>
+                            {% endcase %}
+                          </li>
+                        {% endfor %}
+                      </ul>
+                    </li>
+                  {% endif %}
                 {% endfor %}
               </ul>
             </div>

web/package.json

@@ -13,6 +13,7 @@
   "dependencies": {
     "@headlessui/react": "^2.1.10",
     "@radix-ui/react-tooltip": "^1.1.2",
+    "caniuse-lite": "^1.0.30001698",
     "clsx": "^2.1.1",
     "date-fns": "^3.6.0",
     "lucide-react": "^0.475.0",

web/src/components/Image.tsx

@@ -38,7 +38,6 @@ export default function Image({ data }: { data: Image }) {
     data.result.info?.type == "version"
       ? data.reference.split(":")[0] + ":" + data.result.info.new_tag
       : data.reference;
-  const info = getInfo(data)!;
   let url: string | null = null;
   if (clickable_registries.includes(data.parts.registry)) {
     switch (data.parts.registry) {
@@ -58,12 +57,7 @@ export default function Image({ data }: { data: Image }) {
         >
           <Box className={`size-6 shrink-0 text-${theme}-500`} />
           <span className="font-mono">{data.reference}</span>
-          <WithTooltip
+          <Icon data={data} />
-            text={info.description}
-            className={`ml-auto size-6 shrink-0 ${info.color}`}
-          >
-            <info.icon />
-          </WithTooltip>
         </li>
       </button>
       <Dialog open={open} onClose={setOpen} className="relative z-10">
@@ -119,8 +113,7 @@ export default function Image({ data }: { data: Image }) {
                   </button>
                 </div>
                 <div className="flex items-center gap-3">
-                  <info.icon className={`size-6 shrink-0 ${info.color}`} />
+                  <DialogIcon data={data} />
-                  {info.description}
                 </div>
                 <div className="flex items-center gap-3">
                   <Timer className="size-6 shrink-0 text-gray-500" />
@@ -171,54 +164,118 @@ export default function Image({ data }: { data: Image }) {
   );
 }
 
-function getInfo(data: Image):
+function Icon({ data }: { data: Image }) {
-  | {
-      color: string;
-      icon: typeof HelpCircle;
-      description: string;
-    }
-  | undefined {
   switch (data.result.has_update) {
     case null:
-      return {
+      return (
-        color: "text-gray-500",
+        <WithTooltip
-        icon: HelpCircle,
+          text="Unknown"
-        description: "Unknown",
+          className="ml-auto size-6 shrink-0 text-gray-500"
-      };
+        >
+          <HelpCircle />
+        </WithTooltip>
+      );
     case false:
-      return {
+      return (
-        color: "text-green-500",
+        <WithTooltip
-        icon: CircleCheck,
+          text="Up to date"
-        description: "Up to date",
+          className="ml-auto size-6 shrink-0 text-green-500"
-      };
+        >
+          <CircleCheck />
+        </WithTooltip>
+      );
     case true:
       if (data.result.info?.type === "version") {
         switch (data.result.info.version_update_type) {
           case "major":
-            return {
+            return (
-              color: "text-red-500",
+              <WithTooltip
-              icon: CircleArrowUp,
+                text="Major Update"
-              description: "Major update",
+                className="ml-auto size-6 shrink-0 text-red-500"
-            };
+              >
+                <CircleArrowUp />
+              </WithTooltip>
+            );
           case "minor":
-            return {
+            return (
-              color: "text-yellow-500",
+              <WithTooltip
-              icon: CircleArrowUp,
+                text="Minor Update"
-              description: "Minor update",
+                className="ml-auto size-6 shrink-0 text-yellow-500"
-            };
+              >
+                <CircleArrowUp />
+              </WithTooltip>
+            );
           case "patch":
-            return {
+            return (
-              color: "text-blue-500",
+              <WithTooltip
-              icon: CircleArrowUp,
+                text="Patch Update"
-              description: "Patch update",
+                className="ml-auto size-6 shrink-0 text-blue-500"
-            };
+              >
+                <CircleArrowUp />
+              </WithTooltip>
+            );
         }
       } else if (data.result.info?.type === "digest") {
-        return {
+        return (
-          color: "text-blue-500",
+          <WithTooltip
-          icon: CircleArrowUp,
+            text="Update available"
-          description: "Update available",
+            className="ml-auto size-6 shrink-0 text-blue-500"
-        };
+          >
+            <CircleArrowUp />
+          </WithTooltip>
+        );
+      }
+  }
+}
+
+function DialogIcon({ data }: { data: Image }) {
+  switch (data.result.has_update) {
+    case null:
+      return (
+        <>
+          <HelpCircle className="size-6 shrink-0 text-gray-500" />
+          Unknown
+        </>
+      );
+    case false:
+      return (
+        <>
+          <CircleCheck className="size-6 shrink-0 text-green-500" />
+          Up to date
+        </>
+      );
+    case true:
+      if (data.result.info?.type === "version") {
+        switch (data.result.info.version_update_type) {
+          case "major":
+            return (
+              <>
+                <CircleArrowUp className="size-6 shrink-0 text-red-500" />
+                Major update
+              </>
+            );
+          case "minor":
+            return (
+              <>
+                <CircleArrowUp className="size-6 shrink-0 text-yellow-500" />
+                Minor update
+              </>
+            );
+          case "patch":
+            return (
+              <>
+                <CircleArrowUp className="size-6 shrink-0 text-blue-500" />
+                Patch update
+              </>
+            );
+        }
+      } else if (data.result.info?.type === "digest") {
+        return (
+          <>
+            <CircleArrowUp className="size-6 shrink-0 text-blue-500" />
+            Update available
+          </>
+        );
       }
   }
 }

web/src/components/Loading.tsx

@@ -1,7 +1,7 @@
 import { Data } from "../types";
 import Logo from "./Logo";
 import { theme } from "../theme";
-import { LoaderCircle } from "lucide-react";
+import { RefreshCw } from "lucide-react";
 
 export default function Loading({ onLoad }: { onLoad: (data: Data) => void }) {
   fetch(
@@ -26,16 +26,9 @@ export default function Loading({ onLoad }: { onLoad: (data: Data) => void }) {
             <Logo />
           </div>
           <div
-            className={`flex flex-col h-full items-center justify-center gap-1 text-${theme}-500 dark:text-${theme}-400`}
+            className={`flex h-full items-center justify-center gap-1 text-${theme}-500 dark:text-${theme}-400`}
           >
-            <div className="flex gap-1 mb-8">
+            Loading <RefreshCw className="animate-spin" />
-              Loading <LoaderCircle className="animate-spin" />
-            </div>
-            <p>
-              If this takes more than a few seconds, there was probably a
-              problem fetching the data. Please try reloading the page and
-              report a bug if the problem persists.
-            </p>
           </div>
         </div>
       </div>

web/src/components/RefreshButton.tsx

@@ -21,7 +21,7 @@ export default function RefreshButton() {
   };
   return (
     <WithTooltip text="Reload">
-      <button className="group shrink-0" onClick={refresh} disabled={disabled}>
+      <button className="group" onClick={refresh} disabled={disabled}>
         <svg
           xmlns="http://www.w3.org/2000/svg"
           width="24"
@@ -32,7 +32,7 @@ export default function RefreshButton() {
           strokeWidth="2"
           strokeLinecap="round"
           strokeLinejoin="round"
-          className="size-6 group-disabled:animate-spin"
+          className="shrink-0 group-disabled:animate-spin"
         >
           <path stroke="none" d="M0 0h24v24H0z" fill="none" />
           <path d="M4,11A8.1,8.1 0 0 1 19.5,9M20,5v4h-4" />