mirror of https://github.com/docker/docs.git
Merge branch 'master' into updatewinenginever
This commit is contained in:
Maria Bermudez
GitHub
commit
d59d0e66f9
|
|
@ -1204,8 +1204,6 @@ manuals:
|
|||
title: UCP configuration file
|
||||
- path: /ee/ucp/admin/configure/use-node-local-network-in-swarm/
|
||||
title: Use a local node network in a swarm
|
||||
- path: /ee/ucp/admin/configure/use-nfs-volumes/
|
||||
title: Use NFS persistent storage
|
||||
- path: /ee/ucp/admin/configure/use-your-own-tls-certificates/
|
||||
title: Use your own TLS certificates
|
||||
- path: /ee/ucp/admin/configure/manage-and-deploy-private-images/
|
||||
|
|
@ -1345,6 +1343,8 @@ manuals:
|
|||
section:
|
||||
- title: Access Kubernetes Resources
|
||||
path: /ee/ucp/kubernetes/kube-resources/
|
||||
- title: Use NFS persistent storage
|
||||
path: /ee/ucp/admin/configure/use-nfs-volumes/
|
||||
- title: Configure AWS EBS Storage for Kubernetes
|
||||
path: /ee/ucp/kubernetes/configure-aws-storage/
|
||||
- title: Deploy a workload
|
||||
|
|
|
|||
|
|
@ -137,7 +137,7 @@ You only need to set up the repository once, after which you can install Docker
|
|||
|
||||
{% elsif section == "install-using-yum-repo" %}
|
||||
|
||||
> ***NOTE:*** If you need to run Docker EE 2.0, please see the following instructions:
|
||||
> **Note**: If you need to run Docker EE 2.0, please see the following instructions:
|
||||
> * [18.03](https://docs.docker.com/v18.03/ee/supported-platforms/) - Older Docker EE Engine only release
|
||||
> * [17.06](https://docs.docker.com/v17.06/engine/installation/) - Docker Enterprise Edition 2.0 (Docker Engine,
|
||||
> UCP, and DTR).
|
||||
|
|
|
|||
|
|
@ -990,7 +990,7 @@ as it has the highest priority. It then connects to `app_net_3`, then
|
|||
app_net_2:
|
||||
app_net_3:
|
||||
|
||||
> **Note:** If multiple networks have the same priority, the connection order
|
||||
> **Note**: If multiple networks have the same priority, the connection order
|
||||
> is undefined.
|
||||
|
||||
### pid
|
||||
|
|
@ -1235,7 +1235,7 @@ volumes:
|
|||
mydata:
|
||||
```
|
||||
|
||||
> **Note:** When creating bind mounts, using the long syntax requires the
|
||||
> **Note**: When creating bind mounts, using the long syntax requires the
|
||||
> referenced folder to be created beforehand. Using the short syntax
|
||||
> creates the folder on the fly if it doesn't exist.
|
||||
> See the [bind mounts documentation](/engine/admin/volumes/bind-mounts.md/#differences-between--v-and---mount-behavior)
|
||||
|
|
@ -1248,7 +1248,7 @@ service.
|
|||
|
||||
volume_driver: mydriver
|
||||
|
||||
> **Note:** In [version 2 files](compose-versioning.md#version-2), this
|
||||
> **Note**: In [version 2 files](compose-versioning.md#version-2), this
|
||||
> option only applies to anonymous volumes (those specified in the image,
|
||||
> or specified under `volumes` without an explicit named volume or host path).
|
||||
> To configure the driver for a named volume, use the `driver` key under the
|
||||
|
|
@ -1298,7 +1298,7 @@ then read-write is used.
|
|||
Each of these is a single value, analogous to its
|
||||
[docker run](/engine/reference/run.md) counterpart.
|
||||
|
||||
> **Note:** The following options were added in [version 2.2](compose-versioning.md#version-22):
|
||||
> **Note**: The following options were added in [version 2.2](compose-versioning.md#version-22):
|
||||
> `cpu_count`, `cpu_percent`, `cpus`.
|
||||
> The following options were added in [version 2.1](compose-versioning.md#version-21):
|
||||
> `oom_kill_disable`, `cpu_period`
|
||||
|
|
|
|||
|
|
@ -279,7 +279,7 @@ at build time is the value in the environment where Compose is running.
|
|||
|
||||
#### cache_from
|
||||
|
||||
> **Note:** This option is new in v3.2
|
||||
> **Note**: This option is new in v3.2
|
||||
|
||||
A list of images that the engine uses for cache resolution.
|
||||
|
||||
|
|
@ -291,7 +291,7 @@ A list of images that the engine uses for cache resolution.
|
|||
|
||||
#### labels
|
||||
|
||||
> **Note:** This option is new in v3.3
|
||||
> **Note**: This option is new in v3.3
|
||||
|
||||
Add metadata to the resulting image using [Docker labels](/engine/userguide/labels-custom-metadata.md).
|
||||
You can use either an array or a dictionary.
|
||||
|
|
@ -490,7 +490,7 @@ an error.
|
|||
|
||||
### credential_spec
|
||||
|
||||
> **Note:** this option was added in v3.3.
|
||||
> **Note**: this option was added in v3.3.
|
||||
|
||||
Configure the credential spec for managed service account. This option is only
|
||||
used for services using Windows containers. The `credential_spec` must be in the
|
||||
|
|
@ -1431,7 +1431,7 @@ containers in the bare-metal machine's namespace and vice versa.
|
|||
|
||||
Expose ports.
|
||||
|
||||
> **Note:** Port mapping is incompatible with `network_mode: host`
|
||||
> **Note**: Port mapping is incompatible with `network_mode: host`
|
||||
|
||||
#### Short syntax
|
||||
|
||||
|
|
@ -1473,7 +1473,7 @@ ports:
|
|||
|
||||
```
|
||||
|
||||
> **Note:** The long syntax is new in v3.2
|
||||
> **Note**: The long syntax is new in v3.2
|
||||
|
||||
### restart
|
||||
|
||||
|
|
@ -1810,7 +1810,7 @@ volumes:
|
|||
mydata:
|
||||
```
|
||||
|
||||
> **Note:** The long syntax is new in v3.2
|
||||
> **Note**: The long syntax is new in v3.2
|
||||
|
||||
|
||||
#### Volumes for services, swarms, and stack files
|
||||
|
|
|
|||
|
|
@ -129,7 +129,7 @@ by step instructions are also included below.
|
|||
sudo chmod +x /usr/local/bin/docker-compose
|
||||
```
|
||||
|
||||
> ***Note:*** If the command `docker-compose` fails after installation, check your path.
|
||||
> **Note**: If the command `docker-compose` fails after installation, check your path.
|
||||
> You can also create a symbolic link to `/usr/bin` or any other directory in your path.
|
||||
|
||||
For example:
|
||||
|
|
|
|||
|
|
@ -28,8 +28,8 @@ any of the following:
|
|||
|:-----------------|:------------------------------------------------------------------------------------------------|
|
||||
| `no` | Do not automatically restart the container. (the default) |
|
||||
| `on-failure` | Restart the container if it exits due to an error, which manifests as a non-zero exit code. |
|
||||
| `unless-stopped` | Restart the container unless it is explicitly stopped or Docker itself is stopped or restarted. |
|
||||
| `always` | Always restart the container if it stops. |
|
||||
| `always` | Always restart the container if it stops. If it is manually stopped, it is restarted only when Docker daemon restarts or the container itself is manually restarted. (See the second bullet listed in [restart policy details](#restart-policy-details)) |
|
||||
| `unless-stopped` | Similar to `always`, except that when the container is stopped (manually or otherwise), it is not restarted even after Docker daemon restarts. |
|
||||
|
||||
The following example starts a Redis container and configures it to always
|
||||
restart unless it is explicitly stopped or Docker is restarted.
|
||||
|
|
|
|||
|
|
@ -101,7 +101,7 @@ you need to add this configuration in the Docker systemd service file.
|
|||
The `NO_PROXY` variable specifies a string that contains comma-separated
|
||||
values for hosts that should be excluded from proxying. These are the
|
||||
options you can specify to exclude hosts:
|
||||
* IP address prefix (`1.2.3.4`) or in CIDR notation (`1.2.3.4/8`)
|
||||
* IP address prefix (`1.2.3.4`)
|
||||
* Domain name, or a special DNS label (`*`)
|
||||
* A domain name matches that name and all subdomains. A domain name with
|
||||
a leading "." matches subdomains only. For example, given the domains
|
||||
|
|
|
|||
|
|
@ -24,11 +24,13 @@ command.
|
|||
|
||||
Example usage:
|
||||
|
||||
```bash
|
||||
$ docker run -it --rm dtr-internal.caas.docker.io/caas/dtr:2.4.0-alpha-008434_ge02413a install \
|
||||
--ucp-node <UCP_NODE_HOSTNAME> \
|
||||
--ucp-insecure-tls
|
||||
```
|
||||
|
||||
Note: Use --ucp-ca "$(cat ca.pem)" instead of --ucp-insecure-tls for a production deployment.
|
||||
> **Note**: Use `--ucp-ca "$(cat ca.pem)"` instead of `--ucp-insecure-tls` for a production deployment.
|
||||
|
||||
## Options
|
||||
|
||||
|
|
|
|||
|
|
@ -24,11 +24,13 @@ command.
|
|||
|
||||
Example usage:
|
||||
|
||||
```bash
|
||||
$ docker run -it --rm docker/dtr:2.4.1 install \
|
||||
--ucp-node <UCP_NODE_HOSTNAME> \
|
||||
--ucp-insecure-tls
|
||||
```
|
||||
|
||||
Note: Use --ucp-ca "$(cat ca.pem)" instead of --ucp-insecure-tls for a production deployment.
|
||||
> **Note**: Use `--ucp-ca "$(cat ca.pem)"` instead of `--ucp-insecure-tls` for a production deployment.
|
||||
|
||||
## Options
|
||||
|
||||
|
|
|
|||
|
|
@ -14,10 +14,10 @@ upgrade your installation to the latest release.
|
|||
|
||||
(18 Jan 2017)
|
||||
|
||||
Note: UCP 1.1.6 supports Docker Engine 1.12 but does not use the built-in
|
||||
orchestration capabilities provided by the Docker Engine with swarm mode enabled.
|
||||
When installing this UCP version on a Docker Engine 1.12 host, UCP creates a
|
||||
cluster using the older Docker Swarm v1.2.
|
||||
> **Note**: UCP 1.1.6 supports Docker Engine 1.12 but does not use the built-in
|
||||
> orchestration capabilities provided by the Docker Engine with swarm mode enabled.
|
||||
> When installing this UCP version on a Docker Engine 1.12 host, UCP creates a
|
||||
> cluster using the older Docker Swarm v1.2.
|
||||
|
||||
**Security Update**
|
||||
|
||||
|
|
@ -41,10 +41,10 @@ the [permissions levels section](user-management/permission-levels.md) for more
|
|||
|
||||
(8 Dec 2016)
|
||||
|
||||
Note: UCP 1.1.5 supports Docker Engine 1.12 but does not use the built-in
|
||||
orchestration capabilities provided by the Docker Engine with swarm mode enabled.
|
||||
When installing this UCP version on a Docker Engine 1.12 host, UCP creates a
|
||||
cluster using the older Docker Swarm v1.2.
|
||||
> **Note**: UCP 1.1.5 supports Docker Engine 1.12 but does not use the built-in
|
||||
> orchestration capabilities provided by the Docker Engine with swarm mode enabled.
|
||||
> When installing this UCP version on a Docker Engine 1.12 host, UCP creates a
|
||||
> cluster using the older Docker Swarm v1.2.
|
||||
|
||||
**Bug fixes**
|
||||
|
||||
|
|
@ -61,10 +61,10 @@ the authentication process.
|
|||
|
||||
(29 Sept 2016)
|
||||
|
||||
Note: UCP 1.1.4 supports Docker Engine 1.12 but does not use the built-in
|
||||
orchestration capabilities provided by the Docker Engine with swarm mode enabled.
|
||||
When installing this UCP version on a Docker Engine 1.12 host, UCP creates a
|
||||
cluster using Docker Swarm v1.2.5.
|
||||
> **Note**: UCP 1.1.4 supports Docker Engine 1.12 but does not use the built-in
|
||||
> orchestration capabilities provided by the Docker Engine with swarm mode enabled.
|
||||
> When installing this UCP version on a Docker Engine 1.12 host, UCP creates a
|
||||
> cluster using Docker Swarm v1.2.5.
|
||||
|
||||
**Bug fixes**
|
||||
|
||||
|
|
@ -76,10 +76,10 @@ organization accounts
|
|||
|
||||
## Version 1.1.3
|
||||
|
||||
Note: UCP 1.1.3 supports Docker Engine 1.12 but does not use the built-in
|
||||
orchestration capabilities provided by the Docker Engine with swarm mode enabled.
|
||||
When installing this UCP version on a Docker Engine 1.12 host, UCP creates a
|
||||
cluster using Docker Swarm v1.2.5.
|
||||
> **Note**: UCP 1.1.3 supports Docker Engine 1.12 but does not use the built-in
|
||||
> orchestration capabilities provided by the Docker Engine with swarm mode enabled.
|
||||
> When installing this UCP version on a Docker Engine 1.12 host, UCP creates a
|
||||
> cluster using Docker Swarm v1.2.5.
|
||||
|
||||
**Security Update**
|
||||
|
||||
|
|
@ -125,9 +125,9 @@ enabled, and is not compatible with swarm-mode based APIs, e.g. `docker service`
|
|||
|
||||
## Version 1.1.2
|
||||
|
||||
Note: UCP 1.1.2 supports Docker Engine 1.12 but doesn't use the new clustering
|
||||
capabilities provided by the Docker swarm mode. When installing this UCP version
|
||||
on a Docker Engine 1.12, UCP creates a "classic" Docker Swarm 1.2.3 cluster.
|
||||
> **Note**: UCP 1.1.2 supports Docker Engine 1.12 but doesn't use the new clustering
|
||||
> capabilities provided by the Docker swarm mode. When installing this UCP version
|
||||
> on a Docker Engine 1.12, UCP creates a "classic" Docker Swarm 1.2.3 cluster.
|
||||
|
||||
**Features**
|
||||
|
||||
|
|
|
|||
|
|
@ -194,7 +194,8 @@ apply two labels to your service:
|
|||
com.docker.ucp.mesh.http.1=external_route=http://example.org,redirect=https://example.org
|
||||
com.docker.ucp.mesh.http.2=external_route=sni://example.org
|
||||
```
|
||||
Note: It is not possible to redirect HTTPS to HTTP.
|
||||
|
||||
> **Note**: It is not possible to redirect HTTPS to HTTP.
|
||||
|
||||
### X-Forwarded-For header
|
||||
|
||||
|
|
|
|||
|
|
@ -41,6 +41,17 @@ As part of your backup policy you should regularly create backups of UCP.
|
|||
DTR is backed up independently.
|
||||
[Learn about DTR backups and recovery](../../../../dtr/2.3/guides/admin/backups-and-disaster-recovery.md).
|
||||
|
||||
> Warning: On UCP versions 3.0.0 - 3.0.7, before performing a UCP backup, you must clean up multiple /dev/shm mounts in the ucp-kublet entrypoint script by running the following script on all nodes via cron job:
|
||||
|
||||
```
|
||||
SHM_MOUNT=$(grep -m1 '^tmpfs./dev/shm' /proc/mounts)
|
||||
while [ $(grep -cm2 '^tmpfs./dev/shm' /proc/mounts) -gt 1 ]; do
|
||||
sudo umount /dev/shm
|
||||
done
|
||||
grep -q '^tmpfs./dev/shm' /proc/mounts || sudo mount "${SHM_MOUNT}"
|
||||
```
|
||||
For additional details, refer to [Docker KB000934](https://success.docker.com/article/more-than-one-dev-shm-mount-in-the-host-namespace){: target="_blank"}
|
||||
|
||||
To create a UCP backup, run the `{{ page.ucp_org }}/{{ page.ucp_repo }}:{{ page.ucp_version }} backup` command
|
||||
on a single UCP manager. This command creates a tar archive with the
|
||||
contents of all the [volumes used by UCP](../architecture.md) to persist data
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ impact to your users.
|
|||
Don't make changes to UCP configurations while you're upgrading.
|
||||
This can lead to misconfigurations that are difficult to troubleshoot.
|
||||
|
||||
> Note: If you are upgrading a cluster to UCP 3.0.2 or higher on Microsoft
|
||||
> **Note**: If you are upgrading a cluster to UCP 3.0.2 or higher on Microsoft
|
||||
> Azure then please ensure all of the Azure [prerequisities](install-on-azure.md/#azure-prerequisites)
|
||||
> are met.
|
||||
|
||||
|
|
|
|||
|
|
@ -187,7 +187,8 @@ apply two labels to your service:
|
|||
com.docker.ucp.mesh.http.1=external_route=http://example.org,redirect=https://example.org
|
||||
com.docker.ucp.mesh.http.2=external_route=sni://example.org
|
||||
```
|
||||
Note: It is not possible to redirect HTTPS to HTTP.
|
||||
|
||||
> **Note**: It is not possible to redirect HTTPS to HTTP.
|
||||
|
||||
### X-Forwarded-For header
|
||||
|
||||
|
|
|
|||
|
|
@ -412,9 +412,9 @@ $ security add-trusted-cert -d -r trustRoot -k ~/Library/Keychains/login.keychai
|
|||
See also, [Directory structures for
|
||||
certificates](#directory-structures-for-certificates).
|
||||
|
||||
> **Note:** You need to restart Docker Desktop for Mac after making any changes to the
|
||||
keychain or to the `~/.docker/certs.d` directory in order for the changes to
|
||||
take effect.
|
||||
> **Note**: You need to restart Docker Desktop for Mac after making any changes to the
|
||||
> keychain or to the `~/.docker/certs.d` directory in order for the changes to
|
||||
> take effect.
|
||||
|
||||
For a complete explanation of how to do this, see the blog post [Adding
|
||||
Self-signed Registry Certs to Docker & Docker Desktop for
|
||||
|
|
|
|||
|
|
@ -129,9 +129,9 @@ For each source:
|
|||
|
||||
* Specify the **Dockerfile location** as a path relative to the root of the source code repository. (If the Dockerfile is at the repository root, leave this path set to `/`.)
|
||||
|
||||
> **Note:** When Docker Hub pulls a branch from a source code repository, it performs
|
||||
a shallow clone (only the tip of the specified branch). Refer to [Advanced options for Autobuild and Autotest](advanced.md)
|
||||
for more information.
|
||||
> **Note**: When Docker Hub pulls a branch from a source code repository, it performs
|
||||
> a shallow clone (only the tip of the specified branch). Refer to [Advanced options for Autobuild and Autotest](advanced.md)
|
||||
> for more information.
|
||||
|
||||
### Environment variables for builds
|
||||
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ Docker Hub Organizations let you create teams so you can give your team access t
|
|||
- **Organizations** are a collection of teams and repositories that can be managed together.
|
||||
- **Teams** are groups of Docker Hub users that belong to your organization.
|
||||
|
||||
**Note:** in Docker Hub, users cannot be associated directly to an organization. They belong only to teams within an organization.
|
||||
> **Note**: in Docker Hub, users cannot be associated directly to an organization. They belong only to teams within an organization.
|
||||
|
||||
### Creating an organization
|
||||
|
||||
|
|
@ -48,7 +48,7 @@ To create a team:
|
|||
2. Click on **Add User**
|
||||
3. Provide the user's Docker ID username _or_ email to add them to the team 
|
||||
|
||||
**Note:** you are not automatically added to teams created by your organization.
|
||||
> **Note**: you are not automatically added to teams created by your organization.
|
||||
|
||||
### Removing team members
|
||||
|
||||
|
|
|
|||
|
|
@ -466,11 +466,12 @@ root:[~/] #
|
|||
root:[~/] # ./inspectDockerImage --json gforghetti/apache:latest | jq
|
||||
```
|
||||
|
||||
Note: The output was piped to the **jq** command to display it "nicely".
|
||||
|
||||
> **Note**: The output was piped to the `jq` command to display it "nicely".
|
||||
|
||||
#### Output:
|
||||
|
||||
```
|
||||
```json
|
||||
{
|
||||
"Date": "Mon May 21 13:23:37 2018",
|
||||
"SystemOperatingSystem": "Operating System: Ubuntu 16.04.4 LTS",
|
||||
|
|
@ -580,7 +581,6 @@ Note: The output was piped to the **jq** command to display it "nicely".
|
|||
}
|
||||
]
|
||||
}
|
||||
root:[~/] #
|
||||
```
|
||||
|
||||
<a name="linux-with-html">
|
||||
|
|
|
|||
|
|
@ -364,12 +364,11 @@ gforghetti:~/$
|
|||
gforghetti:~:$ ./inspectDockerLoggingPlugin --json gforghetti/docker-log-driver-test:latest | jq
|
||||
```
|
||||
|
||||
> Note: The output was piped to the **jq** command to display it "nicely".
|
||||
> **Note**: The output was piped to the `jq` command to display it "nicely".
|
||||
|
||||
#### Output:
|
||||
|
||||
|
||||
```
|
||||
```json
|
||||
{
|
||||
"Date": "Mon May 21 14:38:28 2018",
|
||||
"SystemOperatingSystem": "Operating System: Ubuntu 16.04.4 LTS",
|
||||
|
|
|
|||
|
|
@ -82,7 +82,7 @@ stored in the primary DTR. You can
|
|||
[customize the storage parameters](/registry/configuration/#storage),
|
||||
if you want the cached images to be backended by persistent storage.
|
||||
|
||||
> Note: Kubernetes Peristent Volumes or Persistent Volume Claims would have to be
|
||||
> **Note**: Kubernetes Peristent Volumes or Persistent Volume Claims would have to be
|
||||
> used to provide persistent backend storage capabilities for the cache.
|
||||
|
||||
```
|
||||
|
|
|
|||
|
|
@ -38,7 +38,8 @@ docker run -it --rm \
|
|||
--https-proxy username:password@<doman>:<port> \
|
||||
--ucp-insecure-tls
|
||||
```
|
||||
NOTE: DTR will hide the password portion of the URL, when it is displayed in the DTR UI.
|
||||
|
||||
> **Note**: DTR will hide the password portion of the URL, when it is displayed in the DTR UI.
|
||||
|
||||
## Where to go next
|
||||
|
||||
|
|
|
|||
|
|
@ -45,6 +45,17 @@ As part of your backup policy you should regularly create backups of UCP.
|
|||
DTR is backed up independently.
|
||||
[Learn about DTR backups and recovery](../../dtr/2.5/admin/disaster-recovery/index.md).
|
||||
|
||||
> Warning: On UCP versions 3.1.0 - 3.1.2, before performing a UCP backup, you must clean up multiple /dev/shm mounts in the ucp-kublet entrypoint script by running the following script on all nodes via cron job:
|
||||
|
||||
```
|
||||
SHM_MOUNT=$(grep -m1 '^tmpfs./dev/shm' /proc/mounts)
|
||||
while [ $(grep -cm2 '^tmpfs./dev/shm' /proc/mounts) -gt 1 ]; do
|
||||
sudo umount /dev/shm
|
||||
done
|
||||
grep -q '^tmpfs./dev/shm' /proc/mounts || sudo mount "${SHM_MOUNT}"
|
||||
```
|
||||
For additional details, refer to [Docker KB000934](https://success.docker.com/article/more-than-one-dev-shm-mount-in-the-host-namespace){: target="_blank"}
|
||||
|
||||
To create a UCP backup, run the `{{ page.ucp_org }}/{{ page.ucp_repo }}:{{ page.ucp_version }} backup` command
|
||||
on a single UCP manager. This command creates a tar archive with the
|
||||
contents of all the [volumes used by UCP](../ucp-architecture.md) to persist data
|
||||
|
|
|
|||
|
|
@ -22,16 +22,16 @@ The Docker EE platform provides a base set of metrics that gets you running and
|
|||
## Business metrics ##
|
||||
|
||||
These are high-level aggregate metrics that typically combine technical, financial, and organizational data to create metrics for business leaders of the IT infrastructure. Some examples of business metrics might be:
|
||||
- Company or division-level application downtime
|
||||
- Aggregate resource utilization
|
||||
- Application resource demand growth
|
||||
- Company or division-level application downtime
|
||||
- Aggregate resource utilization
|
||||
- Application resource demand growth
|
||||
|
||||
## Application metrics ##
|
||||
|
||||
These are metrics about domain of APM tools like AppDynamics or DynaTrace and provide metrics about the state or performance of the application itself.
|
||||
- Service state metrics
|
||||
- Container platform metrics
|
||||
- Host infrastructure metrics
|
||||
- Service state metrics
|
||||
- Container platform metrics
|
||||
- Host infrastructure metrics
|
||||
|
||||
Docker EE 2.1 does not collect or expose application level metrics.
|
||||
|
||||
|
|
@ -40,9 +40,9 @@ The following are metrics Docker EE 2.1 collects, aggregates, and exposes:
|
|||
## Service state metrics ##
|
||||
|
||||
These are metrics about the state of services running on the container platform. These types of metrics have very low cardinality, meaning the values are typically from a small fixed set of possibilities, commonly binary.
|
||||
- Application health
|
||||
- Convergence of K8s deployments and Swarm services
|
||||
- Cluster load by number of services or containers or pods
|
||||
- Application health
|
||||
- Convergence of K8s deployments and Swarm services
|
||||
- Cluster load by number of services or containers or pods
|
||||
|
||||
## Deploy Prometheus on worker nodes
|
||||
|
||||
|
|
|
|||
|
|
@ -195,6 +195,17 @@ events and may create a large amount of log entries.
|
|||
- /kubernetesdocs
|
||||
- /manage
|
||||
|
||||
## API endpoint information redacted
|
||||
|
||||
Information for the following API endpoints is redacted from the audit logs for security purposes:
|
||||
|
||||
- `/secrets/create` (POST)
|
||||
- `/secrets/{id}/update` (POST)
|
||||
- `/swarm/join` (POST)
|
||||
- `/swarm/update` (POST)
|
||||
-`/auth/login` (POST)
|
||||
- Kube secrete create/update endpoints
|
||||
|
||||
## Where to go next
|
||||
|
||||
- [Collect UCP Cluster Metrics with Prometheus](collect-cluster-metrics.md)
|
||||
|
|
|
|||
|
|
@ -141,7 +141,7 @@ Click **Yes** to enable integrating UCP users and teams with LDAP servers.
|
|||
| No simple pagination | If your LDAP server doesn't support pagination. |
|
||||
| Just-In-Time User Provisioning | Whether to create user accounts only when users log in for the first time. The default value of `true` is recommended. If you upgraded from UCP 2.0.x, the default is `false`. |
|
||||
|
||||
> **Note:** LDAP connections using certificates created with TLS v1.2 do not currently advertise support for sha512WithRSAEncryption in the TLS handshake which leads to issues establishing connections with some clients. Support for advertising sha512WithRSAEncryption will be added in UCP 3.1.0.
|
||||
> **Note**: LDAP connections using certificates created with TLS v1.2 do not currently advertise support for sha512WithRSAEncryption in the TLS handshake which leads to issues establishing connections with some clients. Support for advertising sha512WithRSAEncryption will be added in UCP 3.1.0.
|
||||
|
||||
{: .with-border}
|
||||
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ this.
|
|||
|
||||
Swarm uses a default address pool of `10.0.0.0/16` for its overlay networks. If this conflicts with your current network implementation, please use a custom IP address pool. To specify a custom IP address pool, use the `--default-address-pool` command line option during [Swarm initialization](../../../../engine/swarm/swarm-mode.md).
|
||||
|
||||
**NOTE:** Currently, the UCP installation process does not support this flag. To deploy with a custom IP pool, Swarm must first be installed using this flag and UCP must be installed on top of it.
|
||||
> **Note**: Currently, the UCP installation process does not support this flag. To deploy with a custom IP pool, Swarm must first be installed using this flag and UCP must be installed on top of it.
|
||||
|
||||
Kubernetes uses a default cluster IP pool for pods that is `192.168.0.0/16`. If it conflicts with your current networks, please use a custom IP pool by specifying `--pod-cidr` during UCP installation.
|
||||
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ Learn about [UCP system requirements](system-requirements.md).
|
|||
Ensure that your cluster nodes meet the minimum requirements for port openings.
|
||||
[Ports used](system-requirements.md/#ports-used) are documented in the UCP system requirements.
|
||||
|
||||
> Note: If you are upgrading a cluster to UCP 3.0.2 or higher on Microsoft
|
||||
> **Note**: If you are upgrading a cluster to UCP 3.0.2 or higher on Microsoft
|
||||
> Azure then please ensure all of the Azure [prerequisites](install-on-azure.md/#azure-prerequisites)
|
||||
> are met.
|
||||
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ built-in collection, `/Shared`.
|
|||
|
||||
Other collections are also being created to enable shared `db` applications.
|
||||
|
||||
> **Note:** For increased security with node-based isolation, use Docker
|
||||
> **Note**: For increased security with node-based isolation, use Docker
|
||||
> Enterprise Advanced.
|
||||
|
||||
- `/Shared/mobile` hosts all Mobile applications and resources.
|
||||
|
|
@ -107,7 +107,7 @@ collection boundaries. By assigning multiple grants per team, the Mobile and
|
|||
Payments applications teams can connect to dedicated Database resources through
|
||||
a secure and controlled interface, leveraging Database networks and secrets.
|
||||
|
||||
> **Note:** In Docker Enterprise Standard, all resources are deployed across the
|
||||
> **Note**: In Docker Enterprise Standard, all resources are deployed across the
|
||||
> same group of UCP worker nodes. Node segmentation is provided in Docker
|
||||
> Enterprise Advanced and discussed in the [next tutorial](ee-advanced.md).
|
||||
|
||||
|
|
|
|||
|
|
@ -125,7 +125,7 @@ $> curl -vs -H "Host: demo.local" http://127.0.0.1/ping
|
|||
You can use `docker service scale demo=10` to add some more replicas. Once scaled, you will notice that requests are pinned
|
||||
to a specific backend.
|
||||
|
||||
Note: due to the way the IP hashing works for extensions, you will notice a new upstream address when scaling replicas. This is
|
||||
expected as internally the proxy uses the new set of replicas to decide on a backend on which to pin. Once the upstreams are
|
||||
determined a new "sticky" backend will be chosen and that will be the dedicated upstream.
|
||||
> **Note**: due to the way the IP hashing works for extensions, you will notice a new upstream address when scaling replicas. This is
|
||||
> expected as internally the proxy uses the new set of replicas to decide on a backend on which to pin. Once the upstreams are
|
||||
> determined a new "sticky" backend will be chosen and that will be the dedicated upstream.
|
||||
|
||||
|
|
|
|||
|
|
@ -143,7 +143,7 @@ using a version of `curl` that includes the SNI header with insecure requests.
|
|||
If this doesn't happen, `curl` displays an error saying that the SSL handshake
|
||||
was aborterd.
|
||||
|
||||
> ***NOTE:*** Currently there is no way to update expired certificates using this method.
|
||||
> **Note**: Currently there is no way to update expired certificates using this method.
|
||||
> The proper way is to create a new secret then update the corresponding service.
|
||||
|
||||
## Let your service handle TLS
|
||||
|
|
|
|||
|
|
@ -27,8 +27,8 @@ $> docker service create \
|
|||
ehazlett/websocket-chat
|
||||
```
|
||||
|
||||
Note: for this to work you must have an entry for `demo.local` in your local hosts (i.e. `/etc/hosts`) file.
|
||||
This uses the browser for websocket communication so you will need to have an entry or use a routable domain.
|
||||
> **Note**: for this to work you must have an entry for `demo.local` in your local hosts (i.e. `/etc/hosts`) file.
|
||||
> This uses the browser for websocket communication so you will need to have an entry or use a routable domain.
|
||||
|
||||
Interlock will detect once the service is available and publish it. Once the tasks are running
|
||||
and the proxy service has been updated the application should be available via `http://demo.local`. Open
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ UCP supports certified third-party Container Networking Interface (CNI) plugins.
|
|||
built-in [Calico](https://github.com/projectcalico/cni-plugin) plugin, but you can override that and
|
||||
install a Docker certified plugin.
|
||||
|
||||
***NOTE:*** The `--cni-installer-url` option is deprecated as of UCP 3.1. It is replaced by the `--unmanaged-cni` option.
|
||||
> **Note**: The `--cni-installer-url` option is deprecated as of UCP 3.1. It is replaced by the `--unmanaged-cni` option.
|
||||
|
||||
# Install UCP with a custom CNI plugin
|
||||
|
||||
|
|
@ -27,9 +27,10 @@ docker container run --rm -it --name ucp \
|
|||
--unmanaged-cni <true|false> \
|
||||
--interactive
|
||||
```
|
||||
***NOTE:*** Setting `--unmanaged-cni` to `true` value installs UCP without a managed CNI plugin. UCP and the
|
||||
Kubernetes components will be running but pod-to-pod networking will not function until a CNI plugin is manually
|
||||
installed. This will impact some functionality of UCP until a CNI plugin is running.
|
||||
|
||||
> **Note**: Setting `--unmanaged-cni` to `true` value installs UCP without a managed CNI plugin. UCP and the
|
||||
> Kubernetes components will be running but pod-to-pod networking will not function until a CNI plugin is manually
|
||||
> installed. This will impact some functionality of UCP until a CNI plugin is running.
|
||||
|
||||
You must provide a correct YAML installation file for the CNI plugin, but most
|
||||
of the default files work on Docker EE with no modification.
|
||||
|
|
|
|||
|
|
@ -38,6 +38,7 @@ upgrade your installation to the latest release.
|
|||
* Non-admin users can no longer create `PersistentVolumes` that mount host directories. (docker/orca#15936)
|
||||
* Added support for the limit arg in `docker ps`. (docker/orca#15812)
|
||||
* Fixed an issue with ucp-proxy health check. (docker/orca#15814, docker/orca#15813, docker/orca#16021, docker/orca#15811)
|
||||
* Fixed an issue with manual creation of a **ClusterRoleBinding** or **RoleBinding** for `User` or `Group` subjects requiring the ID of the user, organization, or team. (docker/orca#14935)
|
||||
|
||||
### Known issue
|
||||
* By default, Kubelet begins deleting images, starting with the oldest unused images, after exceeding 85% disk space utilization. This causes an issue in an air-gapped environment. (docker/orca#16082)
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ redirect_from:
|
|||
In Docker Engine - Enterprise 18.09, significant architectural improvements were made to the network
|
||||
architecture in Swarm to increase the performance and scale of the built-in load balancing functionality.
|
||||
|
||||
> ***NOTE:*** These changes introduce new constraints to the Docker Engine - Enterprise upgrade process that,
|
||||
> **Note**: These changes introduce new constraints to the Docker Engine - Enterprise upgrade process that,
|
||||
> if not correctly followed, can have impact on the availability of applications running on the Swarm. These
|
||||
> constraints impact any upgrades coming from any version before 18.09 to version 18.09 or greater.
|
||||
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ on your hub/store account after starting the trial or paid license. This allows
|
|||
upgrade operations to work as expected and keep them current as long as your license is still
|
||||
valid and has not expired.
|
||||
|
||||
> ***NOTE:*** You can use the `docker engine update` command. However, if you continue to use
|
||||
> **Note**: You can use the `docker engine update` command. However, if you continue to use
|
||||
> the CE packages, the OS package will no longer replace the active daemon binary during apt/yum
|
||||
> updates, so you are responsible for performing the `docker engine update` operation periodically
|
||||
> to keep your engine up to date.
|
||||
|
|
@ -61,10 +61,10 @@ Server: Docker Engine - Community
|
|||
|
||||
2. Log into the Docker engine from the command line.
|
||||
|
||||
**NOTE:** When running the command `docker login`, the shell stores the credentials in the current user's home
|
||||
directory. RHEL and Ubuntu-based Linux distributions have different behavior for sudo. RHEL sets $HOME to point
|
||||
to `/root` while Ubuntu leaves `$HOME` pointing to the user's home directory who ran `sudo` and this can cause
|
||||
permission and access problems when switching between `sudo` and non-sudo'd commands.
|
||||
> **Note**: When running the command `docker login`, the shell stores the credentials in the current user's home
|
||||
> directory. RHEL and Ubuntu-based Linux distributions have different behavior for sudo. RHEL sets $HOME to point
|
||||
> to `/root` while Ubuntu leaves `$HOME` pointing to the user's home directory who ran `sudo` and this can cause
|
||||
> permission and access problems when switching between `sudo` and non-sudo'd commands.
|
||||
|
||||
|
||||
For Ubuntu or Debian:
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@ Docker EE is a superset of all the features in Docker CE. It incorporates defect
|
|||
that you can use in environments where new features cannot be adopted as quickly for
|
||||
consistency and compatibility reasons.
|
||||
|
||||
> ***NOTE:***
|
||||
> **Note**:
|
||||
> New in 18.09 is an aligned release model for Docker Engine - Community and Docker
|
||||
> Engine - Enterprise. The new versioning scheme is YY.MM.x where x is an incrementing
|
||||
> patch version. The enterprise engine is a superset of the community engine. They
|
||||
> will ship concurrently with the same x patch version based on the same code base.
|
||||
|
||||
> ***NOTE:***
|
||||
> **Note**:
|
||||
> The client and container runtime are now in separate packages from the daemon in
|
||||
> Docker Engine 18.09. Users should install and update all three packages at the same time
|
||||
> to get the latest patch releases. For example, on Ubuntu:
|
||||
|
|
@ -283,7 +283,7 @@ Ubuntu 14.04 "Trusty Tahr" [docker-ce-packaging#255](https://github.com/docker/d
|
|||
|
||||
2018-10-25
|
||||
|
||||
> *** NOTE: *** If you're deploying UCP or DTR, use Docker EE Engine 18.09 or higher. 18.03 is an engine only release.
|
||||
> **Note**: If you're deploying UCP or DTR, use Docker EE Engine 18.09 or higher. 18.03 is an engine only release.
|
||||
|
||||
#### Client
|
||||
|
||||
|
|
@ -335,7 +335,7 @@ Ubuntu 14.04 "Trusty Tahr" [docker-ce-packaging#255](https://github.com/docker/d
|
|||
|
||||
2018-10-25
|
||||
|
||||
> ***NOTE:*** If you're deploying UCP or DTR, use Docker EE Engine 18.09 or higher. 18.03 is an engine only release.
|
||||
> **Note**: If you're deploying UCP or DTR, use Docker EE Engine 18.09 or higher. 18.03 is an engine only release.
|
||||
|
||||
#### Client
|
||||
|
||||
|
|
|
|||
|
|
@ -102,7 +102,7 @@ Docker clients.
|
|||
For client authentication, create a client key and certificate signing
|
||||
request:
|
||||
|
||||
> **Note:** for simplicity of the next couple of steps, you may perform this
|
||||
> **Note**: for simplicity of the next couple of steps, you may perform this
|
||||
> step on the Docker daemon's host machine as well.
|
||||
|
||||
$ openssl genrsa -out key.pem 4096
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ My process is as following:
|
|||
|
||||
lots of things to see and manually answer, as openssl wants to be interactive
|
||||
|
||||
**NOTE:** make sure you enter the hostname (`boot2docker` in my case) when prompted for `Computer Name`)
|
||||
> **Note**: make sure you enter the hostname (`boot2docker` in my case) when prompted for `Computer Name`)
|
||||
|
||||
root@boot2docker:/# sudo make run
|
||||
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ the `docker swarm join` command. The node only uses the token at join time. If
|
|||
you subsequently rotate the token, it doesn't affect existing swarm nodes. Refer
|
||||
to [Run Docker Engine in swarm mode](swarm-mode.md#view-the-join-command-or-update-a-swarm-join-token).
|
||||
|
||||
**NOTE:** Docker engine allows a non-FIPS node to join a FIPS-enabled swarm cluster.
|
||||
> **Note**: Docker engine allows a non-FIPS node to join a FIPS-enabled swarm cluster.
|
||||
|
||||
While a mixed FIPS environment makes upgrading or changing status easier, Docker recommends not running a mixed FIPS environment in production.
|
||||
|
||||
|
|
|
|||
|
|
@ -208,7 +208,7 @@ Multiple pools can be configured if discontiguous address space is required. How
|
|||
|
||||
The default mask length can be configured and is the same for all networks. It is set to `/24` by default. To change the default subnet mask length, use the `--default-addr-pool-mask-length` command line option.
|
||||
|
||||
**NOTE:** Default address pools can only be configured on `swarm init` and cannot be altered after cluster creation.
|
||||
> **Note**: Default address pools can only be configured on `swarm init` and cannot be altered after cluster creation.
|
||||
|
||||
##### Overlay network size limitations
|
||||
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ networks, are preserved. The Docker CE package is now called `docker-ce`.
|
|||
### Supported storage drivers
|
||||
|
||||
Docker CE on Ubuntu supports `overlay2`, `aufs` and `btrfs` storage drivers.
|
||||
> *** Note: *** In Docker Engine - Enterprise, `btrfs` is only supported on SLES. See the documentation on
|
||||
> **Note**: In Docker Engine - Enterprise, `btrfs` is only supported on SLES. See the documentation on
|
||||
> [btrfs](/engine/userguide/storagedriver/btrfs-driver.md) for more details.
|
||||
|
||||
For new installations on version 4 and higher of the Linux kernel, `overlay2`
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ $ cat /proc/sys/crypto/fips_enabled
|
|||
1
|
||||
```
|
||||
|
||||
> ***NOTE:*** FIPS is only supported in the Docker Engine EE. UCP and DTR currently do not have support for FIPS-140-2.
|
||||
> **Note**: FIPS is only supported in the Docker Engine EE. UCP and DTR currently do not have support for FIPS-140-2.
|
||||
|
||||
To enable FIPS 140-2 compliance on a system that is not in FIPS 140-2 mode, do the following:
|
||||
|
||||
|
|
|
|||
|
|
@ -164,7 +164,7 @@ Before you install Docker EE for the first time on a new host machine, you need
|
|||
to set up the Docker repository. Afterward, you can install and update Docker EE
|
||||
from the repository.
|
||||
|
||||
> ***NOTE:*** If you need to run Docker EE 2.0, please see the following instructions:
|
||||
> **Note**: If you need to run Docker EE 2.0, please see the following instructions:
|
||||
> * [18.03](https://docs.docker.com/v18.03/ee/supported-platforms/) - Older Docker EE Engine only release
|
||||
> * [17.06](https://docs.docker.com/v17.06/engine/installation/) - Docker Enterprise Edition 2.0 (Docker Engine,
|
||||
> UCP, and DTR).
|
||||
|
|
|
|||
|
|
@ -137,7 +137,7 @@ from the repository.
|
|||
|
||||
4. Temporarily add a `$DOCKER_EE_VERSION` variable into your environment.
|
||||
|
||||
> ***NOTE:*** If you need to run something other than Docker EE 2.0, please see the following instructions:
|
||||
> **Note**: If you need to run something other than Docker EE 2.0, please see the following instructions:
|
||||
> * [18.03](https://docs.docker.com/v18.03/ee/supported-platforms/) - Older Docker EE Engine only release
|
||||
> * [17.06](https://docs.docker.com/v17.06/engine/installation/) - Docker Enterprise Edition 2.0 (Docker Engine,
|
||||
> UCP, and DTR).
|
||||
|
|
|
|||
|
|
@ -29,11 +29,10 @@ etc.).
|
|||
- Long Term Service Channel (LTSC) - 2016 and 2019 (Core and GUI)
|
||||
- Semi-annual Channel (SAC) - 1709, 1803 and 1809
|
||||
* RAM: 4GB
|
||||
* Disk space: [32 GB minimum recommendation for
|
||||
Windows](https://docs.microsoft.com/en-us/windows-server/get-started/system
|
||||
requirements). An additional 32 GB of Space is recommended for base images for
|
||||
ServerCore and NanoServer along with buffer space for workload containers
|
||||
running IIS, SQL Server and .Net apps.
|
||||
* Disk space: [32 GB minimum recommendation for Windows](https://docs.microsoft.com/en-us/windows-server/get-started/system-requirements).
|
||||
Docker recommends an additional 32 GB of space for base images for ServerCore
|
||||
and NanoServer along with buffer space for workload containers running IIS, SQL Server and .Net apps.
|
||||
|
||||
|
||||
## Install Docker Engine - Enterprise
|
||||
|
||||
|
|
@ -101,8 +100,8 @@ With Docker EE Basic license for versions 18.09 and later, Docker provides FIPS
|
|||
module. If the Windows implementation already has FIPS support enabled, FIPS is
|
||||
automatically enabled in the Docker engine.
|
||||
|
||||
**NOTE:** FIPS 140-2 is only supported in the Docker EE engine. UCP and DTR
|
||||
currently do not have support for FIPS 140-2.
|
||||
|
||||
> **Note**: FIPS 140-2 is only supported in the Docker EE engine. UCP and DTR currently do not have support for FIPS 140-2.
|
||||
|
||||
To enable FIPS 140-2 compliance on a system that is not in FIPS 140-2 mode,
|
||||
execute the following command in PowerShell:
|
||||
|
|
@ -133,7 +132,7 @@ Labels:
|
|||
com.docker.security.fips=enabled
|
||||
```
|
||||
|
||||
**NOTE:** If the system has the FIPS-140-2 cryptographic module installed on the operating system, it is possible to disable FIPS-140-2 compliance. To disable FIPS-140-2 in Docker but not the operating system, set the value `"DOCKER_FIPS","0"` in the `[System.Environment]`.`
|
||||
> **Note**: If the system has the FIPS-140-2 cryptographic module installed on the operating system, it is possible to disable FIPS-140-2 compliance. To disable FIPS-140-2 in Docker but not the operating system, set the value `"DOCKER_FIPS","0"` in the `[System.Environment]`.`
|
||||
|
||||
## Use a script to install Docker EE
|
||||
|
||||
|
|
@ -266,7 +265,7 @@ index](https://dockermsft.blob.core.windows.net/dockercontainer/DockerMsftIndex.
|
|||
## Preparing a Windows Host for use with UCP
|
||||
|
||||
To add a Windows Server host to an existing Universal Control Plane cluster
|
||||
please follow the list of [pre-requisites and joining
|
||||
please follow the list of [prerequisites and joining
|
||||
instructions](/ee/ucp/admin/configure/join-nodes/join-windows-nodes-to-cluster/#run-the-windows-node-setup-script).
|
||||
|
||||
## About Docker Engine - Enterprise containers and Windows Server
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ title: Microsoft Azure
|
|||
You need an Azure Subscription to use this Docker Machine driver.
|
||||
[Sign up for a free trial.][trial]
|
||||
|
||||
> **NOTE:** This documentation is for the new version of the Azure driver, which started
|
||||
> **Note**: This documentation is for the new version of the Azure driver, which started
|
||||
> shipping with v0.7.0. This driver is not backwards-compatible with the old
|
||||
> Azure driver. If you want to continue managing your existing Azure machines, please
|
||||
> download and use machine versions prior to v0.7.0.
|
||||
|
|
|
|||
|
|
@ -230,7 +230,7 @@ preferred because it is somewhat self-documenting.
|
|||
</tr>
|
||||
<tr>
|
||||
<td><tt>-p 8080:80/tcp -p 8080:80/udp</tt> or <br /><tt>-p published=8080,target=80,protocol=tcp -p published=8080,target=80,protocol=udp</tt></td>
|
||||
<td>Map TCP port 80 on the service to TCP port 8080 on the routing mesh, and map UDP port 80 on the service to UDP port 8080 on the routine mesh.</td>
|
||||
<td>Map TCP port 80 on the service to TCP port 8080 on the routing mesh, and map UDP port 80 on the service to UDP port 8080 on the routing mesh.</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
|
|
|
|||
|
|
@ -23,11 +23,13 @@ After installing DTR, you can join additional DTR replicas using `docker/dtr joi
|
|||
|
||||
## Example Usage
|
||||
|
||||
```bash
|
||||
$ docker run -it --rm docker/dtr:{{ site.dtr_version }}.0 install \
|
||||
--ucp-node <UCP_NODE_HOSTNAME> \
|
||||
--ucp-insecure-tls
|
||||
```
|
||||
|
||||
> Note: Use `--ucp-ca "$(cat ca.pem)"` instead of `--ucp-insecure-tls` for a production deployment.
|
||||
> **Note**: Use `--ucp-ca "$(cat ca.pem)"` instead of `--ucp-insecure-tls` for a production deployment.
|
||||
|
||||
## Options
|
||||
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ you want through the secondary authentication mechanism implemented inside your
|
|||
proxy, it also requires that you move TLS termination from the Registry to the
|
||||
proxy itself.
|
||||
|
||||
> ***NOTE:*** Docker does not recommend binding your registry to `localhost:5000` without
|
||||
> **Note**: Docker does not recommend binding your registry to `localhost:5000` without
|
||||
> authentication. This creates a potential loophole in your Docker Registry security.
|
||||
> As a result, anyone who can log on to the server where your Docker Registry is running
|
||||
> can push images without authentication.
|
||||
|
|
|
|||
|
|
@ -954,7 +954,7 @@ naming scheme accordingly before upgrading.
|
|||
- Containers dependencies can now be set up to wait on positive healthchecks
|
||||
when declared using `depends_on`. See the documentation for the updated
|
||||
syntax.
|
||||
**Note:** This feature will not be ported to version 3 Compose files.
|
||||
**Note**: This feature will not be ported to version 3 Compose files.
|
||||
|
||||
- Added support for the `sysctls` parameter in service definitions
|
||||
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ use unless you have substantial experience with ZFS on Linux.
|
|||
and push existing images to Docker Hub or a private repository, so that you
|
||||
do not need to re-create them later.
|
||||
|
||||
> ***NOTE:*** There is no need to use `MountFlags=slave` with Docker Engine 18.09 or
|
||||
> **Note**: There is no need to use `MountFlags=slave` with Docker Engine 18.09 or
|
||||
> later because `dockerd` and `containerd` are in different mount namespaces.
|
||||
|
||||
## Configure Docker with the `zfs` storage driver
|
||||
|
|
|
|||
Loading…
Reference in New Issue