diff --git a/content/build/building/base-images.md b/content/build/building/base-images.md index cc89a7472b..683a041f49 100644 --- a/content/build/building/base-images.md +++ b/content/build/building/base-images.md @@ -111,4 +111,4 @@ There are lots of resources available to help you write your `Dockerfile`. * There's a [complete guide to all the instructions](../../engine/reference/builder.md) available for use in a `Dockerfile` in the reference section. * To help you write a clear, readable, maintainable `Dockerfile`, we've also written a [Dockerfile best practices guide](../../develop/develop-images/dockerfile_best-practices.md). -* If your goal is to create a new Docker Official Image, read [Docker Official Images](../../docker-hub/official_images.md). +* If your goal is to create a new Docker Official Image, read [Docker Official Images](../../trusted-content/official-images.md). diff --git a/content/develop/develop-images/dockerfile_best-practices.md b/content/develop/develop-images/dockerfile_best-practices.md index bc1725f129..65c9329bba 100644 --- a/content/develop/develop-images/dockerfile_best-practices.md +++ b/content/develop/develop-images/dockerfile_best-practices.md @@ -889,6 +889,6 @@ These Official Images have exemplary Dockerfiles: * [Dockerfile reference](../../engine/reference/builder.md) * [More about Automated builds](../../docker-hub/builds/index.md) -* [Guidelines for creating Docker Official Images](../../docker-hub/official_images.md) +* [Guidelines for creating Docker Official Images](../../trusted-content/official-images.md) * [Best practices to containerize Node.js web applications with Docker](https://snyk.io/blog/10-best-practices-to-containerize-nodejs-web-applications-with-docker) -* [More about base images](../../build/building/base-images.md) \ No newline at end of file +* [More about base images](../../build/building/base-images.md) diff --git a/content/develop/security-best-practices.md b/content/develop/security-best-practices.md index 963b5a5b33..fad50d827e 100644 --- a/content/develop/security-best-practices.md +++ b/content/develop/security-best-practices.md @@ -21,10 +21,10 @@ image. When choosing an image, ensure it's built from a trusted source and keep it small. Docker Hub has more than 8.3 million repositories. Some of these images are -[Official Images](../docker-hub/official_images.md), which are published by +[Official Images](../trusted-content/official-images.md), which are published by Docker as a curated set of Docker open source and drop-in solution repositories. Docker also offers images that are published by -[Verified Publishers](../docker-hub/dvp-program.md). These high-quality images +[Verified Publishers](../trusted-content/dvp-program.md). These high-quality images are published and maintained by the organizations partnering with Docker, with Docker verifying the authenticity of the content in their repositories. When you pick your base image, look out for the **Official Image** and **Verified Publisher** diff --git a/content/docker-hub/_index.md b/content/docker-hub/_index.md index caf3b63808..58370cd1e5 100644 --- a/content/docker-hub/_index.md +++ b/content/docker-hub/_index.md @@ -21,10 +21,6 @@ grid: description: Create personal access tokens as an alternative to your password. icon: password link: /docker-hub/access-tokens -- title: Official images - description: A curated set of Docker repositories hosted on Docker Hub. - icon: verified - link: /docker-hub/official_images - title: Release notes description: Find out about new features, improvements, and bug fixes. icon: note_add @@ -40,12 +36,6 @@ Docker Hub is also where you can go to [change your Docker account settings and {{< tabs >}} {{< tab name="What key features are included in Docker Hub?" >}} * [Repositories](../docker-hub/repos/index.md): Push and pull container images. -* [Docker Official Images](official_images.md): Pull and use high-quality -container images provided by Docker. -* [Docker Verified Publisher Images](dvp-program.md): Pull and use high-quality -container images provided by external vendors. -* [Docker-Sponsored Open Source Images](dsos-program.md): Pull and use high-quality -container images from non-commercial open source projects. * [Builds](builds/index.md): Automatically build container images from GitHub and Bitbucket and push them to Docker Hub. * [Webhooks](webhooks.md): Trigger actions after a successful push diff --git a/content/docker-hub/publish/_index.md b/content/docker-hub/publish/_index.md deleted file mode 100644 index 15451df608..0000000000 --- a/content/docker-hub/publish/_index.md +++ /dev/null @@ -1,114 +0,0 @@ ---- -description: Docker Verified Publisher Program -title: Docker Verified Publisher Program -aliases: -- /docker-store/byol/ -- /docker-store/certify-images/ -- /docker-store/certify-plugins-logging/ -- /docker-store/customer_faq/ -- /docker-store/publisher_faq/ -- /docker-store/trustchain/ -- /docker-store/publish/ -- /docker-hub/publish/publish/ -- /docker-hub/publish/customer_faq/ -- /docker-hub/publish/publisher_faq/ -- /docker-hub/publish/certify-images/ -- /docker-hub/publish/certify-plugins-logging/ -- /docker-hub/publish/trustchain/ -- /docker-hub/publish/byol/ -- /docker-hub/publish/publisher-center-migration/ -- /docker-hub/publish/ -- /docker-hub/publish/repository-logos/ ---- - -[The Docker Verified Publisher Program](https://hub.docker.com/search?q=&image_filter=store) provides high-quality images from commercial publishers verified by Docker. - -These images help development teams build secure software supply chains, minimizing exposure to malicious content early in the process to save time and money later. - -Images that are part of this program have a special badge on Docker Hub making it easier for users to identify projects that Docker has verified as high-quality commercial publishers. - -![Docker-Sponsored Open Source badge](./images/verified-publisher-badge-iso.png) - -## For content publishers - -The Docker Verified Publisher Program (DVP) provides several features and benefits to Docker -Hub publishers. The program grants the following perks based on participation tier: - -- Repository logo -- Verified publisher badge -- Priority search ranking in Docker Hub -- Insights and analytics -- Vulnerability analysis -- Additional Docker Business seats -- Removal of rate limiting for developers -- Co-marketing opportunities - -### Repository logo - -DVP organizations can upload custom images for individual repositories on Docker Hub. -This lets you override the default organization-level logo on a per-repository basis. - -Only a user with administrative access (owner or team member with administrator permission) -over the repository can change the repository logo. - -#### Image requirements - -- The supported filetypes for the logo image are JPEG and PNG. -- The minimum allowed image size in pixels is 120×120. -- The maximum allowed image size in pixels is 1000×1000. -- The maximum allowed image file size is 5MB. - -#### Set the repository logo - -1. Sign in to Docker Hub. -2. Go to the page of the repository that you want to change the logo for. -3. Select the upload logo button, represented by a camera icon - (![Camera icon](./images/upload_logo_sm.png){: .inline height="22px" }) - overlaying the current repository logo. -4. In the dialog that opens, select the PNG image that you want to upload to - set it as the logo for the repository. - -#### Remove the logo - -Remove a logo using the clear button (![Clear button](images/clear_logo_sm.png){: .inline width="20px" }). - -Removing the logo makes the repository fallback to using the organization logo, if set, and the default logo if not. - -![Default logo which is a 3D grey cube](images/default_logo_sm.png) - -### Verified publisher badge - -Images that are part of this program have a badge on Docker Hub making it easier for developers -to identify projects that Docker has verified as high quality publishers and with content they can trust. - -![Docker, Inc. org with a verified publisher badge](./images/verified-publisher-badge.png) - -### Insights and analytics - -The [insights and analytics](/docker-hub/publish/insights-analytics) service provides usage metrics for how -the community uses Docker images, granting insight into user behavior. - -The usage metrics show the number of image pulls by tag or by digest, and breakdowns by -geolocation, cloud provider, client, and more. - -![The insights and analytics tab on the Docker Hub website](./images/insights-and-analytics-tab.png) - -You can use the view to select the time span you want to view analytics data and export the data in -either a summary or raw format. - -### Vulnerability analysis - -[Docker Scout](/scout/) provides automatic vulnerability analysis -for DVP images published to Docker Hub. -Scanning images ensures that the published content is secure, and proves to -developers that they can trust the image. - -Analysis is enabled on a per-repository -basis, refer to [vulnerability scanning](/docker-hub/vulnerability-scanning/) for more information about how to use -it. - -### Who's eligible to become a verified publisher? - -Any independent software vendor who distributes software on Docker Hub can join -the Verified Publisher Program. Find out more by heading to the -[Docker Verified Publisher Program](https://www.docker.com/partners/programs) page. \ No newline at end of file diff --git a/content/docker-hub/publish/images/chart-share-icon.png b/content/docker-hub/publish/images/chart-share-icon.png deleted file mode 100644 index c7214d0d67..0000000000 Binary files a/content/docker-hub/publish/images/chart-share-icon.png and /dev/null differ diff --git a/content/docker-hub/publish/images/chart.png b/content/docker-hub/publish/images/chart.png deleted file mode 100644 index bd60012f1b..0000000000 Binary files a/content/docker-hub/publish/images/chart.png and /dev/null differ diff --git a/content/docker-hub/publish/images/clear_logo_sm.png b/content/docker-hub/publish/images/clear_logo_sm.png deleted file mode 100644 index fcb53b7308..0000000000 Binary files a/content/docker-hub/publish/images/clear_logo_sm.png and /dev/null differ diff --git a/content/docker-hub/publish/images/default_logo_sm.png b/content/docker-hub/publish/images/default_logo_sm.png deleted file mode 100644 index a8837357c6..0000000000 Binary files a/content/docker-hub/publish/images/default_logo_sm.png and /dev/null differ diff --git a/content/docker-hub/publish/images/download-analytics-data.png b/content/docker-hub/publish/images/download-analytics-data.png deleted file mode 100644 index e2ca047a12..0000000000 Binary files a/content/docker-hub/publish/images/download-analytics-data.png and /dev/null differ diff --git a/content/docker-hub/publish/images/insights-and-analytics-tab.png b/content/docker-hub/publish/images/insights-and-analytics-tab.png deleted file mode 100644 index a1f52fc832..0000000000 Binary files a/content/docker-hub/publish/images/insights-and-analytics-tab.png and /dev/null differ diff --git a/content/docker-hub/publish/images/organization-tabs.png b/content/docker-hub/publish/images/organization-tabs.png deleted file mode 100644 index fa607aa192..0000000000 Binary files a/content/docker-hub/publish/images/organization-tabs.png and /dev/null differ diff --git a/content/docker-hub/publish/images/upload_logo_sm.png b/content/docker-hub/publish/images/upload_logo_sm.png deleted file mode 100644 index 074c7c542d..0000000000 Binary files a/content/docker-hub/publish/images/upload_logo_sm.png and /dev/null differ diff --git a/content/docker-hub/publish/images/verified-publisher-badge-iso.png b/content/docker-hub/publish/images/verified-publisher-badge-iso.png deleted file mode 100644 index 63721f3148..0000000000 Binary files a/content/docker-hub/publish/images/verified-publisher-badge-iso.png and /dev/null differ diff --git a/content/docker-hub/publish/images/verified-publisher-badge.png b/content/docker-hub/publish/images/verified-publisher-badge.png deleted file mode 100644 index 27d99b87fc..0000000000 Binary files a/content/docker-hub/publish/images/verified-publisher-badge.png and /dev/null differ diff --git a/content/docker-hub/publish/insights-analytics.md b/content/docker-hub/publish/insights-analytics.md deleted file mode 100644 index f0500d72e2..0000000000 --- a/content/docker-hub/publish/insights-analytics.md +++ /dev/null @@ -1,213 +0,0 @@ ---- -title: Insights and analytics -description: Provides usage statistics of your images on Docker Hub. -keywords: docker hub, hub, insights, analytics, api, verified publisher -aliases: -- /docker-hub/publish/insights-analytics/ ---- - -Insights and analytics provides usage analytics for Docker Verified -Publisher (DVP) and Docker-Sponsored Open Source (DSOS) images on Docker Hub, providing self-serve access -to metrics as both raw data and summary data for a desired time span. You can -view the number of image pulls by tag or by digest, and get breakdowns by -geolocation, cloud provider, client, and more. - - -> **Tip** -> -> Head to the -[Docker Verified Publisher Program](https://www.docker.com/partners/programs/) or [Docker-Sponsored Open Source](https://www.docker.com/community/open-source/application/#) pages -to learn more about the programs. -{ .tip } - -## View the analytics data - -You can find analytics data for your repositories on the **Insights and -analytics** dashboard at the following URL: -`https://hub.docker.com/orgs/{namespace}/insights`. The dashboard contains a -visualization of the usage data and a table where you can download -the data as CSV files. - -To view data in the chart: - -- Select the data granularity: weekly or monthly -- Select the time interval: 3, 6, or 12 months -- Select one or more repositories in the list - -![Insights and analytics chart visualization](./images/chart.png) - - -> **Tip** -> -> Hovering your cursor over the chart displays a tooltip, showing precise data -> for points in time. -{ .tip } - -### Share analytics data - -You can share the visualization with others using the share icon above the chart. -This is a convenient way to share statistics with others in your organization. - -![Chart share icon](./images/chart-share-icon.png) - -Selecting the icon generates a link that's copied to your clipboard. The link -preserves the display selections you made. When someone follows the link, the -**Insights and analytics** page opens and displays the chart with the same -configuration as you had set up when creating the link. - -## Exporting analytics data - -You can export the analytics data either from the web dashboard, or using the -[DVP Data API](/docker-hub/api/dvp/). All members of an organization have access to the analytics data. - -The data is available as a downloadable CSV file, in a weekly (Monday through -Sunday) or monthly format. Monthly data is available from the first day of the -following calendar month. You can import this data into your own systems, or you -can analyze it manually as a spreadsheet. - -### Export data - -Export usage data for your organization's images using the Docker Hub website by following these steps: - -1. Sign in to [Docker Hub](https://hub.docker.com/) and select **Organizations**. - -2. Choose your organization and select **Insights and analytics**. - - ![Organization overview page, with the Insights and Analytics tab](./images/organization-tabs.png) - -3. Set the time span for which you want to export analytics data. - - The downloadable CSV files for summary and raw data appear on the right-hand - side. - - ![Filtering options and download links for analytics data](./images/download-analytics-data.png) - -### Export data using the API - -The HTTP API endpoints are available at: -`https://hub.docker.com/api/publisher/analytics/v1`. Learn how to export data -using the API in the [DVP Data API documentation](/docker-hub/api/dvp/). - -## Data points - -Export data in either raw or summary format. Each format contains different data -points and with different structure. - -The following sections describe the available data points for each format. The -**Date added** column shows when the field was first introduced. - -### Raw data - -The raw data format contains the following data points. Each row in the CSV file -represents an image pull. - -| Data point | Description | Date added | -| ----------------------------- | ------------------------------------------------------------------------------------------------------------ | ----------------- | -| Action | Request type, see [Action classification rules][1]. One of `pull_by_tag`, `pull_by_digest`, `version_check`. | January 1, 2022 | -| Action day | The date part of the timestamp: `YYYY-MM-DD`. | January 1, 2022 | -| Country | Request origin country. | January 1, 2022 | -| Digest | Image digest. | January 1, 2022 | -| HTTP method | HTTP method used in the request, see [registry API documentation][2] for details. | January 1, 2022 | -| Host | The cloud service provider used in an event. | January 1, 2022 | -| Namespace | Docker [organization][3] (image namespace). | January 1, 2022 | -| Reference | Image digest or tag used in the request. | January 1, 2022 | -| Repository | Docker [repository][4] (image name). | January 1, 2022 | -| Tag (included when available) | Tag name that's only available if the request referred to a tag. | January 1, 2022 | -| Timestamp | Date and time of the request: `YYYY-MM-DD 00:00:00`. | January 1, 2022 | -| Type | The industry from which the event originates. One of `business`, `isp`, `hosting`, `education`, `null`. | January 1, 2022 | -| User agent tool | The application a user used to pull an image (for example, `docker` or `containerd`). | January 1, 2022 | -| User agent version | The version of the application used to pull an image. | January 1, 2022 | -| Domain | Request origin domain, see [Privacy](#privacy). | October 11, 2022 | -| Owner | The name of the organization that owns the repository. | December 19, 2022 | - -[1]: #action-classification-rules -[2]: /registry/spec/api/ -[3]: /docker-hub/orgs/ -[4]: /docker-hub/repos/ - -### Summary data - -There are two levels of summary data available: - -- Repository-level, a summary of every namespace and repository -- Tag- or digest-level, a summary of every namespace, repository, and reference - (tag or digest) - -The summary data formats contain the following data points for the selected time -span: - -| Data point | Description | Date added | -| ----------------- | ------------------------------------------------------- | ----------------- | -| Unique IP address | Number of unique IP addresses, see [Privacy](#privacy). | January 1, 2022 | -| Pull by tag | GET request, by digest or by tag. | January 1, 2022 | -| Pull by digest | GET or HEAD request by digest, or HEAD by digest. | January 1, 2022 | -| Version check | HEAD by tag, not followed by a GET | January 1, 2022 | -| Owner | The name of the organization that owns the repository. | December 19, 2022 | - -### Action classification rules - -An action represents the multiple request events associated with a -`docker pull`. Pulls are grouped by category to make the data more meaningful -for understanding user behavior and intent. The categories are: - -- Version check -- Pull by tag -- Pull by digest - -Automated systems frequently check for new versions of your images. Being able -to distinguish between "version checks" in CI versus actual image pulls by a -user grants you more insight into your users' behavior. - -The following table describes the rules applied for determining intent behind -pulls. To provide feedback or ask questions about these rules, -[fill out the Google Form](https://forms.gle/nb7beTUQz9wzXy1b6). - -| Starting event | Reference | Followed by | Resulting action | Use case(s) | Notes | -| :------------- | :-------- | :-------------------------------------------------------------- | :--------------- | :------------------------------------------------------------------------------------------------------------- | :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| HEAD | tag | N/A | Version check | User already has all layers existing on local machine | This is similar to the use case of a pull by tag when the user already has all the image layers existing locally, however, it differentiates the user intent and classifies accordingly. | -| GET | tag | N/A | Pull by tag | User already has all layers existing on local machine and/or the image is single-arch | -| GET | tag | Get by different digest | Pull by tag | Image is multi-arch | Second GET by digest must be different from the first. | -| HEAD | tag | GET by same digest | Pull by tag | Image is multi-arch but some or all image layers already exist on the local machine | The HEAD by tag sends the most current digest, the following GET must be by that same digest. There may occur an additional GET, if the image is multi-arch (see the next row in this table). If the user doesn't want the most recent digest, then the user performs HEAD by digest. | -| HEAD | tag | GET by the same digest, then a second GET by a different digest | Pull by tag | Image is multi-arch | The HEAD by tag sends the most recent digest, the following GET must be by that same digest. Since the image is multi-arch, there is a second GET by a different digest. If the user doesn't want the most recent digest, then the user performs HEAD by digest. | -| HEAD | tag | GET by same digest, then a second GET by different digest | Pull by tag | Image is multi-arch | The HEAD by tag sends the most current digest, the following GET must be by that same digest. Since the image is multi-arch, there is a second GET by a different digest. If the user doesn't want the most recent digest, then the user performs HEAD by digest. | -| GET | digest | N/A | Pull by digest | User already has all layers existing on local machine and/or the image is single-arch | -| HEAD | digest | N/A | Pull by digest | User already has all layers existing on their local machine | -| GET | digest | GET by different digest | Pull by digest | Image is multi-arch | The second GET by digest must be different from the first. | -| HEAD | digest | GET by same digest | Pull by digest | Image is single-arch and/or image is multi-arch but some part of the image already exists on the local machine | -| HEAD | digest | GET by same digest, then a second GET by different digest | Pull by Digest | Image is multi-arch | - -## Changes in data over time - -The insights and analytics service is continuously improved to increase the -value it brings to publishers. Some changes might include adding new data -points, or improving existing data to make it more useful. - -Changes in the dataset, such as added or removed fields, generally only apply -from the date of when the field was first introduced, and going forward. - -Refer to the tables in the [Data points](#data-points) section to see from which -date a given data point is available. - -## Privacy - -This section contains information about privacy-protecting measures that ensures -consumers of content on Docker Hub remain completely anonymous. - - -> **Important** -> -> Docker never shares any Personally Identifiable Information (PII) as part of -> analytics data. -{ .important } - -The summary dataset includes unique IP address count. This data point only -includes the number of distinct unique IP addresses that request an image. -Individual IP addresses are never shared. - -The raw dataset includes user IP domains as a data point. This is the domain name -associated with the IP address used to pull an image. If the IP type is -`business`, the domain represents the company or organization associated with -that IP address (for example, `docker.com`). For any other IP type that's not -`business`, the domain represents the internet service provider or hosting -provider used to make the request. On average, only about 30% of all pulls -classify as the `business` IP type (this varies between publishers and images). \ No newline at end of file diff --git a/content/docker-hub/publish/repository-logos.md b/content/docker-hub/publish/repository-logos.md deleted file mode 100644 index efa486ac1a..0000000000 --- a/content/docker-hub/publish/repository-logos.md +++ /dev/null @@ -1,37 +0,0 @@ ---- -title: Repository logos -description: Override the organization logo on a per-repository basis -keywords: dvp, verified, publisher, repository, logo, icons ---- - -Docker Verified Publishers (DVP) and Docker Sponsored Open Source (DSOS) -organizations can upload custom images for individual repositories on Docker Hub. -This lets you override the default organization-level logo on a per-repository basis. - -Only a user with administrative access (owner or team member with Admin permission) -over the repository can change the repository logo. - -## Image requirements - -- The supported filetypes for the logo image are JPEG and PNG. -- The minimum allowed image size in pixels is 120×120. -- The maximum allowed image size in pixels is 1000×1000. -- The maximum allowed image file size is 5MB. - -## Set the repository logo - -1. Sign in to Docker Hub. -2. Go to the page of the repository that you want to change the logo for. -3. Select the upload logo button, represented by a camera icon - (![Camera icon](./images/upload_logo_sm.png){: .inline height="22px" }) - overlaying the current repository logo. -4. In the dialog that opens, select the PNG image that you want to upload to - set it as the logo for the repository. - -## Remove the logo - -Remove a logo using the clear button (![Clear button](../images/clear_logo_sm.png){: .inline height="22px" }). - -Removing the logo makes the repository fallback to using the organization logo, if set, and the default logo if not. - -![Default logo which is a 3D grey cube](./images/default_logo_sm.png){: .inline height="22px" } \ No newline at end of file diff --git a/content/docker-hub/release-notes.md b/content/docker-hub/release-notes.md index 3dcf7df3b2..d7d22d0ab9 100644 --- a/content/docker-hub/release-notes.md +++ b/content/docker-hub/release-notes.md @@ -257,9 +257,8 @@ Each organization page now breaks down into these tabs: * The architecture it was built on * The OS * The user who most recently updated an image for a specific tag -* The security scan summary for [official images](official_images.md) -has been updated. +* The security scan summary for Docker Official Images has been updated. ### Known Issues -* Scan results don't appear for some official images. \ No newline at end of file +* Scan results don't appear for some official images. diff --git a/content/docker-hub/repos/access/_index.md b/content/docker-hub/repos/access/_index.md index a7b6654fec..ca745e0003 100644 --- a/content/docker-hub/repos/access/_index.md +++ b/content/docker-hub/repos/access/_index.md @@ -63,8 +63,8 @@ In the previous example, you can see two example results, `centos` and `ansible/ The second result shows that it comes from the public repository of a user, named `ansible/`, while the first result, `centos`, doesn't explicitly list a repository which means that it comes from the top-level namespace for -[Docker Official Images](../../official_images.md). The `/` character separates -a user's repository from the image name. +[Docker Official Images](../../../trusted-content/official-images.md). +The `/` character separates a user's repository from the image name. Once you've found the image you want, you can download it with `docker pull `: @@ -84,4 +84,4 @@ You now have an image from which you can run containers. ## Star repositories -Stars are a way to show that you like a repository. They're also an easy way of bookmarking your favorites. \ No newline at end of file +Stars are a way to show that you like a repository. They're also an easy way of bookmarking your favorites. diff --git a/content/security.md b/content/security.md index 9266f3113e..5859105b52 100644 --- a/content/security.md +++ b/content/security.md @@ -29,7 +29,7 @@ the Text4Shell CVE in the vulnerability report. For detailed instructions, see [ > images to the patched version as soon as possible to remediate the issue. { .important } -A number of [Docker Official Images](../docker-hub/official_images.md) contain the vulnerable versions of +A number of [Docker Official Images](../trusted-content/official-images.md) contain the vulnerable versions of Apache Commons Text. The following table lists Docker Official Images that may contain the vulnerable versions of Apache Commons Text. We are working on updating Apache Commons Text in these images to the latest version. Some of these images may not be @@ -99,7 +99,7 @@ Log4j 2 CVE in the vulnerability report. For detailed instructions, see [Scan im > images to the patched version as soon as possible to remediate the issue. { .important } -A number of [Docker Official Images](../docker-hub/official_images.md) contain the vulnerable versions of +A number of [Docker Official Images](../trusted-content/official-images.md) contain the vulnerable versions of Log4j 2 CVE-2021-44228. The following table lists Docker Official Images that may contain the vulnerable versions of Log4j 2. We are working on updating Log4j 2 in these images to the latest version. Some of these images may not be @@ -124,4 +124,4 @@ vulnerable for other reasons. We recommend that you also review the guidelines p by some scanners, the authors believe the images are not vulnerable by Log4j 2 CVE as the API jars do not contain the vulnerability. > The [Nuxeo](https://hub.docker.com/_/nuxeo) -> image is deprecated and will not be updated. \ No newline at end of file +> image is deprecated and will not be updated. diff --git a/content/subscription/faq.md b/content/subscription/faq.md index 43a3e39398..9bc3fde44b 100644 --- a/content/subscription/faq.md +++ b/content/subscription/faq.md @@ -19,8 +19,8 @@ Contact the [Docker Sales Team](https://www.docker.com/company/contact). ### What ways can I contribute to Docker content? Docker offers two programs: -- [Docker-Sponsored Open Source Program (DSOS)](../docker-hub/dsos-program.md) -- [Docker Verified Publisher (DVP)](../docker-hub/dvp-program.md) +- [Docker-Sponsored Open Source Program (DSOS)](../trusted-content/dsos-program.md) +- [Docker Verified Publisher (DVP)](../trusted-content/dvp-program.md) ### Do I need to do anything at the end of my subscription term? @@ -48,4 +48,4 @@ Subscriptions are non-transferable. ### I have more questions regarding the new pricing, who can I reach out to? -If you have any questions that are not covered in the FAQ, [please reach out](https://www.docker.com/company/contact) and a member of the Docker team will get back to you. \ No newline at end of file +If you have any questions that are not covered in the FAQ, [please reach out](https://www.docker.com/company/contact) and a member of the Docker team will get back to you. diff --git a/content/trusted-content/_index.md b/content/trusted-content/_index.md new file mode 100644 index 0000000000..c12e605a50 --- /dev/null +++ b/content/trusted-content/_index.md @@ -0,0 +1,25 @@ +--- +title: Trusted content +description: Optimize your development workflow with secure base images +keywords: doi, dvp, dsos, open source, security, base images +grid: +- title: Docker Official Images + description: A curated set of Docker repositories hosted on Docker Hub. + image: /trusted-content/images/doi-icon.svg + link: /trusted-content/official-images/ +- title: Docker Verified Publisher + description: High-quality images from verified vendors. + image: /trusted-content/images/dvp-icon.svg + link: /trusted-content/dvp-program/ +- title: Docker-Sponsored Open Source + description: High-quality images from non-commercial open source projects. + image: /trusted-content/images/dsos-icon.svg + link: /trusted-content/dsos-program/ +--- + +Trusted content is a selection of high-quality, secure images, curated by +Docker and verified publishing partners. These images are stable, up-to-date, +and follow industry best-practices. They provide a strong foundation for +developing applications. + +{{< grid >}} diff --git a/content/docker-hub/dsos-program.md b/content/trusted-content/dsos-program.md similarity index 98% rename from content/docker-hub/dsos-program.md rename to content/trusted-content/dsos-program.md index 96a1e7ee26..70d237bdf8 100644 --- a/content/docker-hub/dsos-program.md +++ b/content/trusted-content/dsos-program.md @@ -2,6 +2,8 @@ description: Learn about the Docker-Sponsored Open Source Program and how it works title: Docker-Sponsored Open Source Program keywords: docker hub, hub, insights, analytics, open source, Docker sponsored, program +aliases: + - /docker-hub/dsos-program/ --- [Docker Sponsored Open Source images](https://hub.docker.com/search?q=&image_filter=open_source) are published and maintained by open-source projects sponsored by Docker through the program. @@ -97,4 +99,4 @@ basis. For more about using this feature, see [Basic vulnerability scanning](/do To qualify for the program, a publisher must share the project namespace in public repositories, meet [the Open Source Initiative definition](https://opensource.org/docs/osd), and be in active development with no pathway to commercialization. Find out more by heading to the -[Docker-Sponsored Open Source Program](https://www.docker.com/community/open-source/application/) application page. \ No newline at end of file +[Docker-Sponsored Open Source Program](https://www.docker.com/community/open-source/application/) application page. diff --git a/content/docker-hub/dvp-program.md b/content/trusted-content/dvp-program.md similarity index 99% rename from content/docker-hub/dvp-program.md rename to content/trusted-content/dvp-program.md index 11737c7100..92911c25fd 100644 --- a/content/docker-hub/dvp-program.md +++ b/content/trusted-content/dvp-program.md @@ -19,6 +19,7 @@ aliases: - /docker-hub/publish/publisher-center-migration/ - /docker-hub/publish/ - /docker-hub/publish/repository-logos/ +- /docker-hub/dvp-program/ --- [The Docker Verified Publisher Program](https://hub.docker.com/search?q=&image_filter=store) provides high-quality images from commercial publishers verified by Docker. @@ -110,4 +111,4 @@ basis. For more about using this feature, see [Basic vulnerability scanning](/do Any independent software vendor who distributes software on Docker Hub can join the Verified Publisher Program. Find out more by heading to the -[Docker Verified Publisher Program](https://www.docker.com/partners/programs) page. \ No newline at end of file +[Docker Verified Publisher Program](https://www.docker.com/partners/programs) page. diff --git a/content/docker-hub/images/chart-share-icon.png b/content/trusted-content/images/chart-share-icon.png similarity index 100% rename from content/docker-hub/images/chart-share-icon.png rename to content/trusted-content/images/chart-share-icon.png diff --git a/content/docker-hub/images/chart.png b/content/trusted-content/images/chart.png similarity index 100% rename from content/docker-hub/images/chart.png rename to content/trusted-content/images/chart.png diff --git a/content/docker-hub/images/clear_logo_sm.png b/content/trusted-content/images/clear_logo_sm.png similarity index 100% rename from content/docker-hub/images/clear_logo_sm.png rename to content/trusted-content/images/clear_logo_sm.png diff --git a/content/docker-hub/images/default_logo_sm.png b/content/trusted-content/images/default_logo_sm.png similarity index 100% rename from content/docker-hub/images/default_logo_sm.png rename to content/trusted-content/images/default_logo_sm.png diff --git a/content/trusted-content/images/doi-icon.svg b/content/trusted-content/images/doi-icon.svg new file mode 100644 index 0000000000..ccba28f803 --- /dev/null +++ b/content/trusted-content/images/doi-icon.svg @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/content/docker-hub/images/download-analytics-data.png b/content/trusted-content/images/download-analytics-data.png similarity index 100% rename from content/docker-hub/images/download-analytics-data.png rename to content/trusted-content/images/download-analytics-data.png diff --git a/content/trusted-content/images/dsos-icon.svg b/content/trusted-content/images/dsos-icon.svg new file mode 100644 index 0000000000..f62ff75981 --- /dev/null +++ b/content/trusted-content/images/dsos-icon.svg @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/content/trusted-content/images/dvp-icon.svg b/content/trusted-content/images/dvp-icon.svg new file mode 100644 index 0000000000..17acbd4997 --- /dev/null +++ b/content/trusted-content/images/dvp-icon.svg @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/content/docker-hub/images/insights-and-analytics-tab.png b/content/trusted-content/images/insights-and-analytics-tab.png similarity index 100% rename from content/docker-hub/images/insights-and-analytics-tab.png rename to content/trusted-content/images/insights-and-analytics-tab.png diff --git a/content/docker-hub/images/official-image-badge-iso.png b/content/trusted-content/images/official-image-badge-iso.png similarity index 100% rename from content/docker-hub/images/official-image-badge-iso.png rename to content/trusted-content/images/official-image-badge-iso.png diff --git a/content/docker-hub/images/official-image-badge.png b/content/trusted-content/images/official-image-badge.png similarity index 100% rename from content/docker-hub/images/official-image-badge.png rename to content/trusted-content/images/official-image-badge.png diff --git a/content/docker-hub/images/organization-tabs.png b/content/trusted-content/images/organization-tabs.png similarity index 100% rename from content/docker-hub/images/organization-tabs.png rename to content/trusted-content/images/organization-tabs.png diff --git a/content/docker-hub/images/sponsored-badge-iso.png b/content/trusted-content/images/sponsored-badge-iso.png similarity index 100% rename from content/docker-hub/images/sponsored-badge-iso.png rename to content/trusted-content/images/sponsored-badge-iso.png diff --git a/content/docker-hub/images/sponsored-badge.png b/content/trusted-content/images/sponsored-badge.png similarity index 100% rename from content/docker-hub/images/sponsored-badge.png rename to content/trusted-content/images/sponsored-badge.png diff --git a/content/docker-hub/images/upload_logo_sm.png b/content/trusted-content/images/upload_logo_sm.png similarity index 100% rename from content/docker-hub/images/upload_logo_sm.png rename to content/trusted-content/images/upload_logo_sm.png diff --git a/content/docker-hub/images/verified-publisher-badge-iso.png b/content/trusted-content/images/verified-publisher-badge-iso.png similarity index 100% rename from content/docker-hub/images/verified-publisher-badge-iso.png rename to content/trusted-content/images/verified-publisher-badge-iso.png diff --git a/content/docker-hub/images/verified-publisher-badge.png b/content/trusted-content/images/verified-publisher-badge.png similarity index 100% rename from content/docker-hub/images/verified-publisher-badge.png rename to content/trusted-content/images/verified-publisher-badge.png diff --git a/content/docker-hub/insights-analytics.md b/content/trusted-content/insights-analytics.md similarity index 99% rename from content/docker-hub/insights-analytics.md rename to content/trusted-content/insights-analytics.md index ca5c7b0937..e3d7b6da5d 100644 --- a/content/docker-hub/insights-analytics.md +++ b/content/trusted-content/insights-analytics.md @@ -4,6 +4,7 @@ description: Discover how to access usage statistics of your images on Docker Hu keywords: docker hub, hub, insights, analytics, api, verified publisher aliases: - /docker-hub/publish/insights-analytics/ +- /docker-hub/insights-analytics/ --- Insights and analytics provides usage analytics for Docker Verified @@ -207,4 +208,4 @@ associated with the IP address used to pull an image. If the IP type is that IP address (for example, `docker.com`). For any other IP type that's not `business`, the domain represents the internet service provider or hosting provider used to make the request. On average, only about 30% of all pulls -classify as the `business` IP type (this varies between publishers and images). \ No newline at end of file +classify as the `business` IP type (this varies between publishers and images). diff --git a/content/docker-hub/official_images.md b/content/trusted-content/official-images.md similarity index 98% rename from content/docker-hub/official_images.md rename to content/trusted-content/official-images.md index 3aa956b74a..59589c3dbf 100644 --- a/content/docker-hub/official_images.md +++ b/content/trusted-content/official-images.md @@ -5,6 +5,7 @@ keywords: Docker, docker, registry, accounts, plans, Dockerfile, Docker Hub, doc title: Docker Official Images aliases: - /docker-hub/official_repos/ +- /docker-hub/official_images/ --- The [Docker Official Images](https://hub.docker.com/search?q=&type=image&image_filter=official) are a @@ -20,7 +21,7 @@ The images exemplify [`Dockerfile` best practices](/engine/userguide/eng-image/d Images that are part of this program have a special badge on Docker Hub making it easier for you to identify projects that are official Docker images. -![Docker official image badge](./images/official-image-badge-iso.png) +![Docker official image badge](images/official-image-badge-iso.png) ## When to use Docker Official Images diff --git a/data/toc.yaml b/data/toc.yaml index 8d65de0b96..c5a82e33f0 100644 --- a/data/toc.yaml +++ b/data/toc.yaml @@ -1921,14 +1921,6 @@ Manuals: title: Access - path: /docker-hub/repos/ title: Manage - - path: /docker-hub/official_images/ - title: Docker Official images - - path: /docker-hub/dvp-program/ - title: Docker Verified Publisher Program - - path: /docker-hub/dsos-program/ - title: Docker-Sponsored Open Source Program - - path: /docker-hub/insights-analytics/ - title: Insights and analytics - path: /docker-hub/download-rate-limit/ title: Download rate limit - path: /docker-hub/webhooks/ @@ -2164,6 +2156,19 @@ Manuals: - path: /subscription/scout-details/ title: Docker Scout subscriptions and features +- sectiontitle: Trusted content + section: + - path: /trusted-content/ + title: Overview + - path: /trusted-content/official-images/ + title: Docker Official images + - path: /trusted-content/dvp-program/ + title: Docker Verified Publisher Program + - path: /trusted-content/dsos-program/ + title: Docker-Sponsored Open Source Program + - path: /trusted-content/insights-analytics/ + title: Insights and analytics + - title: Security announcements path: /security/