docker · craig-osterhout · Nov 21, 2024
diff --git a/_vale/Docker/Acronyms.yml b/_vale/Docker/Acronyms.yml
@@ -9,6 +9,7 @@ second: '(?:\b[A-Z][a-z]+ )+\(([A-Z]{2,5})\)'
 # ... with the exception of these:
 exceptions:
   - AGPL
+  - AI
   - API
   - ARM
   - ASP
@@ -54,6 +55,7 @@ exceptions:
   - HTTP
   - HTTPS
   - IAM
+  - IBM
   - ID
   - IDE
   - IP

diff --git a/_vale/config/vocabularies/Docker/accept.txt b/_vale/config/vocabularies/Docker/accept.txt
@@ -110,6 +110,7 @@ Zsh
 [Ii]nfosec
 [Kk]eyrings?
 [Ll]oopback
+[Mm]emcached
 [Mm]oby
 [Nn]amespace
 [Oo]nboarding

diff --git a/content/_index.md b/content/_index.md
@@ -80,17 +80,6 @@ grid:
         url: "/scout/quickstart/"
       - text: "Image analysis"
         url: "/scout/image-analysis/"
-  - title: Trusted content
-    icon: verified
-    description: |
-      High-quality, secure images from Docker and verified partners.
-    links:
-      - text: "Overview"
-        url: "/trusted-content/"
-      - text: "Official images"
-        url: "/trusted-content/official-images/"
-      - text: "Verified publisher program"
-        url: "/trusted-content/dvp-program/"
   - title: Subscription
     icon: card_membership
     description: |

diff --git a/content/get-started/docker-concepts/the-basics/what-is-an-image.md b/content/get-started/docker-concepts/the-basics/what-is-an-image.md
@@ -188,10 +188,7 @@ In this walkthrough, you searched and pulled a Docker image. In addition to pull
 
 The following resources will help you learn more about exploring, finding, and building images:
 
-- [Docker Trusted Content](/manuals/trusted-content/_index.md)
-  - [Docker Official Images docs](/manuals/trusted-content/official-images/_index.md)
-  - [Docker Verified Publisher docs](/manuals/trusted-content/dvp-program.md)
-  - [Docker-Sponsored Open Source Program docs](/manuals/trusted-content/dsos-program.md)
+- [Docker trusted content](/manuals/docker-hub/image-library/trusted-content.md)
 - [Explore the Image view in Docker Desktop](/manuals/desktop/use-desktop/images.md)
 - [Docker Build overview](/manuals/build/concepts/overview.md)
 - [Docker Hub](https://hub.docker.com)

diff --git a/content/get-started/introduction/build-and-push-first-image.md b/content/get-started/introduction/build-and-push-first-image.md
@@ -33,7 +33,7 @@ If you’re new to container images, think of them as a standardized package tha
 
 To share your Docker images, you need a place to store them. This is where registries come in. While there are many registries, Docker Hub is the default and go-to registry for images. Docker Hub provides both a place for you to store your own images and to find images from others to either run or use as the bases for your own images.
 
-In [Develop with containers](develop-with-containers.md), you used the following images that came from Docker Hub, each of which are [Docker Official Images](/trusted-content/official-images/):
+In [Develop with containers](develop-with-containers.md), you used the following images that came from Docker Hub, each of which are [Docker Official Images](/manuals/docker-hub/image-library/trusted-content.md#docker-official-images):
 
 - [node](https://hub.docker.com/_/node) - provides a Node environment and is used as the base of your development efforts. This image is also used as the base for the final application image.
 - [mysql](https://hub.docker.com/_/mysql) - provides a MySQL database to store the to-do list items

diff --git a/content/includes/hub-categories.md b/content/includes/hub-categories.md
@@ -0,0 +1,34 @@
+The categories include:
+
+- **API Management**: Tools for creating, publishing, analyzing, and securing
+  APIs.
+- **Content Management System:** Software applications to create and manage
+  digital content through templates, procedures, and standard formats.
+- **Data Science:** Tools and software to support analyzing data and generating
+  actionable insights.
+- **Databases & Storage:** Systems for storing, retrieving, and managing data.
+- **Languages & Frameworks:** Programming language runtimes and frameworks.
+- **Integrations & Delivery:** Tools for Continuous Integration (CI) and
+  Continuous Delivery (CD).
+- **Internet of Things:** Tools supporting Internet of Things (IoT)
+  applications.
+- **Machine Learning & AI:** Tools and frameworks optimized for artificial
+  intelligence and machine learning projects, such as pre-installed libraries
+  and frameworks for data analysis, model training, and deployment.
+- **Message Queues:** Message queuing systems optimized for reliable, scalable,
+  and efficient message handling.
+- **Monitoring & Observability:** Tools to track software and system performance
+  through metrics, logs, and traces, as well as observability to explore the
+  system’s state and diagnose issues.
+- **Networking:** Repositories that support data exchange and connecting
+  computers and other devices to share resources.
+- **Operating Systems:** Software that manages all other programs on a computer
+  and serves as an intermediary between users and the computer hardware, while
+  overseeing applications and system resources.
+- **Security:** Tools to protect a computer system or network from theft,
+  unauthorized access, or damage to their hardware, software, or electronic
+  data, as well as from service disruption.
+- **Web Servers:** Software to serve web pages, HTML files, and other assets to
+  users or other systems.
+- **Web Analytics:** Tools to collect, measure, analyze, and report on web data
+  and website visitor engagement.
diff --git a/content/manuals/_index.md b/content/manuals/_index.md
@@ -76,10 +76,6 @@ params:
     description: Commercial use licenses for Docker products.
     icon: card_membership
     link: /subscription/
-  - title: Trusted content
-    description: Curated, high-quality content from trusted sources.
-    icon: verified
-    link: /trusted-content/
 ---
 
 This section contains user guides on how to install, set up, configure, and use

@@ -20,10 +20,12 @@ FROM debian
 
 For most cases, you don't need to create your own base image. Docker Hub
 contains a vast library of Docker images that are suitable for use as a base
-image in your build. [Docker Official Images](../../trusted-content/official-images/_index.md)
+image in your build. [Docker Official
+Images](../../docker-hub/image-library/trusted-content.md#docker-official-images)
 are specifically designed as a set of hardened, battle-tested images that
 support a wide variety of platforms, languages, and frameworks. There are also
-[Docker Verified Publisher](https://hub.docker.com/search?q=&image_filter=store)
+[Docker Verified
+Publisher](../../docker-hub/image-library/trusted-content.md#verified-publisher-images)
 images, created by trusted publishing partners, verified by Docker.
 
 ## Create a base image
@@ -123,4 +125,4 @@ For more information about building images and writing Dockerfiles, see:
 
 * [Dockerfile reference](/reference/dockerfile.md)
 * [Dockerfile best practices](/manuals/build/building/best-practices.md)
-* [Docker Official Images](../../trusted-content/official-images/_index.md)
+* [Docker Official Images](../../docker-hub/image-library/trusted-content.md#docker-official-images)
@@ -57,7 +57,7 @@ it small.
 
 - [Docker-Sponsored Open Source](https://hub.docker.com/search?image_filter=open_source)
   are published and maintained by open source projects sponsored by Docker
-  through an [open source program](../../trusted-content/dsos-program).
+  through an [open source program](../../docker-hub/image-library/trusted-content.md#docker-sponsored-open-source-software-images).
 
 When you pick your base image, look out for the badges indicating that the
 image is part of these programs.

@@ -11,6 +11,10 @@ grid:
   description: Step-by-step instructions on getting started on Docker Hub.
   icon: explore
   link: /docker-hub/quickstart
+- title: Library
+  description: Explore the container image library, featuring millions of images for operating systems, frameworks, databases, and more.
+  icon: book
+  link: /docker-hub/image-library/
 - title: Repositories
   description: Create a repository to share your images with your team, customers,
     or the Docker community.

@@ -0,0 +1,22 @@
+---
+description: Learn about Docker Hub's library of images, extensions, and plugins.
+keywords: Docker Hub, Hub, content library
+title: Container image library
+linkTitle: Library
+weight: 20
+---
+
+Docker Hub's container image library is the world's largest collection of
+container images, extensions, and plugins. It provides a central location to
+discover pre-built images and tools designed to streamline your container
+workflows, making it easier to share and collaborate.
+
+In this section, learn about:
+
+- [Search](./search.md): Discover how to browse and search Docker Hub's extensive resources.
+- [Trusted content](./trusted-content.md): Dive into Docker Official Images,
+  Verified Publisher content, and Sponsored Open Source images, all vetted for
+  security and reliability to streamline your workflows.
+- [Catalogs](./catalogs.md): Explore specialized collections like the generative AI catalog.
+- [Mirroring](./mirror.md): Learn how to create a mirror of Docker Hub's
+  container image library as a pull-through cache.
@@ -0,0 +1,59 @@
+---
+description: Explore specialized Docker Hub collections like the Generative AI catalog.
+keywords: Docker Hub, Hub, catalog
+title: Docker Hub catalogs
+linkTitle: Catalogs
+weight: 60
+---
+
+Docker Hub catalogs are your go-to collections of trusted, ready-to-use
+container images and resources, tailored to meet specific development needs.
+They make it easier to find high-quality, pre-verified content so you can
+quickly build, deploy, and manage your applications with confidence. Catalogs in
+Docker Hub:
+
+- Simplify content discovery: Organized and curated content makes it easy to
+  discover tools and resources tailored to your specific domain or technology.
+- Reduce complexity: Trusted resources, vetted by Docker and its partners,
+  ensure security, reliability, and adherence to best practices.
+- Accelerate development: Quickly integrate advanced capabilities into your
+  applications without the hassle of extensive research or setup.
+
+The generative AI catalog is the first catalog in Docker Hub, offering
+specialized content for AI development.
+
+## Generative AI catalog
+
+The [generative AI catalog](https://hub.docker.com/catalogs/gen-ai) makes it
+easy to explore and add AI capabilities to your applications. With trusted,
+ready-to-use content and comprehensive documentation, you can skip the hassle of
+sorting through countless tools and configurations. Instead, focus your time and
+energy on creating innovative AI-powered applications.
+
+The generative AI catalog provides a wide range of trusted content, organized
+into key areas to support diverse AI development needs:
+
+- Demos: Ready-to-deploy examples showcasing generative AI capabilities. These
+  demos provide a hands-on way to explore AI tools and frameworks, making it
+  easier to understand how they can be integrated into real-world applications.
+- Models: Pre-trained AI models for tasks like text generation,
+  natural language processing (NLP), and conversational AI. These models
+  provide a foundation for
+  AI applications without requiring developers to train models from scratch.
+- Applications and end-to-end platforms: Comprehensive platforms and tools that
+  simplify AI application development, including low-code solutions and
+  frameworks for building multi-agent and retrieval-augmented generation (RAG)
+  applications.
+- Model deployment and serving: Tools and frameworks that enable developers to
+  efficiently deploy and serve AI models in production environments. These
+  resources include pre-configured stacks for GPUs and other specialized
+  hardware, ensuring performance at scale.
+- Orchestration: Solutions for managing complex AI workflows, such as workflow
+  engines, large language model (LLM) application frameworks, and lifecycle management
+  tools, to help streamline development and operations.
+- Machine learning frameworks: Popular frameworks like TensorFlow and PyTorch
+  that provide the building blocks for creating, training, and fine-tuning
+  machine learning models.
+- Databases: Databases optimized for AI workloads, including vector databases
+  for similarity search, time-series databases for analytics, and NoSQL
+  solutions for handling unstructured data.
@@ -2,12 +2,13 @@
 description: Setting-up a local mirror for Docker Hub images
 keywords: registry, on-prem, images, tags, repository, distribution, mirror, Hub,
   recipe, advanced
-title: Registry as a pull through cache
-linkTitle: Mirroring
+title: Mirror the Docker Hub library
+linkTitle: Mirror
 weight: 80
 aliases:
 - /engine/admin/registry_mirror/
 - /registry/recipes/mirror/
+- /docker-hub/mirror/
 ---
 
 ## Use-case
@@ -37,7 +38,7 @@ Hub can be mirrored.
 
 > [!NOTE]
 >
-> Mirrors of Docker Hub are still subject to Docker's [fair use policy](./download-rate-limit.md#fair-use).
+> Mirrors of Docker Hub are still subject to Docker's [fair use policy](/manuals/docker-hub/download-rate-limit.md#fair-use).
 
 ### Solution
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,6 +9,7 @@ second: '(?:\b[A-Z][a-z]+ )+\(([A-Z]{2,5})\)' @@
     # ... with the exception of these:
     exceptions:
       - AGPL
+      - AI
       - API
       - ARM
       - ASP
@@ Expand Down Expand Up / @@ -54,6 +55,7 @@ exceptions: @@
       - HTTP
       - HTTPS
       - IAM
+      - IBM
       - ID
       - IDE
       - IP
@@ Expand Down @@