mirror of https://github.com/docker/docs.git
Fix spelling errors (#2409)
This commit is contained in:
parent
0729d9437c
commit
7b90ef4bdc
|
@ -96,7 +96,7 @@ docker run --detach --restart always \
|
||||||
docker/dtr-content-cache:<version> /config.yml
|
docker/dtr-content-cache:<version> /config.yml
|
||||||
```
|
```
|
||||||
|
|
||||||
You can also run the command in interactive mode instead of detatched by
|
You can also run the command in interactive mode instead of detached by
|
||||||
replacing `--detached` with `--interactive`. This allows you to
|
replacing `--detached` with `--interactive`. This allows you to
|
||||||
see the logs generated by the container and troubleshoot misconfigurations.
|
see the logs generated by the container and troubleshoot misconfigurations.
|
||||||
|
|
||||||
|
|
|
@ -21,7 +21,7 @@ UTC time (unless the system time is mounted), therefore remember that the cron
|
||||||
schedule will run based off of UTC time when configuring.
|
schedule will run based off of UTC time when configuring.
|
||||||
|
|
||||||
GC puts DTR into read only mode; pulls succeed while pushes fail. Pushing an
|
GC puts DTR into read only mode; pulls succeed while pushes fail. Pushing an
|
||||||
image while GC runs may lead to undefined behaviour and data loss, therefore
|
image while GC runs may lead to undefined behavior and data loss, therefore
|
||||||
this is disabled for safety. For this reason it's generally best practice to
|
this is disabled for safety. For this reason it's generally best practice to
|
||||||
ensure GC runs in the early morning on a Saturday or Sunday night.
|
ensure GC runs in the early morning on a Saturday or Sunday night.
|
||||||
|
|
||||||
|
|
|
@ -24,7 +24,7 @@ to upgrade your installation to the latest release.
|
||||||
|
|
||||||
* Several improvements to the installer to make it more resilient
|
* Several improvements to the installer to make it more resilient
|
||||||
* Improved the installer to better detect port conflicts when installing or joining DTR replicas
|
* Improved the installer to better detect port conflicts when installing or joining DTR replicas
|
||||||
* Security scans can now be cancelled
|
* Security scans can now be canceled
|
||||||
* DTR job logs are now stored in the DTR datastore but also sent to Docker Engine
|
* DTR job logs are now stored in the DTR datastore but also sent to Docker Engine
|
||||||
|
|
||||||
**Bugs fixed**
|
**Bugs fixed**
|
||||||
|
|
|
@ -57,7 +57,7 @@ browsers and client tools already trust.
|
||||||
|
|
||||||
If you want to use your own certificates:
|
If you want to use your own certificates:
|
||||||
|
|
||||||
1. Log into the host where you intend to instal UCP.
|
1. Log into the host where you intend to install UCP.
|
||||||
|
|
||||||
2. Create a volume with the name `ucp-controller-server-certs`.
|
2. Create a volume with the name `ucp-controller-server-certs`.
|
||||||
|
|
||||||
|
|
|
@ -35,7 +35,7 @@ In this case, the only member is the "jenkins" user.
|
||||||
The signing policy implementation uses the certificates issued in user client bundles
|
The signing policy implementation uses the certificates issued in user client bundles
|
||||||
to connect a signature to a user. Using an incognito browser window (or otherwise),
|
to connect a signature to a user. Using an incognito browser window (or otherwise),
|
||||||
log in to the "jenkins" user account you created earlier. Download a client bundle for
|
log in to the "jenkins" user account you created earlier. Download a client bundle for
|
||||||
this user. It is also recommeneded to change the description associated with the public
|
this user. It is also recommended to change the description associated with the public
|
||||||
key stored in UCP such that you can identify in the future which key is being used for
|
key stored in UCP such that you can identify in the future which key is being used for
|
||||||
signing.
|
signing.
|
||||||
|
|
||||||
|
|
|
@ -90,7 +90,7 @@ You should now have your UCP cluster up and running.
|
||||||
Additionally, in the event where half or more controller nodes are lost and
|
Additionally, in the event where half or more controller nodes are lost and
|
||||||
cannot be recovered to a healthy state, the system can only be restored through
|
cannot be recovered to a healthy state, the system can only be restored through
|
||||||
the following disaster recovery procedure. It is important to note that this
|
the following disaster recovery procedure. It is important to note that this
|
||||||
proceedure is not guaranteed to succeed with no loss of either swarm services or
|
procedure is not guaranteed to succeed with no loss of either swarm services or
|
||||||
UCP configuration data:
|
UCP configuration data:
|
||||||
|
|
||||||
1. On one of the remaining manager nodes, perform `docker swarm init
|
1. On one of the remaining manager nodes, perform `docker swarm init
|
||||||
|
|
|
@ -130,7 +130,7 @@ In the event where half or more manager nodes are lost and cannot be recovered
|
||||||
to a healthy state, the system is considered to have lost quorum and can only be
|
to a healthy state, the system is considered to have lost quorum and can only be
|
||||||
restored through the following disaster recovery procedure.
|
restored through the following disaster recovery procedure.
|
||||||
|
|
||||||
It is important to note that this proceedure is not guaranteed to succeed with
|
It is important to note that this procedure is not guaranteed to succeed with
|
||||||
no loss of running services or configuration data. To properly protect against
|
no loss of running services or configuration data. To properly protect against
|
||||||
manager failures, the system should be configured for [high availability](configure/set-up-high-availability.md).
|
manager failures, the system should be configured for [high availability](configure/set-up-high-availability.md).
|
||||||
|
|
||||||
|
|
|
@ -12,7 +12,7 @@ If a user deploys a malicious service that can affect the node where it
|
||||||
is running, they won't be able to affect other nodes in the cluster, or
|
is running, they won't be able to affect other nodes in the cluster, or
|
||||||
any cluster management functionality.
|
any cluster management functionality.
|
||||||
|
|
||||||
To restrict users from deploying to manager nodes, log in with adminstrator
|
To restrict users from deploying to manager nodes, log in with administrator
|
||||||
credentials to the **UCP web UI**, navigate to the **Admin Settings**
|
credentials to the **UCP web UI**, navigate to the **Admin Settings**
|
||||||
page, and choose **Scheduler**.
|
page, and choose **Scheduler**.
|
||||||
|
|
||||||
|
|
|
@ -35,7 +35,7 @@ In this case, the only member is the "jenkins" user.
|
||||||
The signing policy implementation uses the certificates issued in user client bundles
|
The signing policy implementation uses the certificates issued in user client bundles
|
||||||
to connect a signature to a user. Using an incognito browser window (or otherwise),
|
to connect a signature to a user. Using an incognito browser window (or otherwise),
|
||||||
log in to the "jenkins" user account you created earlier. Download a client bundle for
|
log in to the "jenkins" user account you created earlier. Download a client bundle for
|
||||||
this user. It is also recommeneded to change the description associated with the public
|
this user. It is also recommended to change the description associated with the public
|
||||||
key stored in UCP such that you can identify in the future which key is being used for
|
key stored in UCP such that you can identify in the future which key is being used for
|
||||||
signing.
|
signing.
|
||||||
|
|
||||||
|
|
|
@ -28,7 +28,7 @@ You can either wait for UCP 2.1.2 to be released so that the problem is
|
||||||
automatically fixed, or upgrade to 2.1.1, and use the following steps to fix
|
automatically fixed, or upgrade to 2.1.1, and use the following steps to fix
|
||||||
the problem.
|
the problem.
|
||||||
|
|
||||||
Star by getting the current configuration for user sessions by running:
|
Start by getting the current configuration for user sessions by running:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
curl -u admin "https://$UCP_HOST/enzi/v0/config/sessions"
|
curl -u admin "https://$UCP_HOST/enzi/v0/config/sessions"
|
||||||
|
|
|
@ -78,7 +78,7 @@ Swarms that are registered in Docker Cloud appear in the Swarms list. Each line
|
||||||
|
|
||||||
<!-- TODO - **DEPLOYING**: Docker Cloud is provisioning the nodes of this swarm. -->
|
<!-- TODO - **DEPLOYING**: Docker Cloud is provisioning the nodes of this swarm. -->
|
||||||
- **DEPLOYED**: the swarm is sending heartbeat pings to Docker Cloud, and Cloud can contact it to run a health check.
|
- **DEPLOYED**: the swarm is sending heartbeat pings to Docker Cloud, and Cloud can contact it to run a health check.
|
||||||
- **UNREACHABLE**: the swarm is sending heartbeart pings, but Docker Cloud cannot contact the swarm.
|
- **UNREACHABLE**: the swarm is sending heartbeat pings, but Docker Cloud cannot contact the swarm.
|
||||||
- **UNAVAILABLE**: Docker Cloud is not receiving any heartbeats from the swarm.
|
- **UNAVAILABLE**: Docker Cloud is not receiving any heartbeats from the swarm.
|
||||||
- **REMOVED**: the swarm has been unregistered from Docker Cloud and will be removed from the list soon.
|
- **REMOVED**: the swarm has been unregistered from Docker Cloud and will be removed from the list soon.
|
||||||
|
|
||||||
|
|
|
@ -74,7 +74,7 @@ $ sudo ping 10.0.0.4
|
||||||
|
|
||||||
## What are the different Azure Regions?
|
## What are the different Azure Regions?
|
||||||
All regions can be found here: [Microsoft Azure Regions](https://azure.microsoft.com/en-us/regions/)
|
All regions can be found here: [Microsoft Azure Regions](https://azure.microsoft.com/en-us/regions/)
|
||||||
An exerpt of the above regions to use when you create your service principal are:
|
An excerpt of the above regions to use when you create your service principal are:
|
||||||
|
|
||||||
```none
|
```none
|
||||||
australiaeast
|
australiaeast
|
||||||
|
|
|
@ -466,7 +466,7 @@ in the [Docker Experimental Features README](https://github.com/docker/docker/bl
|
||||||
Experimental features are not appropriate for production environments or
|
Experimental features are not appropriate for production environments or
|
||||||
workloads. They are meant to be sandbox experiments for new ideas. Some
|
workloads. They are meant to be sandbox experiments for new ideas. Some
|
||||||
experimental features may become incorporated into upcoming stable releases, but
|
experimental features may become incorporated into upcoming stable releases, but
|
||||||
others may be modified or pulled from subsquent Betas, and never released
|
others may be modified or pulled from subsequent Betas, and never released
|
||||||
on Stable.
|
on Stable.
|
||||||
|
|
||||||
On both Beta and Stable releases, you can toggle **experimental mode** on and
|
On both Beta and Stable releases, you can toggle **experimental mode** on and
|
||||||
|
|
|
@ -560,7 +560,7 @@ $ docker service create \
|
||||||
> with single quotes (`'`).
|
> with single quotes (`'`).
|
||||||
>
|
>
|
||||||
> For example, the `local` driver accepts mount options as a comma-separated
|
> For example, the `local` driver accepts mount options as a comma-separated
|
||||||
> list in the `o` parameter. This example shows the correcty to escape the list.
|
> list in the `o` parameter. This example shows the correctly to escape the list.
|
||||||
>
|
>
|
||||||
> $ docker service create \
|
> $ docker service create \
|
||||||
> --mount 'type=volume,src=<VOLUME-NAME>,dst=<CONTAINER-PATH>,volume-driver=local,volume-opt=type=nfs,volume-opt=device=<nfs-server>:<nfs-path>,"volume-opt=o=addr=<nfs-address>,vers=4,soft,timeo=180,bg,tcp,rw"'
|
> --mount 'type=volume,src=<VOLUME-NAME>,dst=<CONTAINER-PATH>,volume-driver=local,volume-opt=type=nfs,volume-opt=device=<nfs-server>:<nfs-path>,"volume-opt=o=addr=<nfs-address>,vers=4,soft,timeo=180,bg,tcp,rw"'
|
||||||
|
|
|
@ -84,7 +84,7 @@ reach the first manager node is not the same address the manager sees as its
|
||||||
own. For instance, in a cloud setup that spans different regions, hosts have
|
own. For instance, in a cloud setup that spans different regions, hosts have
|
||||||
both internal addresses for access within the region and external addresses that
|
both internal addresses for access within the region and external addresses that
|
||||||
you use for access from outside that region. In this case, specify the external
|
you use for access from outside that region. In this case, specify the external
|
||||||
address with `--advertise-addr` so that the node can propogate that information
|
address with `--advertise-addr` so that the node can propagate that information
|
||||||
to other nodes that subsequently connect to it.
|
to other nodes that subsequently connect to it.
|
||||||
|
|
||||||
Refer to the `docker swarm init` [CLI reference](../reference/commandline/swarm_init.md)
|
Refer to the `docker swarm init` [CLI reference](../reference/commandline/swarm_init.md)
|
||||||
|
|
|
@ -340,7 +340,7 @@ command.
|
||||||
> layer. It is now stored as a string of text in a single config file that
|
> layer. It is now stored as a string of text in a single config file that
|
||||||
> relates to the overall image. This can result in some image layers showing as
|
> relates to the overall image. This can result in some image layers showing as
|
||||||
> "missing" in the output of the `docker history` command. This is normal
|
> "missing" in the output of the `docker history` command. This is normal
|
||||||
> behaviour and can be ignored.
|
> behavior and can be ignored.
|
||||||
>
|
>
|
||||||
> You may hear images like these referred to as *flat images*.
|
> You may hear images like these referred to as *flat images*.
|
||||||
|
|
||||||
|
|
|
@ -38,4 +38,4 @@ if you're looking to help fix specific issues around VM provisioning.
|
||||||
## View All Issues
|
## View All Issues
|
||||||
|
|
||||||
For a full list of Kitematic bugs or issues see our <a href="https://github.com/kitematic/kitematic/issues?q=is%3Aopen+is%3Aissue+label%3Abug">existing GitHub
|
For a full list of Kitematic bugs or issues see our <a href="https://github.com/kitematic/kitematic/issues?q=is%3Aopen+is%3Aissue+label%3Abug">existing GitHub
|
||||||
issues</a> labelled as `bug`.
|
issues</a> labeled as `bug`.
|
||||||
|
|
|
@ -133,7 +133,7 @@ want to rename it.
|
||||||
|
|
||||||
### Adding Environment variables
|
### Adding Environment variables
|
||||||
|
|
||||||
Many images use environment variables to let you customise them. The "General"
|
Many images use environment variables to let you customize them. The "General"
|
||||||
"Settings" tab allows you to add and modify the environment variables used to
|
"Settings" tab allows you to add and modify the environment variables used to
|
||||||
start a container.
|
start a container.
|
||||||
|
|
||||||
|
|
|
@ -309,7 +309,7 @@ change, you might repeat or iterate through this flow several times.
|
||||||
## Where to go next
|
## Where to go next
|
||||||
|
|
||||||
Congratulations, you have successfully achieved Docker inception. You've had a
|
Congratulations, you have successfully achieved Docker inception. You've had a
|
||||||
small experience of the develpment process. You've set up your development
|
small experience of the development process. You've set up your development
|
||||||
environment and verified almost all the essential processes you need to
|
environment and verified almost all the essential processes you need to
|
||||||
contribute. Of course, before you start contributing, [you'll need to learn one
|
contribute. Of course, before you start contributing, [you'll need to learn one
|
||||||
more piece of the development process, the test framework](test-and-docs.md).
|
more piece of the development process, the test framework](test-and-docs.md).
|
||||||
|
|
|
@ -105,7 +105,7 @@ Listen 5043
|
||||||
SSLCertificateFile /usr/local/apache2/conf/domain.crt
|
SSLCertificateFile /usr/local/apache2/conf/domain.crt
|
||||||
SSLCertificateKeyFile /usr/local/apache2/conf/domain.key
|
SSLCertificateKeyFile /usr/local/apache2/conf/domain.key
|
||||||
|
|
||||||
## SSL settings recommandation from: https://raymii.org/s/tutorials/Strong_SSL_Security_On_Apache2.html
|
## SSL settings recommendation from: https://raymii.org/s/tutorials/Strong_SSL_Security_On_Apache2.html
|
||||||
# Anti CRIME
|
# Anti CRIME
|
||||||
SSLCompression off
|
SSLCompression off
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue