diff --git a/_data/toc.yaml b/_data/toc.yaml index 67f7982d67..3b125c6b0b 100644 --- a/_data/toc.yaml +++ b/_data/toc.yaml @@ -1318,7 +1318,7 @@ manuals: - title: Offline installation path: /ee/ucp/interlock/deploy/offline-install/ - title: Layer 7 routing upgrade - path: /ee/ucp/interlock/upgrade/ + path: /ee/ucp/interlock/deploy/upgrade/ - sectiontitle: Configuration section: - title: Configure your deployment diff --git a/ee/dtr/admin/disaster-recovery/create-a-backup.md b/ee/dtr/admin/disaster-recovery/create-a-backup.md index ed26b99be3..95373f2f77 100644 --- a/ee/dtr/admin/disaster-recovery/create-a-backup.md +++ b/ee/dtr/admin/disaster-recovery/create-a-backup.md @@ -103,8 +103,7 @@ and creating a `tar` archive of the [dtr-registry volume](../../architecture.md) {% raw %} ```none sudo tar -cf dtr-image-backup-$(date +%Y%m%d-%H_%M_%S).tar \ - /var/lib/docker/volumes/dtr-registry-$(docker ps --filter name=dtr-rethinkdb \ - --format "{{ .Names }}" | sed 's/dtr-rethinkdb-//') +/var/lib/docker/volumes/dtr-registry-$(docker inspect -f '{{.Name}}' $(docker ps -q -f name=dtr-rethink) | cut -f 3 -d '-') ``` {% endraw %} @@ -113,8 +112,7 @@ sudo tar -cf dtr-image-backup-$(date +%Y%m%d-%H_%M_%S).tar \ {% raw %} ```none sudo tar -cf dtr-image-backup-$(date +%Y%m%d-%H_%M_%S).tar \ - /var/lib/docker/volumes/dtr-registry-nfs-$(docker ps --filter name=dtr-rethinkdb \ - --format "{{ .Names }}" | sed 's/dtr-rethinkdb-//') + /var/lib/docker/volumes/dtr-registry-nfs-$(docker inspect -f '{{.Name}}' $(docker ps -q -f name=dtr-rethink) | cut -f 3 -d '-') ``` {% endraw %} @@ -130,14 +128,15 @@ recommended for that system. ### Back up DTR metadata To create a DTR backup, load your UCP client bundle, and run the following -chained commands: +command. + +#### Chained commands (Linux only) {% raw %} ```none DTR_VERSION=$(docker container inspect $(docker container ps -f name=dtr-registry -q) | \ grep -m1 -Po '(?<=DTR_VERSION=)\d.\d.\d'); \ -REPLICA_ID=$(docker ps --filter name=dtr-rethinkdb --format "{{ .Names }}" | head -1 | \ - sed 's|.*/||' | sed 's/dtr-rethinkdb-//'); \ +REPLICA_ID=$(docker inspect -f '{{.Name}}' $(docker ps -q -f name=dtr-rethink) | cut -f 3 -d '-')); \ read -p 'ucp-url (The UCP URL including domain and port): ' UCP_URL; \ read -p 'ucp-username (The UCP administrator username): ' UCP_ADMIN; \ read -sp 'ucp password: ' UCP_PASSWORD; \ @@ -168,7 +167,7 @@ flag with `--ucp-insecure-tls`. Docker does not recommend this flag for producti 5. Includes DTR version and timestamp to your `tar` backup file. You can learn more about the supported flags in -the [reference documentation](/reference/dtr/2.6/cli/backup.md). +the [DTR backup reference documentation](/reference/dtr/2.6/cli/backup.md). By default, the backup command does not pause the DTR replica being backed up to prevent interruptions of user access to DTR. Since the replica diff --git a/reference/dtr/2.6/cli/backup.md b/reference/dtr/2.6/cli/backup.md index 3c0e213dcb..17b2a5de76 100644 --- a/reference/dtr/2.6/cli/backup.md +++ b/reference/dtr/2.6/cli/backup.md @@ -26,12 +26,13 @@ docker run -i --rm --log-driver none docker/dtr:{{ page.dtr_version }} \ #### Advanced (with chained commands) +The following command has been tested on Linux: + {% raw %} ```none DTR_VERSION=$(docker container inspect $(docker container ps -f \ name=dtr-registry -q) | grep -m1 -Po '(?<=DTR_VERSION=)\d.\d.\d'); \ -REPLICA_ID=$(docker ps --filter name=dtr-rethinkdb \ - --format "{{ .Names }}" | head -1 | sed 's|.*/||' | sed 's/dtr-rethinkdb-//'); \ +REPLICA_ID=$(docker inspect -f '{{.Name}}' $(docker ps -q -f name=dtr-rethink) | cut -f 3 -d '-')); \ read -p 'ucp-url (The UCP URL including domain and port): ' UCP_URL; \ read -p 'ucp-username (The UCP administrator username): ' UCP_ADMIN; \ read -sp 'ucp password: ' UCP_PASSWORD; \ @@ -47,7 +48,7 @@ docker run --log-driver none -i --rm \ {% endraw %} For a detailed explanation on the advanced example, see -[Back up your DTR metadata](ee/dtr/admin/disaster-recovery/create-a-backup/#back-up-dtr-metadata). +[Back up your DTR metadata](/ee/dtr/admin/disaster-recovery/create-a-backup/#back-up-dtr-metadata). To learn more about the `--log-driver` option for `docker run`, see [docker run reference](/engine/reference/run/#logging-drivers---log-driver). ## Description diff --git a/storage/bind-mounts.md b/storage/bind-mounts.md index c8d69fd266..d20ca5f742 100644 --- a/storage/bind-mounts.md +++ b/storage/bind-mounts.md @@ -23,7 +23,7 @@ manage bind mounts. ![bind mounts on the Docker host](images/types-of-mounts-bind.png) -## Choosing the -v or --mount flag +## Choose the -v or --mount flag Originally, the `-v` or `--volume` flag was used for standalone containers and the `--mount` flag was used for swarm services. However, starting with Docker @@ -159,7 +159,7 @@ $ docker container stop devtest $ docker container rm devtest ``` -### Mounting into a non-empty directory on the container +### Mount into a non-empty directory on the container If you bind-mount into a non-empty directory on the container, the directory's existing contents are obscured by the bind mount. This can be beneficial, diff --git a/storage/index.md b/storage/index.md index 47a8d076b7..a82609311a 100644 --- a/storage/index.md +++ b/storage/index.md @@ -100,7 +100,7 @@ mounts is to think about where the data lives on the Docker host. information. For instance, internally, swarm services use `tmpfs` mounts to mount [secrets](/engine/swarm/secrets.md) into a service's containers. -Bind mounts and volumes can both mounted into containers using the `-v` or +Bind mounts and volumes can both be mounted into containers using the `-v` or `--volume` flag, but the syntax for each is slightly different. For `tmpfs` mounts, you can use the `--tmpfs` flag. However, in Docker 17.06 and higher, we recommend using the `--mount` flag for both containers and services, for