Skip to content

Commit

Permalink
Add more features
Browse files Browse the repository at this point in the history
  • Loading branch information
sarahsanders-docker committed Jan 15, 2025
1 parent 7161fe1 commit f588e2d
Show file tree
Hide file tree
Showing 12 changed files with 40 additions and 50 deletions.
6 changes: 2 additions & 4 deletions content/manuals/admin/organization/activity-logs.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ aliases:
- /docker-hub/audit-log/
---

{{< summary-bar feature_name="Activity logs" >}}

Activity logs display a chronological list of activities that occur at organization and repository levels. It provides a report to owners on all their member activities.

With activity logs, owners can view and track:
Expand All @@ -18,10 +20,6 @@ For example, activity logs display activities such as the date when a repository

Owners can also see the activity logs for their repository if the repository is part of the organization subscribed to a Docker Business or Team plan.

> [!NOTE]
>
> Activity logs requires a [Docker Team or Business subscription](/manuals/subscription/_index.md).
## Manage activity logs

{{< tabs >}}
Expand Down
9 changes: 6 additions & 3 deletions content/manuals/admin/organization/insights.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@ keywords: organization, insights
title: Insights
---

> [!NOTE]
>
> Insights requires a [Docker Business subscription](../../subscription/details.md#docker-business) and administrators must [enforce sign-in](/security/for-admins/enforce-sign-in/). This ensures users sign in with an account associated with their organization.
{{< summary-bar feature_name="Insights" >}}

Insights helps administrators visualize and understand how Docker is used within
their organizations. With Insights, administrators can ensure their teams are
Expand All @@ -24,6 +22,11 @@ Key benefits include:
- Optimized license use. Ensure that developers have access to advanced
features provided by a Docker subscription.

## Prerequisites
- [Docker Business subscription](../../subscription/details.md#docker-business)
- Administrators must [enforce sign-in](/security/for-admins/enforce-sign-in/) for users
- Insights enabled by your Customer Success Manager

## View Insights for organization users

{{< include "admin-early-access.md" >}}
Expand Down
4 changes: 1 addition & 3 deletions content/manuals/copilot/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@ description: |
keywords: Docker, GitHub Copilot, extension, Visual Studio Code, chat, ai, containerization
---

{{% restricted title="Early Access" %}}
The Docker for GitHub Copilot extension is an [early access](/release-lifecycle#early-access-ea) product.
{{% /restricted %}}
{{< summary-bar feature_name="Docker GitHub Copilot" >}}

The [Docker for GitHub Copilot](https://github.com/marketplace/docker-for-github-copilot)
extension integrates Docker's capabilities with GitHub Copilot, providing
Expand Down
4 changes: 1 addition & 3 deletions content/manuals/copilot/examples.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@ description: |
weight: 30
---

{{% restricted title="Early Access" %}}
The Docker for GitHub Copilot extension is an [early access](/release-lifecycle#early-access-ea) product.
{{% /restricted %}}
{{< summary-bar feature_name="Docker GitHub Copilot" >}}

## Use cases

Expand Down
4 changes: 1 addition & 3 deletions content/manuals/copilot/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@ description: |
weight: 10
---

{{% restricted title="Early Access" %}}
The Docker for GitHub Copilot extension is an [early access](/release-lifecycle#early-access-ea) product.
{{% /restricted %}}
{{< summary-bar feature_name="Docker GitHub Copilot" >}}

To use the Docker for GitHub copilot extension, you first need to
[install](#install) the extension for your organization, and
Expand Down
4 changes: 1 addition & 3 deletions content/manuals/copilot/usage.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ description: |
weight: 20
---

{{% restricted title="Early Access" %}}
The Docker for GitHub Copilot extension is an [early access](/release-lifecycle#early-access-ea) product.
{{% /restricted %}}
{{< summary-bar feature_name="Docker GitHub Copilot" >}}

The Docker Extension for GitHub Copilot provides a chat interface that you can
use to interact with the Docker agent. You can ask questions and get help
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@ params:
text: EA
---

{{% restricted title="Early Access" %}}
The PKG installer is currently an [Early Access](/manuals/release-lifecycle.md) feature and is available to all company and organization owners with a Business subscription and Docker Desktop version 4.36 and later.
{{% /restricted %}}
{{< summary-bar feature_name="PKG installer" >}}

The PKG package supports various MDM (Mobile Device Management) solutions, making it ideal for bulk installations and eliminating the need for manual setups by individual users. With this package, IT administrators can ensure standardized, policy-driven installations of Docker Desktop, enhancing efficiency and software management across their organizations.

Expand Down
4 changes: 1 addition & 3 deletions content/manuals/desktop/use-desktop/builds.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,7 @@ Docker Desktop settings.

### Import builds

{{% experimental title="Beta feature" %}}
Import builds is currently in [Beta](../../release-lifecycle.md#Beta).
{{% /experimental %}}
{{< summary-bar feature_name="Import builds" >}}

The **Import builds** button lets you import build records for builds by other
people, or builds in a CI environment. When you've imported a build record, it
Expand Down
22 changes: 9 additions & 13 deletions content/manuals/extensions/private-marketplace.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,14 @@ title: Configure a private marketplace for extensions
tags: [admin]
linkTitle: Configure a private marketplace
weight: 30
aliases:
aliases:
- /desktop/extensions/private-marketplace/
---

{{% experimental title="Beta" %}}
This feature is currently in [Beta](/manuals/release-lifecycle.md#beta). It is available to Docker Business customers only.
{{% /experimental %}}
{{< summary-bar feature_name="Private marketplace" >}}

Learn how to configure and set up a private marketplace with a curated list of extensions for your Docker Desktop users.

It is designed specifically

Docker Extensions' private marketplace is designed specifically for organizations who don’t give developers root access to their machines. It makes use of [Settings Management](/manuals/security/for-admins/hardened-desktop/settings-management/_index.md) so administrators have complete control over the private marketplace.

## Prerequisites
Expand Down Expand Up @@ -85,7 +81,7 @@ Each setting has a `value` that you can set, including a `locked` field that let

To find out more information about the `admin-settings.json` file, see [Settings Management](/manuals/security/for-admins/hardened-desktop/settings-management/_index.md).

## Step three: List allowed extensions
## Step three: List allowed extensions

The generated `extensions.txt` file defines the list of extensions that are available in your private marketplace.

Expand All @@ -99,14 +95,14 @@ docker/disk-usage-extension:0.2.8

If no tag is provided, the latest tag available for the image is used. You can also comment out lines with `#` so the extension is ignored.

This list can include different types of extension images:
This list can include different types of extension images:

- Extensions from the public marketplace or any public image stored in Docker Hub.
- Extension images stored in Docker Hub as private images. Developers need to be signed in and have pull access to these images.
- Extension images stored in a private registry. Developers need to be signed in and have pull access to these images.

> [!IMPORTANT]
>
>
> Your developers can only install the version of the extension that you’ve listed.
## Step four: Generate the private marketplace
Expand Down Expand Up @@ -139,7 +135,7 @@ $ /opt/docker-desktop/extension-admin generate

This creates an `extension-marketplace` directory and downloads the marketplace metadata for all the allowed extensions.

The marketplace content is generated from extension image information as image labels, which is the [same format as public extensions](extensions-sdk/extensions/labels.md). It includes the extension title, description, screenshots, links, etc.
The marketplace content is generated from extension image information as image labels, which is the [same format as public extensions](extensions-sdk/extensions/labels.md). It includes the extension title, description, screenshots, links, etc.

## Step five: Test the private marketplace setup

Expand Down Expand Up @@ -186,7 +182,7 @@ When you select the **Extensions** tab, you should see the private marketplace l

Once you’ve confirmed that the private marketplace configuration works, the final step is to distribute the files to the developers’ machines with the MDM software your organization uses. For example, [Jamf](https://www.jamf.com/).

The files to distribute are:
The files to distribute are:
* `admin-settings.json`
* the entire `extension-marketplace` folder and its subfolders

Expand Down
6 changes: 1 addition & 5 deletions content/manuals/scout/policy/scores.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,7 @@ description: |
keywords: scout, health scores, evaluation, checks, grades, docker hub
---

{{% restricted title="Beta" %}}
Health scores is a [Beta](/release-lifecycle/#beta) feature of Docker Scout.
The feature is only available to organizations selected to participate in the
early access program.
{{% /restricted %}}
{{< summary-bar feature_name="Docker Scout health scores" >}}

Docker Scout health scores provide a security assessment, and overall supply
chain health, of images on Docker Hub, helping you determine whether an image
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@ aliases:
weight: 30
---

> [!NOTE]
>
> Registry Access Management is available to [Docker Business](/manuals/subscription/details.md) customers only.
{{< summary-bar feature_name="Registry access management" >}}

With Registry Access Management (RAM), administrators can ensure that their developers using Docker Desktop only access allowed registries. This is done through the Registry Access Management dashboard in Docker Hub or the Docker Admin Console.

Expand Down
19 changes: 15 additions & 4 deletions data/summary.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
Activity logs:
subscription: [Team, Business]
for: Administrators
Admin Console:
subscription: [Business]
availability: Early access
Expand All @@ -21,31 +24,39 @@ Docker GitHub Copilot:
Docker Scout GitHub:
availability: Beta
Docker Scout health scores:
subscription: [Pro, Team, Business]
availability: Beta
General admin:
for: Administrators
Import builds:
availability: Beta
requires: Docker Desktop 4.31 and later
Insights:
subscription: [Business]
for: Administrators
Intune:
for: Administrators
Jamf Pro:
for: Administrators
MSI Installer:
availability: Docker Desktop 4.32 and later
for: Administrator
for: Administrators
OATs:
subscription: [Team, Business]
availability: Beta
PKG Installer:
PKG installer:
subscription: [Business]
availability: Early access
requires: Docker Desktop 4.36 and later
for: Administrator
for: Administrators
Private marketplace:
availability: Beta
for: Administrator
for: Administrators
Remediation with Docker Scout:
availability: Beta
Registry access management:
subscription: [Business]
for: Administrators
SSO:
subscription: [Business]
for: Administrators
Expand Down

0 comments on commit f588e2d

Please sign in to comment.