From d95f70e69ae5603f6698cefb3f3a5a8a7a6ab541 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 28 Jul 2021 17:11:34 -0700 Subject: [PATCH] Run update.sh --- couchbase/README.md | 10 +++------- vault/README.md | 4 ++-- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/couchbase/README.md b/couchbase/README.md index 8d2314243..27b4348fb 100644 --- a/couchbase/README.md +++ b/couchbase/README.md @@ -209,15 +209,11 @@ Start Free Trial - https://cloud.couchbase.com/sign-up # License -Couchbase Server comes in 2 Editions: Enterprise Edition and Community Edition. You can find details on the differences between the 2 and licensing details on the [Couchbase Server Editions](https://docs.couchbase.com/server/current/introduction/editions.html) page. +Couchbase Server comes in two editions: Enterprise Edition and Community Edition. You can find details on the differences between the two and licensing information on the [Couchbase Server Editions](https://docs.couchbase.com/server/current/introduction/editions.html) page. -- Enterprise Edition -- free for development, testing and POCs. Requires a paid subscription for production deployment. Please refer to the [pricing](https://www.couchbase.com/pricing) page for details on enterprise edition agreements. +- **Enterprise Edition** -- The Enterprise Edition license provides for free for development and testing for Couchbase Enterprise Edition. A paid subscription for production deployment is required. Please refer to the [pricing](https://www.couchbase.com/pricing) page for details on Couchbase’s Enterprise Edition. -- Community Edition -- free for unrestricted use for community users. - -By default, the `latest` Docker tag points to the latest Enterprise Edition. If you want the Community Edition instead, you should add the appropriate tag, such as - -`docker run -d --name db -p 8091-8094:8091-8094 -p 11210:11210 couchbase:community-6.6.0` +- **Community Edition** -- The Community Edition license provides for free deployment of Couchbase Community Edition for departmental-scale deployments of up to five node clusters. It has recently been changed to disallow use of XDCR, which is now an exclusive Enterprise Edition feature. As with all Docker images, these likely also contain other software which may be under other licenses (such as Bash, etc from the base distribution, along with any direct or indirect dependencies of the primary software being contained). diff --git a/vault/README.md b/vault/README.md index e46f0b3fb..c739f539b 100644 --- a/vault/README.md +++ b/vault/README.md @@ -24,8 +24,8 @@ WARNING: # Supported tags and respective `Dockerfile` links -- [`1.8.0-rc2`](https://github.com/hashicorp/docker-vault/blob/bdd23b0c75add997d0247e3d7fb72338f240fa70/0.X/Dockerfile) -- [`1.7.3`, `latest`](https://github.com/hashicorp/docker-vault/blob/d35c24ced09941188833c420c3d300c94cd97345/0.X/Dockerfile) +- [`1.8.0`, `latest`](https://github.com/hashicorp/docker-vault/blob/aabefbe426379c0d45d6ad3d8565fd3a6b17ae62/0.X/Dockerfile) +- [`1.7.3`](https://github.com/hashicorp/docker-vault/blob/d35c24ced09941188833c420c3d300c94cd97345/0.X/Dockerfile) - [`1.6.5`](https://github.com/hashicorp/docker-vault/blob/293e64bfd19428a1c90c0ab09bb1c63510ecb688/0.X/Dockerfile) - [`1.5.9`](https://github.com/hashicorp/docker-vault/blob/72a3539fd91085b2d51cfc87cd9bcf0804e3a5cf/0.X/Dockerfile)