Sync published with master (#8709)

* Sync published with master (#8693) (#8694)

* Adding Azure note (#8566)

* Rephrase additional line and update link

* Revert "Netlify redirects interlock (#8595)"

This reverts commit a7793edc74.

* UCP Install on Azure Patch (#8522)

* Improved backup commands (#8597)

* Improved backup commands

DTR image backup command improvements:

1. Local and NFS mount image backup commands were invalid (incorrectly used -C flag). Replaced them with commands that work.
2. The new commands automatically populate the correct replica ID and add a datestamp to the backup filename.

DTR Metadata backup command improvements:

DTR metadata backups are more difficult than they need to be and generate many support tickets. I updated the DTR command to avoid common user pitfalls:

1. The prior metadata backup command was subject to user error. Improved the command to automatically collect the DTR version and select a replica. 
2. Improved security of the command by automatically collecting UCP CA certificate for verification rather than using --ucp-insecure-tls flag. 
3. Improved the backup filename by adding the backed-up version information and date of backup. Knowledge of the version information is required for restoring a backup.
4. Described these improvements for the user.

Image backup commands were tested with local and NFS image storage. The metadata backup command was tested by running it directly on a DTR node and through a UCP client bundle with multiple replicas.

* Technical and editorial review

* More edits

* line 8; remove unnecessary a (#8672)

* line 8; remove unnecessary a

* Minor edit

* Updated the UCP Logging page to include UCP 3.1 screenshots (#8646)

* Added examples (#8599)

* Added examples

Added examples with more detail and automation to help customers backup DTR without creating support tickets.

* Linked to explanation of example command

@omegamormegil I removed the example with prepopulated fields, as I think it doesn't add much, and will only add confusion. Users who need this much detail can run the basic command and follow the terminal prompts. 

We can re-add in a follow-up PR, if you think that example is crucial to this page.

* Remove deadlink in the Interlock ToC (#8668)

* Found a deadlink in the Interlock ToC

* Added Redirect

* Published (#8674)

* add slack webhook to Jenkinsfile

* make jenkinsfile serve private and public docs

After a couple of Jenkins-based mix-ups it became obvious we needed a Jenkinsfile that would serve both public and private projects, that we could move between repos without worry. This Jenkinsfile knows which images to build and push and which swarm services to update because of the use of git_url and branch conditions.

* Sync published with master (#8619)

* Update install.md

add note: 8 character password minimum length

* Include Ubuntu version in Dockerfile

more recent versions of Ubuntu don't work with the given Dockerfile

* Updated the 3.1.4 release notes to include Centos 7.6 support

* Remove redundant "be"

* Update the "role-based access control" link

On page "https://docs.docker.com/ee/ucp/user-access/", update the hyperlink "role-based access control" to point to "https://docs.docker.com/ee/ucp/authorization/" instead of "https://docs.docker.com/ee/access-control".

* Add UCP user password limitation

* Revert "Updated the UCP 3.1.4 release notes to include Centos 7.6 support"

* Adding emphasis on Static IP requirement (#7276)

* Adding emphasis on Static IP requirement

We had a customer (00056641) who changed IPs like this all at once, and they are in a messy status.    We should make it clear that static IP is absolutely required.  
```***-ucp-0-dw original="10.15.89.6" updated="10.15.89.7" 
***-ucp-1-dw original="10.15.89.5" updated="10.15.89.6" 
***-ucp-2-dw original="10.15.89.7" updated="10.15.89.5" ```

* Link to prod requirement of static IP addresses

* Adding warning about layer7 config (#8617)

* Adding warning about layer7 config

Adding warning about layer7 config not being included in the backup

* Text edit

* Sync published with master (#8673)

* Revert "Netlify redirects interlock (#8595)"

This reverts commit a7793edc74.

* UCP Install on Azure Patch (#8522)

* Improved backup commands (#8597)

* line 8; remove unnecessary a (#8672)


* Updated the UCP Logging page to include UCP 3.1 screenshots (#8646)

* Added examples (#8599)

* Remove deadlink in the Interlock ToC (#8668)

* Trying to fix command rendering of '--format "{{ .Names }}"' (#8678)

* interlock --> ucp-interlock (#8675)

* Fixed code samples 

- Use the latest UCP version and the latest ucp-interlock image
- Leverage ucp page version Jekyll variable

* Typo

* Final syntax fix

* Update backup.md

* Removed Reference to Interlock Preview Image, and added relevant UCP Image Org and Tag

* Fix syntax error which caused the master build to fail

* docs: fix typo in removal of named volumes (#8686)

* Updated the ToC for Upgrading Interlock

* Update index.md (#8690)

Fix typo - missing word.

* Update bind-mounts.md (#8696)

* Minor edits (#8708)

* Minor edits

- Standardized setting of replica ID as per @caervs 
- Fix broken link

* Consistency edits

- Standardized setting of replica ID
- Added note that this command only works on Linux

* Standardize replica setting

- Update commands for creating tar files for local and NFS-mounted images

_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

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

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

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,

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