diff --git a/ee/dtr/admin/configure/enable-single-sign-on.md b/ee/dtr/admin/configure/enable-single-sign-on.md index eb3932b0c2..595a01eb4a 100644 --- a/ee/dtr/admin/configure/enable-single-sign-on.md +++ b/ee/dtr/admin/configure/enable-single-sign-on.md @@ -10,6 +10,9 @@ separately on the web UI of both applications. You can configure DTR to have single sign-on (SSO) with UCP, so that users only have to authenticate once. +> **Note**: After configuring single sign-on with DTR, users accessing DTR via +> `docker login` should create an [access token](/ee/dtr/user/access-tokens/) and use it to authenticate. + ## At installation time When installing DTR, use the `docker/dtr install --dtr-external-url ` diff --git a/storage/storagedriver/vfs-driver.md b/storage/storagedriver/vfs-driver.md index 6c0907d545..206f668c1f 100644 --- a/storage/storagedriver/vfs-driver.md +++ b/storage/storagedriver/vfs-driver.md @@ -13,8 +13,6 @@ performance and more space used on disk than other storage drivers. However, it is robust, stable, and works in every environment. It can also be used as a mechanism to verify other storage back-ends against, in a testing environment. -Docker 17.12 and higher include support for quotas when using the VFS driver. - ## Configure Docker with the `vfs` storage driver 1. Stop Docker. @@ -33,11 +31,12 @@ Docker 17.12 and higher include support for quotas when using the VFS driver. ``` If you want to set a quota to control the maximum size the VFS storage - driver can use, set the `size` option on the `storage-drivers` key. Quotas - are only supported in Docker 17.12 CE and higher. + driver can use, set the `size` option on the `storage-opts` key. Quotas + are only supported in Docker 17.12 and higher. ```json { + "storage-driver": "vfs", "storage-opts": ["size=256M"] } ``` @@ -51,14 +50,13 @@ Docker 17.12 and higher include support for quotas when using the VFS driver. ``` 4. Verify that the daemon is using the `vfs` storage driver. - Use the `docker info` command and look for `Storage Driver` and - `Backing filesystem`. + Use the `docker info` command and look for `Storage Driver`. ```bash $ docker info Storage Driver: vfs - + ... ``` Docker is now using the `vfs` storage driver. Docker has automatically