Skip to content

Commit a5590c8

Browse files
usha-mandyausha-mandya
authored
Merge pull request docker#11080 from thaJeztah/remove_dtr_link
Remove some enterprise-only content
2 parents d50029f + 021e13a commit a5590c8

37 files changed

Lines changed: 104 additions & 647 deletions

‎_data/glossary.yaml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,6 @@
7777
develop, ship, and run applications
7878
- The docker daemon process running on the host which manages images and containers
7979
(also called Docker Engine)
80-
<a class="glossary" name="docker_enterprise">Docker Enterprise</a>: |
81-
Docker Enterprise is a platform to build, ship, and run containerized applications, that
82-
you can deploy in the cloud or on-premise. It includes a tested and certified version of Docker,
83-
web UIs for managing your app resources, and support.
8480
<a class="glossary" name="docker_desktop_for_mac">Docker Desktop for Mac</a>: |
8581
[Docker Desktop for Mac](/docker-for-mac/) is an easy-to-install, lightweight
8682
Docker development environment designed specifically for the Mac. A native

‎_includes/enterprise_label_shortform.md‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎app/working-with-app.md‎

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ With Docker App, entire applications can now be managed as easily as images and
2424
Docker App lets you _build_, _validate_ and _deploy_ applications with the `docker app` command. You can
2525
even leverage secure supply-chain features such as signed `push` and `pull` operations.
2626

27-
> **NOTE**: `docker app` works with `Engine - Community 19.03` or higher and `Engine - Enterprise 19.03` or higher.
27+
> **NOTE**: `docker app` works with `Docker 19.03` or higher.
2828
2929
This guide walks you through two scenarios:
3030

@@ -42,7 +42,7 @@ This section describes the steps for creating a new Docker App project to famili
4242
1. Populate the project
4343
1. Validate the app
4444
1. Deploy the app
45-
1. Push the app to Docker Hub or Docker Trusted Registry
45+
1. Push the app to Docker Hub
4646
1. Install the app directly from Docker Hub
4747

4848
### Prerequisites
@@ -394,27 +394,7 @@ $ docker login
394394
$ docker app push my-app --platform="linux/amd64" --tag <hub-id>/<repo>:0.1.0
395395
```
396396

397-
### Push the app to DTR
398-
399-
Pushing an app to Docker Trusted Registry (DTR) involves the same procedure as
400-
[pushing an app to Docker Hub](#push-the-app-to-docker-hub) except that you
401-
need your DTR user credentials and [your DTR repository
402-
information](/ee/dtr/user/manage-images/review-repository-info/). To use client
403-
certificates for DTR authentication, see [Enable Client Certificate
404-
Authentication](/ee/enable-client-certificate-authentication/).
405-
406-
By default, all platform architectures are pushed to DTR. If you are pushing an
407-
official Docker image as part of your app, you may find your app bundle
408-
becomes large with all image architectures embedded. To just push the
409-
architecture required, you can add the `--platform` flag.
410-
411-
```bash
412-
$ docker login dtr.example.com
413-
414-
$ docker app push my-app --platform="linux/amd64" --tag dtr.example.com/<user>/<repo>:0.1.0
415-
```
416-
417-
### Install the app directly from Docker Hub or DTR
397+
### Install the app directly from Docker Hub
418398

419399
Now that the app is pushed to the registry, try an `inspect` and `install` command against it.
420400
The location of your app is different from the one provided in the examples.
@@ -433,7 +413,7 @@ hello.port 8080
433413
hello.text Hello world!
434414
```
435415

436-
This action was performed directly against the app in the registry. Note that for DTR, the application will be prefixed with the Fully Qualified Domain Name (FQDN) of your trusted registry.
416+
This action was performed directly against the app in the registry.
437417

438418
Now install it as a native Docker App by referencing the app in the registry, with a different port.
439419

‎desktop/enterprise/user/mac-user.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ true
212212
##### Insecure registries
213213
214214
You can set up a custom and insecure [registry](https://docs.docker.com/registry/introduction) to store your public or private images (instead of
215-
using [Docker Hub](https://hub.docker.com/) or [Docker Trusted Registry](https://docs.docker.com/ee/dtr/). Add URLs for
215+
using [Docker Hub](https://hub.docker.com/). Add URLs for
216216
your insecure registries and registry mirrors on which to host your images.
217217
218218
For more information, see:

‎desktop/enterprise/user/windows-user.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -352,8 +352,7 @@ Server:
352352
353353
You can set up your own [registries](https://docs.docker.com/registry/introduction) on the **Basic** Daemon settings.
354354
355-
Normally, you store public or private images in [Docker Hub](https://hub.docker.com/)
356-
and [Docker Trusted Registry](https://docs.docker.com/ee/dtr/). Here, you
355+
Normally, you store public or private images in [Docker Hub](https://hub.docker.com/). Here, you
357356
can use Docker to set up your own [insecure registry](https://docs.docker.com/registry/insecure/).
358357
Simply add URLs for insecure registries and registry mirrors on which to host your images.
359358

‎docker-for-mac/docker-toolbox.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,6 @@ is running a different version of server.
159159
default * virtualbox Running tcp://192.168.99.100:2376 v19.03.2
160160
docker-sandbox - digitalocean Running tcp://104.131.43.236:2376 v19.03.1
161161

162-
You might also run into a similar situation with Docker Universal Control Plane (UCP).
163-
164162
There are a few ways to address this problem and keep using your older
165163
machines. One solution is to use a version manager like
166164
[DVM](https://github.com/getcarina/dvm).

‎docker-for-windows/index.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ toc_max: 2
1717

1818
Welcome to Docker Desktop!
1919

20-
The _Docker Desktop for Windows_ section contains information about the Docker Desktop Community Stable release. For information about features available in Edge releases, see the [Edge release notes](edge-release-notes/). For information about Docker Desktop Enterprise (DDE) releases, see [Docker Desktop Enterprise](/desktop/enterprise/).
20+
The _Docker Desktop for Windows_ section contains information about the Docker Desktop Community Stable release. For information about features available in Edge releases, see the [Edge release notes](edge-release-notes.md). For information about Docker Desktop Enterprise (DDE) releases, see [Docker Desktop Enterprise](/desktop/enterprise/).
2121

2222
Docker is a full development platform to build, run, and share containerized applications. Docker Desktop is the best way to get started with Docker _on Windows_.
2323

@@ -547,7 +547,7 @@ Docker Desktop creates a certificate bundle of all user-trusted CAs based on
547547
the Windows certificate store, and appends it to Moby trusted certificates. Therefore, if an enterprise SSL certificate is trusted by the user on the host, it is trusted by Docker Desktop.
548548
549549
To learn more about how to install a CA root certificate for the registry, see
550-
[Verify repository client with certificates](/engine/security/certificates)
550+
[Verify repository client with certificates](../engine/security/certificates.md)
551551
in the Docker Engine topics.
552552
553553
### How do I add client certificates?

‎docker-hub/publish/certify-plugins-logging.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ There are two steps: (1) configure credentials, and (2) configure endpoints.
213213
-get-logs-script string
214214
An optional custom script used to retrieve the logs.
215215
-insecure-skip-verify
216-
Optional. Specifies to disable SSL verification for an insecure private Docker Trusted Registry.
216+
Optional. Specifies to disable SSL verification for an insecure private Docker Registry.
217217
-help
218218
Help on the command.
219219
-html

‎engine/context/working-with-contexts.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,8 +210,6 @@ You can verify that the context was imported with `docker context ls`.
210210

211211
The format of the import command is `docker context import <context-name> <context-file>`.
212212

213-
> **Note**: You can import the client bundle `.zip` file generated from UCP and run a command to set your context to UCP. For example, `docker context import ctx-name ucp-bundle.zip`.
214-
215213
Now, let's look at exporting just the Kubernetes parts of a context.
216214

217215
### Exporting a Kubernetes context

‎engine/install/linux-postinstall.md‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -142,13 +142,6 @@ Docker provides the [capability](../../config/containers/logging/index.md) to co
142142
143143
By default, the Docker daemon listens for connections on a UNIX socket to accept requests from local clients. It is possible to allow Docker to accept requests from remote hosts by configuring it to listen on an IP address and port as well as the UNIX socket. For more detailed information on this configuration option take a look at "Bind Docker to another host/port or a unix socket" section of the [Docker CLI Reference](https://docs.docker.com/engine/reference/commandline/dockerd/) article.
144144
145-
> Docker EE customers
146-
>
147-
> Docker EE customers can get remote CLI access to UCP with the UCP client bundle.
148-
> A UCP Client Bundle is generated by UCP and secured by mutual TLS. See the document on
149-
> [CLI access for UCP](https://docs.docker.com/ee/ucp/user-access/cli/) for more
150-
> information.
151-
152145
> Secure your connection
153146
>
154147
> Before configuring Docker to accept connections from remote hosts it is critically important that you

0 commit comments

Comments
 (0)