chore: bump project version

Fixes #81

.github/actions/build-image/Dockerfile

@@ -0,0 +1,13 @@
+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
+EXPOSE 8000
+ENTRYPOINT ["/cup"]

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

@@ -0,0 +1,52 @@
+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 }}
+        labels: ${{ steps.meta.outputs.labels }}
+        cache-from: type=gha
+        cache-to: type=gha,mode=max

.github/workflows/nightly.yml

@@ -62,38 +62,25 @@ jobs:
             cup-linux-arm64
 
   build-image:
-    needs: get-tag
+    needs:
+      - get-tag
+      - build-binaries
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-
-      - 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
+      - uses: ./.github/actions/build-image
         with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          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
+          tags: |
+            ${{ needs.get-tag.outputs.tag }}
+          gh-token: ${{ secrets.GITHUB_TOKEN }}
 
   nightly-release:
     runs-on: ubuntu-latest
-    needs: [build-binaries, get-tag]
+    needs:
+      - get-tag
+      - build-binaries
+      - build-image
     steps:
       - name: Download binaries
         uses: actions/download-artifact@v4

.github/workflows/release.yml

@@ -60,34 +60,19 @@ jobs:
             cup-linux-arm64
 
   build-image:
-    needs: get-tag
+    needs:
+      - get-tag
+      - build-binaries
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-
-      - 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
+      - uses: ./.github/actions/build-image
         with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          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 }},ghcr.io/sergi0g/cup:latest
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
+          tags: |
+            ${{ needs.get-tag.outputs.tag }}
+            latest
+          gh-token: ${{ secrets.GITHUB_TOKEN }}
 
   release:
     runs-on: ubuntu-latest

Cargo.toml

@@ -1,15 +1,15 @@
 [package]
 name = "cup"
-version = "3.0.0"
+version = "3.2.2"
 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.5.0", optional = true }
+xitca-web = { version = "0.6.2", optional = true }
 liquid = { version = "0.26.6", optional = true }
-bollard = "0.16.1"
+bollard = "0.18.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.6.1"
+reqwest-retry = "0.7.0"
 reqwest-middleware = "0.3.3"
 rustc-hash = "2.0.0"
 http-link = "1.0.1"
-itertools = "0.13.0"
+itertools = "0.14.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.80.1-alpine AS build
+FROM rust:1-alpine AS build
 
 # Requirements
 RUN apk add musl-dev
@@ -39,4 +39,5 @@ FROM scratch
 # Copy binary
 COPY --from=build /cup/target/release/cup /cup
 
+EXPOSE 8000
 ENTRYPOINT ["/cup"]

README.md

@@ -1,5 +1,13 @@
 # Cup 🥤
 
+![GitHub License](https://img.shields.io/github/license/sergi0g/cup)
+![CI Status](https://img.shields.io/github/actions/workflow/status/sergi0g/cup/.github%2Fworkflows%2Fci.yml?label=CI)
+![GitHub last commit](https://img.shields.io/github/last-commit/sergi0g/cup)
+![GitHub Release](https://img.shields.io/github/v/release/sergi0g/cup)
+![GitHub Issues or Pull Requests](https://img.shields.io/github/issues/sergi0g/cup)
+[![Discord](https://img.shields.io/discord/1337705080518086658)](https://discord.gg/jmh5ctzwNG)
+
+
 Cup is the easiest way to check for container image updates.
 
 ![Cup web in dark mode](screenshots/web_dark.png)
@@ -15,20 +23,20 @@ _If you like this project and/or use Cup, please consider starring the project
 
 - Extremely fast. Cup takes full advantage of your CPU and is hightly optimized, resulting in lightning fast speed. On my Raspberry Pi 5, it took 3.7 seconds for 58 images!
 - 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.
+- Doesn't exhaust any rate limits. This is the original reason I created Cup. I feel that this feature is especially relevant now with [Docker Hub reducing its pull limits for unauthenticated users](https://docs.docker.com/docker-hub/usage/).
 - 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.1 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.4 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!
 
 ## Documentation 📘
 
-Take a look at https://sergi0g.github.io/cup/docs!
+Take a look at https://cup.sergi0g.dev/docs!
 
 ## Limitations
 
 Cup is a work in progress. It might not have as many features as other alternatives. If one of these features is really important for you, please consider using another tool.
 
-- Cup cannot directly trigger your integrations. If you want that to happen automatically, please use What's up Docker instead. Cup was created to be simple. The data is there, and it's up to you to retrieve it (e.g. by running `cup check -r` with a cronjob or periodically requesting the `/json` url from the server).
+- Cup cannot directly trigger your integrations. If you want that to happen automatically, please use What's up Docker instead. Cup was created to be simple. The data is there, and it's up to you to retrieve it (e.g. by running `cup check -r` with a cronjob or periodically requesting the `/api/v3/json` url from the server).
 
 ## Roadmap
 Take a sneak peek at what's coming up in future releases on the [roadmap](https://github.com/users/sergi0g/projects/2)!
@@ -44,11 +52,11 @@ 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://sergi0g.github.io/cup/docs/contributing)!
+For more information, check the [docs](https://cup.sergi0g.dev/docs/contributing)!
 
 ## Support
 
-If you have any questions about Cup, feel free to ask in the [discussions](https://github.com/sergi0g/cup/discussions)!
+If you have any questions about Cup, feel free to ask in the [discussions](https://github.com/sergi0g/cup/discussions)! You can also join our [discord server](https://discord.gg/jmh5ctzwNG).
 
 If you find a bug, or want to propose a feature, search for it in the [issues](https://github.com/sergi0g/cup/issues). If there isn't already an open issue, please open one.
 

docs/package.json

@@ -4,7 +4,7 @@
   "private": true,
   "scripts": {
     "dev": "next dev",
-    "build": "next build",
+    "build": "next build && pagefind --site out --output-path out/_pagefind",
     "start": "next start",
     "lint": "next lint",
     "fmt": "bun prettier --write ."
@@ -12,7 +12,7 @@
   "dependencies": {
     "@tabler/icons-react": "^3.29.0",
     "geist": "^1.3.1",
-    "next": "15.1.5",
+    "next": "15.2.3",
     "nextra": "^4.1.0",
     "nextra-theme-docs": "^4.1.0",
     "react": "^19.0.0",
@@ -26,6 +26,7 @@
     "@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

@@ -1,15 +0,0 @@
-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/app/components/Card.tsx

@@ -10,12 +10,12 @@ export function Card({
   description: string;
 }) {
   return (
-    <div>
-      <Icon className="text-black size-7 dark:text-white inline mr-2" />
+    <div className="p-4 bg-white dark:bg-black group">
+      <Icon className="text-black size-7 group-hover:size-9 dark:text-white inline mr-2 transition-[width,height] duration-200" />
       <span className="align-middle text-2xl font-bold text-black dark:text-white">
         {name}
       </span>
-      <p className="text-2xl font-semibold text-neutral-500 dark:text-neutral-500">
+      <p className="text-xl font-semibold text-neutral-500 dark:text-neutral-500">
         {description}
       </p>
     </div>

docs/src/app/components/CopyableCode.tsx

@@ -1,28 +0,0 @@
-"use client";
-
-import { IconCopy, IconCopyCheck } from "@tabler/icons-react";
-import { useState } from "react";
-
-export default function CopyableCode({ children }: { children: string }) {
-  const [success, setSuccess] = useState(false);
-  const handleClick = () => {
-    navigator.clipboard.writeText(children);
-    setSuccess(true);
-    setTimeout(() => setSuccess(false), 3000);
-  };
-  return (
-    <div className="relative rounded-md xl:w-auto">
-      <button
-        className="hover:bg-black/10 dark:hover:bg-black/60 flex w-full items-center justify-center gap-4 rounded-md border border-black/10 bg-black/5 px-8 py-3 font-mono text-sm font-medium text-black/70 transition-colors duration-200 md:px-10 md:py-3 md:text-base md:leading-6 dark:border-white/15 dark:bg-black dark:text-gray-300 backdrop-blur-md"
-        onClick={handleClick}
-      >
-        {children}
-        {success ? (
-          <IconCopyCheck className="stroke-black/40 dark:stroke-white/50" />
-        ) : (
-          <IconCopy className="stroke-black/40 dark:stroke-white/50" />
-        )}
-      </button>
-    </div>
-  );
-}

docs/src/app/components/GridPattern.tsx

@@ -8,7 +8,7 @@ export function GridPattern() {
   return (
     <svg
       aria-hidden="true"
-      className="pointer-events-none absolute inset-0 bottom-0 left-0 right-0 top-0 -z-10 h-full w-full stroke-neutral-200 dark:stroke-neutral-600/30"
+      className="pointer-events-none absolute inset-0 bottom-0 left-0 right-0 top-0 h-full w-full -z-10 bg-white stroke-neutral-200 dark:stroke-white/10 dark:bg-black"
     >
       <defs>
         <pattern
@@ -22,7 +22,6 @@ export function GridPattern() {
           <path
             d={`M.5 ${SIZE}V.5H${SIZE}`}
             fill="none"
-            strokeDasharray={"4 2"}
           />
         </pattern>
       </defs>

docs/src/app/components/Section.tsx

@@ -1,28 +0,0 @@
-import { ReactNode } from "react";
-import { GradientText } from "./GradientText";
-
-export function Section({
-  title,
-  className,
-  children,
-}: {
-  title: string;
-  className: string;
-  children: ReactNode;
-}) {
-  return (
-    <div className="border-t border-t-neutral-300 bg-neutral-50 py-32 dark:border-t-neutral-600/30 dark:bg-neutral-950">
-      <div className="mx-auto w-full max-w-screen-xl">
-        <GradientText
-          text={title}
-          className="mx-auto mb-20 w-fit text-center text-4xl font-bold tracking-tighter"
-          innerClassName={className}
-          blur={12}
-        />
-        <div className="m-2 grid w-full auto-cols-fr gap-20 lg:grid-cols-3">
-          {children}
-        </div>
-      </div>
-    </div>
-  );
-}

docs/src/app/components/pages/home.tsx

@@ -1,29 +1,28 @@
 import React from "react";
-import "./styles.css"
+import "./styles.css";
 
-import CopyableCode from "../CopyableCode";
 import { Browser } from "../Browser";
 import { Card } from "../Card";
 import {
   IconAdjustments,
   IconArrowRight,
+  IconBarrierBlockOff,
   IconBolt,
-  IconBraces,
-  IconDevices,
   IconFeather,
-  IconLockCheck,
+  IconGitMerge,
+  IconPuzzle,
+  IconServer,
+  IconTerminal,
 } from "@tabler/icons-react";
 import { GitHubIcon } from "nextra/icons";
 import { GridPattern } from "../GridPattern";
 import { GradientText } from "../GradientText";
-import { Section } from "../Section";
-import { Steps } from "nextra/components";
 import Link from "next/link";
 
 export default async function Home() {
   return (
     <>
-      <div className="relative home">
+      <div className="relative home bg-radial-[ellipse_at_center] from-transparent from-20% to-white dark:to-black">
         <GridPattern />
         <div className="px-4 pt-16 pb-8 sm:pt-24 lg:px-8">
           <div className="flex w-full flex-col items-center justify-between">
@@ -37,7 +36,7 @@ export default async function Home() {
                   blur={30}
                 />
               </h1>
-              <h3 className="mx-auto mt-6 max-w-3xl text-center text-xl leading-tight font-medium text-gray-400">
+              <h3 className="mx-auto mt-6 max-w-3xl text-center text-xl leading-tight font-medium text-neutral-500 dark:text-neutral-400">
                 Cup is a small utility with a big impact. Simplify your
                 container management workflow with fast and efficient update
                 checking, a full-featured CLI and web interface, and more.
@@ -54,7 +53,7 @@ export default async function Home() {
               <a
                 href="https://github.com/sergi0g/cup"
                 target="_blank"
-                className="hide-focus h-full text-nowrap border border-neutral-400 transition-colors duration-200 ease-in-out hover:border-neutral-600 focus:border-neutral-600 dark:border-neutral-600 hover:dark:border-neutral-400 hover:dark:shadow-sm hover:dark:shadow-neutral-600 focus:dark:border-neutral-400"
+                className="hide-focus h-full bg-white dark:bg-black text-nowrap border border-black/15 transition-colors duration-200 ease-in-out hover:border-black/40 dark:border-white/15 hover:dark:border-white/40 hover:dark:shadow-sm focus:dark:border-white/30"
               >
                 Star on GitHub
                 <GitHubIcon className="ml-auto size-4 md:size-5" />
@@ -66,68 +65,49 @@ export default async function Home() {
           <Browser />
         </div>
       </div>
-      <Section
-        title="Powerful at its core."
-        className="bg-gradient-to-r from-red-500 to-amber-500"
-      >
+      <div className="bg-white dark:bg-black py-12 px-8 w-full">
+        <div className="flex h-full w-full items-center justify-center">
+          <div className="grid md:grid-cols-2 md:grid-rows-4 lg:grid-cols-4 lg:grid-rows-2 w-full max-w-7xl gap-px border border-transparent bg-black/10 dark:bg-white/10">
             <Card
-          name="100% Safe Code"
-          icon={IconLockCheck}
-          description="Built with safe Rust and Typescript to ensure security and reliability."
-        />
-        <Card
-          name="Lightning Fast Performance"
+              name="Built for speed."
               icon={IconBolt}
-          description="Heavily optimized to squeeze out every last drop of performance. Each release is extensively benchmarked and profiled so that you'll never have to stare at a loading spinner for long."
+              description="Cup is written in Rust and every release goes through extensive profiling to squeeze out every last drop of performance."
             />
             <Card
-          name="Lightweight"
-          icon={IconFeather}
-          description="No runtimes or libraries are needed. All you need is the 5.1 MB static binary that works out of the box on any system."
-        />
-      </Section>
-      <Section
-        title="Efficient, yet flexible."
-        className="bg-gradient-to-r from-blue-500 to-indigo-500"
-      >
-        <Card
-          name="JSON output"
-          description="Connect Cup to your favorite intergrations with JSON output for the CLI and an API for the server. Now go make that cool dashboard you've been dreaming of!"
-          icon={IconBraces}
-        />
-        <Card
-          name="Both CLI and web interface"
-          description="Whether you prefer the command line or the web, Cup runs wherever you choose."
-          icon={IconDevices}
-        />
-        <Card
-          name="Configurable"
-          description="The simple configuration file provides you with all the tools you need to specify a custom Docker socket, manage registry connection options, choose a theme for the web interface and more."
+              name="Configurable."
               icon={IconAdjustments}
+              description="Make Cup yours with the extensive configuration options available. Customize and tailor it to your needs."
+            />
+            <Card
+              name="Extend it."
+              icon={IconPuzzle}
+              description="JSON output enables you to connect Cup with your favorite integrations, build automations and more."
+            />
+            <Card
+              name="CLI available."
+              icon={IconTerminal}
+              description="Do you like terminals? Cup has a CLI. Check for updates quickly without spinning up a server."
+            />
+            <Card
+              name="Multiple servers."
+              icon={IconServer}
+              description="Run multiple Cup instances and effortlessly check on them through one web interface."
+            />
+            <Card
+              name="Unstoppable."
+              icon={IconBarrierBlockOff}
+              description="Cup is designed to check for updates without using up any rate limits. 10 images per hour won't be a problem, even with 100 images."
+            />
+            <Card
+              name="Lightweight."
+              icon={IconFeather}
+              description="No need for a powerful server and endless storage. The tiny 5.4 MB binary won't hog your CPU and memory."
+            />
+            <Card
+              name="Open source."
+              icon={IconGitMerge}
+              description="All source code is publicly available in our GitHub repository. We're looking for contributors!"
             />
-      </Section>
-      <div className="relative py-24 border-t border-t-neutral-300 dark:border-t-neutral-600/30 text-black dark:text-white">
-        <GridPattern />
-        <div className="mx-auto flex w-full max-w-screen-xl flex-col items-center">
-          <p className="mb-8 text-center text-3xl font-bold">
-            Still not convinced? Try it out now!
-          </p>
-          <div>
-            <Steps>
-              <h3 className="mb-2">Open a terminal and run</h3>
-              <CopyableCode>
-                docker run --rm -t -v /var/run/docker.sock:/var/run/docker.sock
-                -p 8000:8000 ghcr.io/sergi0g/cup serve
-              </CopyableCode>
-              <h3 className="mb-2">Open the dashboard in your browser</h3>
-              <p>
-                Visit{" "}
-                <a href="http://localhost:8000" className="underline">
-                  http://localhost:8000
-                </a>{" "}
-                in your browser to try it out!
-              </p>
-            </Steps>
           </div>
         </div>
       </div>

docs/src/app/layout.tsx

@@ -20,7 +20,7 @@ const logo = (
 );
 
 const navbar = (
-  <Navbar logo={logo} projectLink="https://github.com/sergi0g/cup">
+  <Navbar logo={logo} projectLink="https://github.com/sergi0g/cup" chatLink="https://discord.gg/jmh5ctzwNG">
     <ThemeSwitch lite className="cursor-pointer" />
   </Navbar>
 );
@@ -45,7 +45,7 @@ export default async function RootLayout({
           navbar={navbar}
           pageMap={await getPageMap()}
           footer={footer}
-          docsRepositoryBase="https://github.com/sergi0g/cup"
+          docsRepositoryBase="https://github.com/sergi0g/cup/blob/main/docs"
         >
           <div>{children}</div>
         </Layout>

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

@@ -1,3 +1,5 @@
+import { Callout } from "nextra/components";
+
 # Docker Compose
 
 Many users find it useful to run Cup with Docker Compose, as it enables them to have it constantly running in the background and easily control it. Cup's lightweight resource use makes it ideal for this use case.
@@ -35,9 +37,13 @@ services:
       - /var/run/docker.sock:/var/run/docker.sock
 ```
 
-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:
+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:
 ```yaml
     user: "1000:999"
 ```
+
+<Callout>
+You can use the command `getent group docker | cut -d: -f3` to find the group id for the docker group.
+</Callout>
+
+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/home-assistant.mdx

@@ -0,0 +1,47 @@
+import Image from "next/image";
+
+import screenshot from "@/app/assets/ha-cup-component.png";
+
+# Home Assistant integration
+
+Many thanks to [@bastgau](https://github.com/bastgau) for creating this integration.
+
+## About
+
+The **HA Cup Component** integration for Home Assistant allows you to retrieve update statistics for Docker containers directly from your Home Assistant interface.
+
+With this integration, you can easily track the status of your Docker containers and receive notifications when updates are available.
+
+The following sensors are currently implemented:
+
+<Image
+  src={screenshot}
+  alt="Screenshot of Home Assistant showing a card with update information provided by Cup"
+/>
+
+## Installation
+
+### Via HACS
+
+1. Open Home Assistant and go to HACS
+2. Navigate to "Integrations" and click on "Add a custom repository".
+3. Use https://github.com/bastgau/ha-cup-component as the URL
+4. Search for "HA Cup Component" and install it.
+5. Restart Home Assistant.
+
+### One-click install
+
+[![Open your Home Assistant instance and start setting up a new integration.](https://my.home-assistant.io/badges/config_flow_start.svg)](https://my.home-assistant.io/redirect/hacs_repository/?owner=bastgau&repository=ha-cup-component&category=Integration)
+
+### Manual Installation
+
+1. Download the integration files from the GitHub repository.
+2. Place the integration folder in the custom_components directory of Home Assistant.
+3. Restart Home Assistant.
+
+## Support & Contributions
+
+If you encounter any issues or wish to contribute to improving this integration, feel free to open an issue or a pull request in the [GitHub repository](https://github.com/bastgau/ha-cup-component).
+
+Support the author:
+[!["Buy Me A Coffee"](https://www.buymeacoffee.com/assets/img/custom_images/orange_img.png)](https://www.buymeacoffee.com/bastgau)

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: update_available
+      homepage.widget.mappings[2].field.metrics: updates_available
       homepage.widget.mappings[2].format: number
 ```
 
@@ -64,7 +64,7 @@ widget:
       label: Up to date
       format: number
     - field:
-        metrics: update_available
+        metrics: updates_available
       label: Available updates
       format: number
     - field:

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

@@ -0,0 +1,12 @@
+# 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:
 
-```json
+```jsonc
 {
   "registries": {
     "<YOUR_REGISTRY_DOMAIN_1>": {

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

@@ -0,0 +1,12 @@
+# 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 * * * *" // 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

@@ -0,0 +1,22 @@
+# 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

@@ -0,0 +1,35 @@
+# 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,12 +71,21 @@ Here's a full example:
 
 ```json
 {
-  "authentication": {
-    "ghcr.io": "<YOUR_TOKEN_HERE>",
-    "registry-1.docker.io": "<YOUR_TOKEN_HERE>"
+  "$schema": "https://raw.githubusercontent.com/sergi0g/cup/main/cup.schema.json",
+  "version": 3,
+  "images": {
+    "exclude": ["ghcr.io/immich-app/immich-machine-learning"],
+    "extra": ["ghcr.io/sergi0g/cup:v3.0.0"]
   },
-  "theme": "blue",
-  "insecure_registries": ["localhost:5000", "my-insecure-registry.example.com"]
+  "registries": {
+    "myregistry.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:
 
-```json
+```jsonc
 {
   "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:
 
-```json
+```jsonc
 {
     "servers": {
         "Cool server 1": "http://your-other-server-running-cup:8000",

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

@@ -1,8 +1,8 @@
-# Socket
+# Custom 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:
 
-```json
+```jsonc
 {
   "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):
 
-```json
+```jsonc
 {
   "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:
 
-```json
+```jsonc
 {
   "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.1 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.4 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/integrations.mdx

@@ -1,5 +1,5 @@
 import { Callout, Cards } from "nextra/components";
-import { IconServer, IconTerminal } from "@tabler/icons-react"
+import { IconServer, IconTerminal } from "@tabler/icons-react";
 
 # Integrations
 
@@ -34,6 +34,7 @@ The data returned from the API or from the CLI is in JSON and looks like this:
                 "repository": "sergi0g/cup",
                 "tag": "latest",
             },
+            "url": "https://github.com/sergi0g/cup", // The URL specified in the "org.opencontainers.image.url" label, otherwise null
             "result": {
                 "has_update": true, // `true` when an image has an update of any kind, `false` when up to date and `null` when unknown.
                 "info": {
@@ -77,3 +78,7 @@ For retrieving the above data, refer to the CLI and server pages:
         href="/docs/usage/server"
     />
 </Cards>
+
+## Refresh Cup
+
+If you'd like to fetch the latest information, you can manually trigger a refresh by making a `GET` request to the `/api/v3/refresh` endpoint. Once the request completes, you can fetch the data as described above.

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

@@ -12,36 +12,52 @@ Cup's CLI provides the `cup check` command.
 
 ```ansi
 $ cup check
-
-mysql:8.0                                             Major update
-node:20                                               Major update
-postgres:16-alpine                                    Major update
-rust:1.80.1-alpine                                    Minor update
-redis:7.4.0                                           Patch update
-nginx:alpine                                      Update available
-redis:alpine                                      Update available
-ubuntu:latest                                     Update available
-node:iron                                               Up to date
-2fauth/2fauth:latest                                    Up to date
-c1982/sdns:latest                                       Up to date
-registry.acme.com/acme-server:latest                       Unknown
-INFO  ✨ Checked 58 images in 3772ms
+✓ Done!
+~ Local images
+ ╭─────────────────────────────────────────┬──────────────────────────────────┬─────────╮
+ │Reference                                │Status                            │Time (ms)│
+ ├─────────────────────────────────────────┼──────────────────────────────────┼─────────┤
+ │postgres:15-alpine                       │Major update (15 → 17)            │788      │
+ │ghcr.io/immich-app/immich-server:v1.118.2│Minor update (1.118.2 → 1.127.0)  │2294     │
+ │ollama/ollama:0.4.1                      │Minor update (0.4.1 → 0.5.12)     │533      │
+ │adguard/adguardhome:v0.107.52            │Patch update (0.107.52 → 0.107.57)│1738     │
+ │jc21/nginx-proxy-manager:latest          │Up to date                        │583      │
+ │louislam/uptime-kuma:1                   │Up to date                        │793      │
+ │moby/buildkit:buildx-stable-1            │Up to date                        │600      │
+ │tecnativa/docker-socket-proxy:latest     │Up to date                        │564      │
+ │ubuntu:latest                            │Up to date                        │585      │
+ │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
-node:latest                                       Update available
-INFO  ✨ Checked 1 images in 1310ms
+$ cup check node:latest
+✓ Done!
+~ Local images
+ ╭───────────┬────────────────┬─────────╮
+ │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
-nextcloud:30                                      Update available
-postgres:14                                       Update available
-mysql:8.0                                               Up to date
-INFO  ✨ Checked 3 images in 1769ms
+✓ Done!
+~ Local images
+ ╭────────────┬────────────────────────┬─────────╮
+ │Reference   │Status                  │Time (ms)│
+ ├────────────┼────────────────────────┼─────────┤
+ │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
@@ -62,7 +78,8 @@ $ cup check -r
 ```
 
 <Callout emoji="⚠️">
-When parsing Cup's output, capture only `stdout`, otherwise you might not get valid JSON (if there are warnings)
+  When parsing Cup's output, capture only `stdout`, otherwise you might not get
+  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 in 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 on its corresponding page
 
 <Cards>
   <Cards.Card icon={<IconTerminal />} title="CLI" href="/docs/usage/cli" />

src/check.rs

@@ -17,7 +17,7 @@ async fn get_remote_updates(ctx: &Context, client: &Client, refresh: bool) -> Ve
 
     let handles: Vec<_> = ctx.config.servers
         .iter()
-        .map(|(name, url)| async {
+        .map(|(name, url)| async move {
             let base_url = if url.starts_with("http://") || url.starts_with("https://") {
                 format!("{}/api/v3/", url.trim_end_matches('/'))
             } else {
@@ -26,7 +26,7 @@ async fn get_remote_updates(ctx: &Context, client: &Client, refresh: bool) -> Ve
             let json_url = base_url.clone() + "json";
             if refresh {
                 let refresh_url = base_url + "refresh";
-                match client.get(&(&refresh_url), vec![], false).await {
+                match client.get(&refresh_url, &[], false).await {
                     Ok(response) => {
                         if response.status() != 200 {
                             ctx.logger.warn(format!("GET {}: Failed to refresh server. Server returned invalid response code: {}", refresh_url, response.status()));
@@ -40,13 +40,14 @@ async fn get_remote_updates(ctx: &Context, client: &Client, refresh: bool) -> Ve
                 }
 
             }
-            match client.get(&json_url, vec![], false).await {
+            match client.get(&json_url, &[], false).await {
                 Ok(response) => {
                     if response.status() != 200 {
                         ctx.logger.warn(format!("GET {}: Failed to fetch updates from server. Server returned invalid response code: {}", json_url, response.status()));
                         return Vec::new();
                     }
                     let json = parse_json(&get_response_body(response).await);
+                    ctx.logger.debug(format!("JSON response for {}: {}", name, json));
                     if let Some(updates) = json["images"].as_array() {
                         let mut server_updates: Vec<Update> = updates
                             .iter()
@@ -57,6 +58,7 @@ async fn get_remote_updates(ctx: &Context, client: &Client, refresh: bool) -> Ve
                             update.server = Some(name.clone());
                             update.status = update.get_status();
                         }
+                        ctx.logger.debug(format!("Updates for {}: {:#?}", name, server_updates));
                         return server_updates;
                     }
 
@@ -79,20 +81,29 @@ async fn get_remote_updates(ctx: &Context, client: &Client, refresh: bool) -> Ve
 
 /// Returns a list of updates for all images passed in.
 pub async fn get_updates(
-    references: &Option<Vec<String>>,
+    references: &Option<Vec<String>>, // If a user requested _specific_ references to be checked, this will have a value
     refresh: bool,
     ctx: &Context,
 ) -> Vec<Update> {
     let client = Client::new(ctx);
 
+    // Merge references argument with references from config
+    let all_references = match &references {
+        Some(refs) => {
+            refs.clone().extend_from_slice(&ctx.config.images.extra);
+            refs
+        }
+        None => &ctx.config.images.extra,
+    };
+
     // Get local images
     ctx.logger.debug("Retrieving images to be checked");
     let mut images = get_images_from_docker_daemon(ctx, references).await;
 
     // Add extra images from references
-    if let Some(refs) = references {
+    if !all_references.is_empty() {
         let image_refs: FxHashSet<&String> = images.iter().map(|image| &image.reference).collect();
-        let extra = refs
+        let extra = all_references
             .iter()
             .filter(|&reference| !image_refs.contains(reference))
             .map(|reference| Image::from_reference(reference))
@@ -118,6 +129,16 @@ 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.
@@ -136,7 +157,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 {
+    for registry in registries.clone() {
         let credentials = if let Some(registry_config) = ctx.config.registries.get(registry) {
             &registry_config.authentication
         } else {
@@ -161,24 +182,11 @@ 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 = ignored_registries.contains(&&image.parts.registry)
+        let is_ignored = !registries.contains(&&image.parts.registry)
             || ctx
                 .config
                 .images

src/docker.rs

@@ -42,7 +42,26 @@ pub async fn get_images_from_docker_daemon(
     references: &Option<Vec<String>>,
 ) -> Vec<Image> {
     let client: Docker = create_docker_client(ctx.config.socket.as_deref());
-    match references {
+    let mut swarm_images = match client.list_services::<String>(None).await {
+        Ok(services) => services
+            .iter()
+            .filter_map(|service| match &service.spec {
+                Some(service_spec) => match &service_spec.task_template {
+                    Some(task_spec) => match &task_spec.container_spec {
+                        Some(container_spec) => match &container_spec.image {
+                            Some(image) => Image::from_inspect_data(ctx, image),
+                            None => None,
+                        },
+                        None => None,
+                    },
+                    None => None,
+                },
+                None => None,
+            })
+            .collect(),
+        Err(_) => Vec::new(),
+    };
+    let mut local_images = match references {
         Some(refs) => {
             let mut inspect_handles = Vec::with_capacity(refs.len());
             for reference in refs {
@@ -56,7 +75,7 @@ pub async fn get_images_from_docker_daemon(
                 .collect();
             inspects
                 .iter()
-                .filter_map(|inspect| Image::from_inspect_data(inspect.clone()))
+                .filter_map(|inspect| Image::from_inspect_data(ctx, inspect.clone()))
                 .collect()
         }
         None => {
@@ -68,8 +87,10 @@ pub async fn get_images_from_docker_daemon(
             };
             images
                 .iter()
-                .filter_map(|image| Image::from_inspect_data(image.clone()))
-                .collect()
-        }
+                .filter_map(|image| Image::from_inspect_data(ctx, image.clone()))
+                .collect::<Vec<Image>>()
         }
+    };
+    local_images.append(&mut swarm_images);
+    local_images
 }

src/http.rs

@@ -42,7 +42,7 @@ impl Client {
         &self,
         url: &str,
         method: RequestMethod,
-        headers: Vec<(&str, Option<&str>)>,
+        headers: &[(&str, Option<&str>)],
         ignore_401: bool,
     ) -> Result<Response, String> {
         let mut request = match method {
@@ -51,7 +51,7 @@ impl Client {
         };
         for (name, value) in headers {
             if let Some(v) = value {
-                request = request.header(name, v)
+                request = request.header(*name, *v)
             }
         }
         match request.send().await {
@@ -95,6 +95,10 @@ 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: {}",
@@ -110,7 +114,7 @@ impl Client {
     pub async fn get(
         &self,
         url: &str,
-        headers: Vec<(&str, Option<&str>)>,
+        headers: &[(&str, Option<&str>)],
         ignore_401: bool,
     ) -> Result<Response, String> {
         self.request(url, RequestMethod::GET, headers, ignore_401)
@@ -120,7 +124,7 @@ impl Client {
     pub async fn head(
         &self,
         url: &str,
-        headers: Vec<(&str, Option<&str>)>,
+        headers: &[(&str, Option<&str>)],
     ) -> Result<Response, String> {
         self.request(url, RequestMethod::HEAD, headers, false).await
     }

src/registry.rs

@@ -22,7 +22,7 @@ use crate::{
 pub async fn check_auth(registry: &str, ctx: &Context, client: &Client) -> Option<String> {
     let protocol = get_protocol(registry, &ctx.config.registries);
     let url = format!("{}://{}/v2/", protocol, registry);
-    let response = client.get(&url, Vec::new(), true).await;
+    let response = client.get(&url, &[], true).await;
     match response {
         Ok(response) => {
             let status = response.status();
@@ -57,9 +57,9 @@ pub async fn get_latest_digest(
         protocol, &image.parts.registry, &image.parts.repository, &image.parts.tag
     );
     let authorization = to_bearer_string(&token);
-    let headers = vec![("Accept", Some("application/vnd.docker.distribution.manifest.list.v2+json, application/vnd.docker.distribution.manifest.v2+json, application/vnd.oci.image.index.v1+json")), ("Authorization", authorization.as_deref())];
+    let headers = [("Accept", Some("application/vnd.docker.distribution.manifest.list.v2+json, application/vnd.docker.distribution.manifest.v2+json, application/vnd.oci.image.index.v1+json")), ("Authorization", authorization.as_deref())];
 
-    let response = client.head(&url, headers).await;
+    let response = client.head(&url, &headers).await;
     let time = start.elapsed().unwrap().as_millis() as u32;
     ctx.logger.debug(format!(
         "Checked for digest update to {} in {}ms",
@@ -95,7 +95,7 @@ pub async fn get_latest_digest(
 }
 
 pub async fn get_token(
-    images: &Vec<&Image>,
+    images: &[&Image],
     auth_url: &str,
     credentials: &Option<String>,
     client: &Client,
@@ -105,9 +105,9 @@ pub async fn get_token(
         url = format!("{}&scope=repository:{}:pull", url, image.parts.repository);
     }
     let authorization = credentials.as_ref().map(|creds| format!("Basic {}", creds));
-    let headers = vec![("Authorization", authorization.as_deref())];
+    let headers = [("Authorization", authorization.as_deref())];
 
-    let response = client.get(&url, headers, false).await;
+    let response = client.get(&url, &headers, false).await;
     let response_json = match response {
         Ok(response) => parse_json(&get_response_body(response).await),
         Err(_) => error!("GET {}: Request failed!", url),
@@ -131,7 +131,7 @@ pub async fn get_latest_tag(
         protocol, &image.parts.registry, &image.parts.repository,
     );
     let authorization = to_bearer_string(&token);
-    let headers = vec![
+    let headers = [
         ("Accept", Some("application/json")),
         ("Authorization", authorization.as_deref()),
     ];
@@ -147,7 +147,7 @@ pub async fn get_latest_tag(
         ));
         let (new_tags, next) = match get_extra_tags(
             &next_url.unwrap(),
-            headers.clone(),
+            &headers,
             base,
             &image.version_info.as_ref().unwrap().format_str,
             client,
@@ -205,18 +205,21 @@ pub async fn get_latest_tag(
                 }
             }
         }
-        None => unreachable!("{:?}", tags),
+        None => error!(
+            "Image {} has no remote version tags! Local tag: {}",
+            image.reference, image.parts.tag
+        ),
     }
 }
 
 pub async fn get_extra_tags(
     url: &str,
-    headers: Vec<(&str, Option<&str>)>,
+    headers: &[(&str, Option<&str>)],
     base: &Version,
     format_str: &str,
     client: &Client,
 ) -> Result<(Vec<Version>, Option<String>), String> {
-    let response = client.get(url, headers, false).await;
+    let response = client.get(url, &headers, false).await;
 
     match response {
         Ok(res) => {

src/server.rs

@@ -8,6 +8,7 @@ use tokio::sync::Mutex;
 use tokio_cron_scheduler::{Job, JobScheduler};
 use xitca_web::{
     body::ResponseBody,
+    bytes::Bytes,
     error::Error,
     handler::{handler_service, path::PathRef, state::StateRef},
     http::{StatusCode, WebResponse},
@@ -19,6 +20,7 @@ use xitca_web::{
 use crate::{
     check::get_updates,
     config::Theme,
+    error,
     structs::update::Update,
     utils::{
         json::{to_full_json, to_simple_json},
@@ -31,9 +33,9 @@ use crate::{
 const HTML: &str = include_str!("static/index.html");
 const JS: &str = include_str!("static/assets/index.js");
 const CSS: &str = include_str!("static/assets/index.css");
-const FAVICON_ICO: &[u8] = include_bytes!("static/favicon.ico");
-const FAVICON_SVG: &[u8] = include_bytes!("static/favicon.svg");
-const APPLE_TOUCH_ICON: &[u8] = include_bytes!("static/apple-touch-icon.png");
+const FAVICON_ICO: Bytes = Bytes::from_static(include_bytes!("static/favicon.ico"));
+const FAVICON_SVG: Bytes = Bytes::from_static(include_bytes!("static/favicon.svg"));
+const APPLE_TOUCH_ICON: Bytes = Bytes::from_static(include_bytes!("static/apple-touch-icon.png"));
 
 const SORT_ORDER: [&str; 8] = [
     "monitored_images",
@@ -55,13 +57,24 @@ pub async fn serve(port: &u16, ctx: &Context) -> std::io::Result<()> {
     if let Some(interval) = &ctx.config.refresh_interval {
         scheduler
             .add(
-                Job::new_async(interval, move |_uuid, _lock| {
+                match Job::new_async(interval, move |_uuid, _lock| {
                     let data_copy = data_copy.clone();
                     Box::pin(async move {
                         data_copy.lock().await.refresh().await;
                     })
-                })
-                .unwrap(),
+                }) {
+                    Ok(job) => job,
+                    Err(e) => match e {
+                        tokio_cron_scheduler::JobSchedulerError::ParseSchedule => error!(
+                            "Failed to parse cron schedule: {}. Please ensure it is valid!",
+                            interval
+                        ),
+                        e => error!(
+                            "An unexpected error occured while scheduling automatic refresh: {}",
+                            e
+                        ),
+                    },
+                },
             )
             .await
             .unwrap();
@@ -79,10 +92,14 @@ pub async fn serve(port: &u16, ctx: &Context) -> std::io::Result<()> {
             .at("/", get(handler_service(_static)))
             .at("/*", get(handler_service(_static)));
     }
-    app_builder
+    match app_builder
         .enclosed_fn(logger)
         .serve()
-        .bind(format!("0.0.0.0:{}", port))?
+        .bind(format!("0.0.0.0:{}", port))
+    {
+        Ok(r) => r,
+        Err(_) => error!("Failed to bind to port {}. Is it in use?", port),
+    }
     .run()
     .wait()
 }

src/structs/image.rs

@@ -35,6 +35,7 @@ pub struct VersionInfo {
 pub struct Image {
     pub reference: String,
     pub parts: Parts,
+    pub url: Option<String>,
     pub digest_info: Option<DigestInfo>,
     pub version_info: Option<VersionInfo>,
     pub error: Option<String>,
@@ -43,16 +44,30 @@ pub struct Image {
 
 impl Image {
     /// Creates and populates the fields of an Image object based on the ImageSummary from the Docker daemon
-    pub fn from_inspect_data<T: InspectData>(image: T) -> Option<Self> {
+    pub fn from_inspect_data<T: InspectData>(ctx: &Context, image: T) -> Option<Self> {
         let tags = image.tags().unwrap();
         let digests = image.digests().unwrap();
         if !tags.is_empty() && !digests.is_empty() {
             let reference = tags[0].clone();
+            if reference.contains('@') {
+                return None; // As far as I know, references that contain @ are either manually pulled by the user or automatically created because of swarm. In the first case AFAICT we can't know what tag was originally pulled, so we'd have to make assumptions and I've decided to remove this. The other case is already handled seperately, so this also ensures images aren't displayed twice, once with and once without a digest.
+            };
             let (registry, repository, tag) = split(&reference);
             let version_tag = Version::from_tag(&tag);
             let local_digests = digests
                 .iter()
-                .map(|digest| digest.split('@').collect::<Vec<&str>>()[1].to_string())
+                .filter_map(
+                    |digest| match digest.split('@').collect::<Vec<&str>>().get(1) {
+                        Some(digest) => Some(digest.to_string()),
+                        None => {
+                            ctx.logger.warn(format!(
+                                "Ignoring invalid digest {} for image {}!",
+                                digest, reference
+                            ));
+                            None
+                        }
+                    },
+                )
                 .collect();
             Some(Self {
                 reference,
@@ -61,6 +76,7 @@ impl Image {
                     repository,
                     tag,
                 },
+                url: image.url(),
                 digest_info: Some(DigestInfo {
                     local_digests,
                     remote_digest: None,
@@ -141,6 +157,7 @@ impl Image {
         Update {
             reference: self.reference.clone(),
             parts: self.parts.clone(),
+            url: self.url.clone(),
             result: UpdateResult {
                 has_update: has_update.to_option_bool(),
                 info: match has_update {

src/structs/inspectdata.rs

@@ -1,26 +1,62 @@
 use bollard::secret::{ImageInspect, ImageSummary};
 
 pub trait InspectData {
-    fn tags(&self) -> Option<&Vec<String>>;
-    fn digests(&self) -> Option<&Vec<String>>;
+    fn tags(&self) -> Option<Vec<String>>;
+    fn digests(&self) -> Option<Vec<String>>;
+    fn url(&self) -> Option<String>;
 }
 
 impl InspectData for ImageInspect {
-    fn tags(&self) -> Option<&Vec<String>> {
-        self.repo_tags.as_ref()
+    fn tags(&self) -> Option<Vec<String>> {
+        self.repo_tags.clone()
     }
 
-    fn digests(&self) -> Option<&Vec<String>> {
-        self.repo_digests.as_ref()
+    fn digests(&self) -> Option<Vec<String>> {
+        self.repo_digests.clone()
+    }
+
+    fn url(&self) -> Option<String> {
+        match &self.config {
+            Some(config) => match &config.labels {
+                Some(labels) => labels.get("org.opencontainers.image.url").cloned(),
+                None => None,
+            },
+            None => None,
+        }
     }
 }
 
 impl InspectData for ImageSummary {
-    fn tags(&self) -> Option<&Vec<String>> {
-        Some(&self.repo_tags)
+    fn tags(&self) -> Option<Vec<String>> {
+        Some(self.repo_tags.clone())
     }
 
-    fn digests(&self) -> Option<&Vec<String>> {
-        Some(&self.repo_digests)
+    fn digests(&self) -> Option<Vec<String>> {
+        Some(self.repo_digests.clone())
+    }
+
+    fn url(&self) -> Option<String> {
+        self.labels.get("org.opencontainers.image.url").cloned()
+    }
+}
+
+impl InspectData for &String {
+    fn tags(&self) -> Option<Vec<String>> {
+        self.split('@').next().map(|tag| vec![tag.to_string()])
+    }
+
+    fn digests(&self) -> Option<Vec<String>> {
+        match self.split_once('@') {
+            Some((reference, digest)) => Some(vec![format!(
+                "{}@{}",
+                reference.split(':').next().unwrap(),
+                digest
+            )]),
+            None => Some(vec![]),
+        }
+    }
+
+    fn url(&self) -> Option<String> {
+        None
     }
 }

src/structs/status.rs

@@ -1,8 +1,7 @@
 use std::fmt::Display;
 
 /// Enum for image status
-#[derive(Ord, Eq, PartialEq, PartialOrd, Clone)]
-#[cfg_attr(test, derive(Debug))]
+#[derive(Ord, Eq, PartialEq, PartialOrd, Clone, Debug)]
 pub enum Status {
     UpdateMajor,
     UpdateMinor,

src/structs/update.rs

@@ -2,11 +2,12 @@ use serde::{ser::SerializeStruct, Deserialize, Serialize};
 
 use super::{parts::Parts, status::Status};
 
-#[derive(Serialize, Deserialize, Clone)]
-#[cfg_attr(test, derive(PartialEq, Debug, Default))]
+#[derive(Serialize, Deserialize, Clone, Debug)]
+#[cfg_attr(test, derive(PartialEq, Default))]
 pub struct Update {
     pub reference: String,
     pub parts: Parts,
+    pub url: Option<String>,
     pub result: UpdateResult,
     pub time: u32,
     pub server: Option<String>,
@@ -14,16 +15,16 @@ pub struct Update {
     pub status: Status,
 }
 
-#[derive(Serialize, Deserialize, Clone)]
-#[cfg_attr(test, derive(PartialEq, Debug, Default))]
+#[derive(Serialize, Deserialize, Clone, Debug)]
+#[cfg_attr(test, derive(PartialEq, Default))]
 pub struct UpdateResult {
     pub has_update: Option<bool>,
     pub info: UpdateInfo,
     pub error: Option<String>,
 }
 
-#[derive(Serialize, Deserialize, Clone)]
-#[cfg_attr(test, derive(PartialEq, Debug, Default))]
+#[derive(Serialize, Deserialize, Clone, Debug)]
+#[cfg_attr(test, derive(PartialEq, Default))]
 #[serde(untagged)]
 pub enum UpdateInfo {
     #[cfg_attr(test, default)]
@@ -32,8 +33,8 @@ pub enum UpdateInfo {
     Digest(DigestUpdateInfo),
 }
 
-#[derive(Deserialize, Clone)]
-#[cfg_attr(test, derive(PartialEq, Debug))]
+#[derive(Deserialize, Clone, Debug)]
+#[cfg_attr(test, derive(PartialEq))]
 pub struct VersionUpdateInfo {
     pub version_update_type: String,
     pub new_tag: String,
@@ -41,8 +42,8 @@ pub struct VersionUpdateInfo {
     pub new_version: String,
 }
 
-#[derive(Deserialize, Clone)]
-#[cfg_attr(test, derive(PartialEq, Debug))]
+#[derive(Deserialize, Clone, Debug)]
+#[cfg_attr(test, derive(PartialEq))]
 pub struct DigestUpdateInfo {
     pub local_digests: Vec<String>,
     pub remote_digest: Option<String>,
@@ -53,10 +54,12 @@ impl Serialize for VersionUpdateInfo {
     where
         S: serde::Serializer,
     {
-        let mut state = serializer.serialize_struct("VersionUpdateInfo", 3)?;
+        let mut state = serializer.serialize_struct("VersionUpdateInfo", 5)?;
         let _ = state.serialize_field("type", "version");
         let _ = state.serialize_field("version_update_type", &self.version_update_type);
         let _ = state.serialize_field("new_tag", &self.new_tag);
+        let _ = state.serialize_field("current_version", &self.current_version);
+        let _ = state.serialize_field("new_version", &self.new_version);
         state.end()
     }
 }

src/structs/version.rs

@@ -49,18 +49,24 @@ impl Version {
                         positions.push((major.start(), major.end()));
                         match major.as_str().parse() {
                             Ok(m) => m,
-                            Err(_) => return None
+                            Err(_) => return None,
                         }
                     }
                     None => return None,
                 };
                 let minor: Option<u32> = c.name("minor").map(|minor| {
                     positions.push((minor.start(), minor.end()));
-                    minor.as_str().parse().unwrap_or_else(|_| panic!("Minor version invalid in tag {}", tag))
+                    minor
+                        .as_str()
+                        .parse()
+                        .unwrap_or_else(|_| panic!("Minor version invalid in tag {}", tag))
                 });
                 let patch: Option<u32> = c.name("patch").map(|patch| {
                     positions.push((patch.start(), patch.end()));
-                    patch.as_str().parse().unwrap_or_else(|_| panic!("Patch version invalid in tag {}", tag))
+                    patch
+                        .as_str()
+                        .parse()
+                        .unwrap_or_else(|_| panic!("Patch version invalid in tag {}", tag))
                 });
                 let mut format_str = tag.to_string();
                 positions.reverse();

src/utils/reference.rs

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

src/utils/request.rs

@@ -17,8 +17,10 @@ pub fn parse_www_authenticate(www_auth: &str) -> String {
                 .fold(String::new(), |acc, (key, value)| {
                     if *key == "realm" {
                         acc.to_owned() + value.as_escaped() + "?"
-                    } else {
+                    } else if value.unescaped_len() != 0 {
                         format!("{}&{}={}", acc, key, value.as_escaped())
+                    } else {
+                        acc
                     }
                 })
         } else {

web/.tool-versions

@@ -1 +0,0 @@
-nodejs 22.8.0

web/index.html

@@ -3,6 +3,7 @@
   <head>
     <meta charset="utf8">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
+    <meta name="color-scheme" content="light dark">
     {% if theme == 'neutral' %}
       <meta
         name="theme-color"
@@ -26,9 +27,9 @@
         content="#030712"
       >
     {% endif %}
-    <link rel="icon" type="image/svg+xml" href="favicon.svg">
-    <link rel="icon" type="image/x-icon" href="favicon.ico">
-    <link rel="apple-touch-icon" href="apple-touch-icon.png">
+    <link rel="icon" type="image/svg+xml" href="./favicon.svg">
+    <link rel="icon" type="image/x-icon" href="./favicon.ico">
+    <link rel="apple-touch-icon" href="./apple-touch-icon.png">
     <title>Cup</title>
   </head>
   <body>
@@ -225,8 +226,16 @@
               </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 == '' %}
-                    <li class="mb-8 last:mb-0">
+                        Local images
+                      {% else %}
+                        {{ server }}
+                      {% endif %}
+                    </p>
                     <ul
                       class="dark:divide-{{theme}}-900 divide-y dark:text-white"
                     >
@@ -250,8 +259,7 @@
                           </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"
@@ -285,8 +293,7 @@
                               {% 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' %}
@@ -310,97 +317,6 @@
                       {% 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,7 +13,6 @@
   "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/App.tsx

@@ -24,6 +24,7 @@ const SORT_ORDER = [
 function App() {
   const [data, setData] = useState<Data | null>(null);
   const [searchQuery, setSearchQuery] = useState("");
+
   if (!data) return <Loading onLoad={setData} />;
   return (
     <div
@@ -63,13 +64,15 @@ function App() {
               <LastChecked datetime={data.last_updated} />
               <RefreshButton />
             </div>
+            <div className="flex gap-2 px-6 text-black dark:text-white">
               <Search onChange={setSearchQuery} />
+            </div>
             <ul>
               {Object.entries(
                 data.images.reduce<Record<string, typeof data.images>>(
                   (acc, image) => {
                     const server = image.server ?? "";
-                    if (!acc[server]) acc[server] = [];
+                    if (!Object.hasOwn(acc, server)) acc[server] = [];
                     acc[server].push(image);
                     return acc;
                   },

web/src/components/Badge.tsx

@@ -0,0 +1,14 @@
+import { ArrowRight } from "lucide-react";
+import { theme } from "../theme";
+
+export default function Badge({ from, to }: { from: string; to: string }) {
+  return (
+    <span
+      className={`inline-flex items-center rounded-full bg-${theme}-50 px-2 py-1 text-xs font-medium text-${theme}-700 ring-1 ring-inset ring-${theme}-700/10 dark:bg-${theme}-400/10 dark:text-${theme}-400 dark:ring-${theme}-400/30 break-keep`}
+    >
+      {from}
+      <ArrowRight className="size-3" />
+      {to}
+    </span>
+  );
+}

web/src/components/CodeBlock.tsx

@@ -21,6 +21,8 @@ export function CodeBlock({
     };
   };
 
+  const copyText = children instanceof Array ? children.join("") : children;
+
   return (
     <div
       className={`group relative flex w-full items-center rounded-lg bg-${theme}-100 px-3 py-2 font-mono text-${theme}-700 dark:bg-${theme}-950 dark:text-${theme}-300`}
@@ -35,7 +37,7 @@ export function CodeBlock({
         ) : (
           <button
             className={`duration-50 absolute right-3 bg-${theme}-100 py-1 pl-2 opacity-0 transition-opacity group-hover:opacity-100 dark:bg-${theme}-950`}
-            onClick={handleCopy(`docker pull ${children}`)}
+            onClick={handleCopy(`${copyText}`)}
           >
             <Clipboard className="size-5" />
           </button>

web/src/components/Image.tsx

@@ -18,6 +18,7 @@ import {
   TriangleAlert,
   X,
 } from "lucide-react";
+import Badge from "./Badge";
 
 const clickable_registries = [
   "registry-1.docker.io",
@@ -38,8 +39,11 @@ 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)) {
+  if (data.url) {
+    url = data.url;
+  } else if (clickable_registries.includes(data.parts.registry)) {
     switch (data.parts.registry) {
       case "registry-1.docker.io":
         url = `https://hub.docker.com/r/${data.parts.repository}`;
@@ -57,7 +61,20 @@ export default function Image({ data }: { data: Image }) {
         >
           <Box className={`size-6 shrink-0 text-${theme}-500`} />
           <span className="font-mono">{data.reference}</span>
-          <Icon data={data} />
+          <div className="ml-auto flex gap-2">
+            {data.result.info?.type === "version" ? (
+              <Badge
+                from={data.result.info.current_version}
+                to={data.result.info.new_version}
+              />
+            ) : null}
+            <WithTooltip
+              text={info.description}
+              className={`size-6 shrink-0 ${info.color}`}
+            >
+              <info.icon />
+            </WithTooltip>
+          </div>
         </li>
       </button>
       <Dialog open={open} onClose={setOpen} className="relative z-10">
@@ -76,14 +93,14 @@ export default function Image({ data }: { data: Image }) {
               >
                 <div className="mb-4 flex items-center gap-3">
                   <Box className={`size-6 shrink-0 text-${theme}-500`} />
-                  <DialogTitle className="font-mono text-black dark:text-white">
+                  <DialogTitle className="break-all font-mono text-black dark:text-white">
                     {url ? (
                       <>
                         <a
                           href={url}
                           target="_blank"
                           rel="noopener noreferrer"
-                          className={`group w-fit text-black hover:underline dark:text-white`}
+                          className={`group w-fit hover:underline`}
                         >
                           <span>
                             {data.reference}
@@ -113,7 +130,8 @@ export default function Image({ data }: { data: Image }) {
                   </button>
                 </div>
                 <div className="flex items-center gap-3">
-                  <DialogIcon data={data} />
+                  <info.icon className={`size-6 shrink-0 ${info.color}`} />
+                  {info.description}
                 </div>
                 <div className="flex items-center gap-3">
                   <Timer className="size-6 shrink-0 text-gray-500" />
@@ -164,118 +182,54 @@ export default function Image({ data }: { data: Image }) {
   );
 }
 
-function Icon({ data }: { data: Image }) {
+function getInfo(data: Image):
+  | {
+      color: string;
+      icon: typeof HelpCircle;
+      description: string;
+    }
+  | undefined {
   switch (data.result.has_update) {
     case null:
-      return (
-        <WithTooltip
-          text="Unknown"
-          className="ml-auto size-6 shrink-0 text-gray-500"
-        >
-          <HelpCircle />
-        </WithTooltip>
-      );
+      return {
+        color: "text-gray-500",
+        icon: HelpCircle,
+        description: "Unknown",
+      };
     case false:
-      return (
-        <WithTooltip
-          text="Up to date"
-          className="ml-auto size-6 shrink-0 text-green-500"
-        >
-          <CircleCheck />
-        </WithTooltip>
-      );
+      return {
+        color: "text-green-500",
+        icon: CircleCheck,
+        description: "Up to date",
+      };
     case true:
       if (data.result.info?.type === "version") {
         switch (data.result.info.version_update_type) {
           case "major":
-            return (
-              <WithTooltip
-                text="Major Update"
-                className="ml-auto size-6 shrink-0 text-red-500"
-              >
-                <CircleArrowUp />
-              </WithTooltip>
-            );
+            return {
+              color: "text-red-500",
+              icon: CircleArrowUp,
+              description: "Major update",
+            };
           case "minor":
-            return (
-              <WithTooltip
-                text="Minor Update"
-                className="ml-auto size-6 shrink-0 text-yellow-500"
-              >
-                <CircleArrowUp />
-              </WithTooltip>
-            );
+            return {
+              color: "text-yellow-500",
+              icon: CircleArrowUp,
+              description: "Minor update",
+            };
           case "patch":
-            return (
-              <WithTooltip
-                text="Patch Update"
-                className="ml-auto size-6 shrink-0 text-blue-500"
-              >
-                <CircleArrowUp />
-              </WithTooltip>
-            );
+            return {
+              color: "text-blue-500",
+              icon: CircleArrowUp,
+              description: "Patch update",
+            };
         }
       } else if (data.result.info?.type === "digest") {
-        return (
-          <WithTooltip
-            text="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
-          </>
-        );
+        return {
+          color: "text-blue-500",
+          icon: CircleArrowUp,
+          description: "Update available",
+        };
       }
   }
 }

web/src/components/Loading.tsx

@@ -1,12 +1,12 @@
 import { Data } from "../types";
 import Logo from "./Logo";
 import { theme } from "../theme";
-import { RefreshCw } from "lucide-react";
+import { LoaderCircle } from "lucide-react";
 
 export default function Loading({ onLoad }: { onLoad: (data: Data) => void }) {
   fetch(
     process.env.NODE_ENV === "production"
-      ? "/api/v3/json"
+      ? "./api/v3/json"
       : `http://${window.location.hostname}:8000/api/v3/json`,
   ).then((response) =>
     response.json().then((data) => {
@@ -26,9 +26,16 @@ export default function Loading({ onLoad }: { onLoad: (data: Data) => void }) {
             <Logo />
           </div>
           <div
-            className={`flex h-full items-center justify-center gap-1 text-${theme}-500 dark:text-${theme}-400`}
+            className={`flex h-full flex-col items-center justify-center gap-1 text-${theme}-500 dark:text-${theme}-400`}
           >
-            Loading <RefreshCw className="animate-spin" />
+            <div className="mb-8 flex gap-1">
+              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" onClick={refresh} disabled={disabled}>
+      <button className="group shrink-0" 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="shrink-0 group-disabled:animate-spin"
+          className="size-6 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" />

web/src/components/Search.tsx

@@ -23,11 +23,12 @@ export default function Search({
     onChange("");
   };
   return (
-    <div className={`w-full px-6 text-black dark:text-white`}>
     <div
-        className={`flex w-full items-center rounded-md border border-${theme}-200 dark:border-${theme}-700 gap-1 px-2 bg-${theme}-100 dark:bg-${theme}-900 peer flex-nowrap`}
+      className={`flex w-full items-center rounded-md border border-${theme}-200 dark:border-${theme}-700 gap-1 px-2 bg-${theme}-100 dark:bg-${theme}-900 group relative flex-nowrap`}
     >
-        <SearchIcon className={`size-5 text-${theme}-600 dark:text-${theme}-400`} />
+      <SearchIcon
+        className={`size-5 text-${theme}-600 dark:text-${theme}-400`}
+      />
       <div className="w-full">
         <input
           className={`h-10 w-full text-sm text-${theme}-800 dark:text-${theme}-200 peer bg-transparent focus:outline-none placeholder:text-${theme}-600 placeholder:dark:text-${theme}-400`}
@@ -44,9 +45,8 @@ export default function Search({
           <X className="size-5" />
         </button>
       )}
-      </div>
       <div
-        className="relative left-1/2 h-[8px] w-0 -translate-x-1/2 -translate-y-[8px] rounded-md border-b-2 border-b-blue-600 transition-all duration-200 peer-has-[:focus]:w-full"
+        className="absolute -bottom-px left-1/2 h-full w-0 -translate-x-1/2 rounded-md border-b-2 border-b-blue-600 transition-all duration-200 group-has-[:focus]:w-[calc(100%+2px)]"
         style={{ clipPath: "inset(calc(100% - 2px) 0 0 0)" }}
       ></div>
     </div>

web/src/types.ts

@@ -20,6 +20,7 @@ export interface Image {
     repository: string;
     tag: string;
   };
+  url: string | null;
   result: {
     has_update: boolean | null;
     info: VersionInfo | DigestInfo | null;

web/tailwind.config.js

@@ -15,7 +15,7 @@ export default {
       variants: ["hover"],
     },
     {
-      pattern: /bg-(gray|neutral)-(900|950)/,
+      pattern: /bg-(gray|neutral)-(400|900|950)/,
       variants: ["dark"],
     },
     {
@@ -27,24 +27,16 @@ export default {
       variants: ["before:dark", "after:dark", "dark", "hover:dark"],
     },
     {
-      pattern: /text-(gray|neutral)-(50|300|200)/,
+      pattern: /text-(gray|neutral)-(50|300|200|400)/,
       variants: ["dark"],
     },
     {
       pattern: /text-(gray|neutral)-600/,
-      variants: ["dark", "hover"],
+      variants: ["*", "dark", "hover", "placeholder"],
     },
     {
       pattern: /text-(gray|neutral)-400/,
-      variants: ["dark", "dark:hover"],
-    },
-    {
-      pattern: /text-(gray|neutral)-600/,
-      variants: ["placeholder"],
-    },
-    {
-      pattern: /text-(gray|neutral)-400/,
-      variants: ["placeholder:dark"],
+      variants: ["*:dark", "dark", "dark:hover", "placeholder:dark"],
     },
     {
       pattern: /text-(gray|neutral)-700/,
@@ -68,5 +60,12 @@ export default {
       pattern: /border-(gray|neutral)-(700|800|900)/,
       variants: ["dark"],
     },
+    {
+      pattern: /ring-(gray|neutral)-700/,
+    },
+    {
+      pattern: /ring-(gray|neutral)-400/,
+      variants: ["dark"],
+    },
   ],
 };

web/vite.config.ts

@@ -4,6 +4,7 @@ import react from "@vitejs/plugin-react-swc";
 // https://vitejs.dev/config/
 export default defineConfig({
   plugins: [react()],
+  base: "./",
   build: {
     rollupOptions: {
       // https://stackoverflow.com/q/69614671/vite-without-hash-in-filename#75344943