diff --git a/modules/ROOT/nav.adoc b/modules/ROOT/nav.adoc index fcf139abe0..6670ce4351 100644 --- a/modules/ROOT/nav.adoc +++ b/modules/ROOT/nav.adoc @@ -212,7 +212,6 @@ include::third-party:partial$nav.adoc[] *** xref:install:install-oracle.adoc[Oracle Enterprise] *** xref:install:amazon-linux2-install.adoc[Amazon Linux 2] *** xref:install:non-root.adoc[Non-Root Install and Upgrade] - *** xref:install:rhel-multiple-instances.adoc[Install Multiple Instances] ** xref:install:install-package-windows.adoc[Install on Windows] ** xref:install:macos-install.adoc[Install on macOS] ** xref:install:testing.adoc[Verify the Installation] diff --git a/modules/install/pages/best-practices-vm.adoc b/modules/install/pages/best-practices-vm.adoc index d10c639a33..f2aecc2e9c 100644 --- a/modules/install/pages/best-practices-vm.adoc +++ b/modules/install/pages/best-practices-vm.adoc @@ -89,7 +89,7 @@ To set the ulimits in your container, you need to run Couchbase Docker container ---- docker run -d --ulimit nofile=40960:40960 --ulimit core=100000000:100000000 --ulimit memlock=100000000:100000000 ---name db -p 8091-8096:8091-8096 -p 11210-11211:11210-11211 couchbase +--name db -p 8091-8096:8091-8096 -p 11210-11211:11210-11211 couchbase/server ---- Since `unlimited` is not supported as a value, it sets the `core` and `memlock` values to 100 GB. diff --git a/modules/install/pages/getting-started-docker.adoc b/modules/install/pages/getting-started-docker.adoc index 92b9734541..f85c50ea55 100644 --- a/modules/install/pages/getting-started-docker.adoc +++ b/modules/install/pages/getting-started-docker.adoc @@ -14,7 +14,7 @@ For more traditional Docker deployments, use the following sections below: * <> * <> -If you're simply looking for the official Couchbase Server Docker image, you can find it on https://hub.docker.com/_/couchbase/[Docker Hub^]. +For Couchbase Server image in Docker, see https://hub.docker.com/r/couchbase/server[couchbase/server]. [#section_jvt_zvj_42b] == Deploy a Single-Node Cluster with Containers @@ -38,7 +38,7 @@ To set up Docker on the host computer, refer to Docker's https://www.docker.com/ -- [source,console] ---- -$ docker run -d --name db -p 8091-8096:8091-8096 -p 11210-11211:11210-11211 couchbase +$ docker run -d --name db -p 8091-8096:8091-8096 -p 11210-11211:11210-11211 couchbase/server ---- .Multiple instances with Docker @@ -50,7 +50,8 @@ For example: `-p 9091:8091` instructs the container to map the external machine port `9091` to the container application's port `8091`. **** -After running the above command, a single instance (`db`) of the latest https://hub.docker.com/_/couchbase/[official Couchbase Server container image^] is downloaded and run on the host computer. +After running the above command, a single instance (`db`) of the latest Couchbase Server image (see https://hub.docker.com/r/couchbase/server[couchbase/server]) is downloaded and run on the host computer. + If a traditional installation of Couchbase Server is running locally on the host computer, the port mappings specified using the `-p` option may fail. Ensure that you stop any local instance of Couchbase Server before running this command. + {shutdown-instructions-link} @@ -133,20 +134,21 @@ Make sure to run each of the following commands: -- [source,console] ---- -$ docker run -d --name db1 couchbase +$ docker run -d --name db1 couchbase/server ---- [source,console] ---- -$ docker run -d --name db2 couchbase +$ docker run -d --name db2 couchbase/server ---- [source,console] ---- -$ docker run -d --name db3 -p 8091-8096:8091-8096 -p 11210-11211:11210-11211 couchbase +$ docker run -d --name db3 -p 8091-8096:8091-8096 -p 11210-11211:11210-11211 couchbase/server ---- -After running the above commands, three instances (`db1`, `db2`, `db3`) of the latest https://hub.docker.com/_/couchbase/[official Couchbase Server container image^] are downloaded and run on the host computer. +After running the above commands, three instances (`db1`, `db2`, `db3`) of the latest Couchbase Server image (see https://hub.docker.com/r/couchbase/server[couchbase/server]) are downloaded and run on the host computer. + If a traditional installation of Couchbase Server is running locally on the host computer, the port mappings specified using the `-p` option may fail. Ensure that you stop any local instance of Couchbase Server before running these commands. + {shutdown-instructions-link} @@ -265,10 +267,11 @@ To set up Docker on each host computer, refer to Docker's https://www.docker.com -- [source,console] ---- -$ docker run -d --name db -v ~/couchbase:/opt/couchbase/var --net=host couchbase +$ docker run -d --name db -v ~/couchbase:/opt/couchbase/var --net=host couchbase/server ---- -After running the above command, a single instance (`db`) of the latest https://hub.docker.com/_/couchbase/[official Couchbase Server container image^] is downloaded and run on the host computer. +After running the above command, a single instance (`db`) of the latest Couchbase Server image (see https://hub.docker.com/r/couchbase/server[couchbase/server]) is downloaded and run on the host computer. + The [.cmd]`-v` option is recommended for better I/O performance and persists the data stored by Couchbase on the local host. The `--net=host` option provides better network performance and maps the host network stack to the container. //// @@ -362,17 +365,16 @@ Make sure to run each of the following commands: + [source,console] ---- -$ docker run -d --name db1 -p 8091-8096:8091-8096 -p 11210-11211:11210-11211 couchbase +$ docker run -d --name db1 -p 8091-8096:8091-8096 -p 11210-11211:11210-11211 couchbase/server ---- + [source,console] ---- -$ docker run -d --name db2 -p 9091-9096:8091-8096 -p 21210-21211:11210-11211 couchbase +$ docker run -d --name db2 -p 9091-9096:8091-8096 -p 21210-21211:11210-11211 couchbase/server ---- + After running the above commands, -two instances (`db1` and `db2`) of the latest https://hub.docker.com/_/couchbase/[official Couchbase Server container image^] are downloaded -and run on the host computer. +two instances (`db1` and `db2`) of the latest Couchbase Server image (see https://hub.docker.com/r/couchbase/server[couchbase/server]) are downloaded and run on the host computer. If a traditional installation of Couchbase Server is running locally on the host computer, the port mappings specified using the `-p` option may fail. Ensure that you stop any local instance of Couchbase Server before running these commands. + diff --git a/modules/install/pages/rhel-multiple-instances.adoc b/modules/install/pages/rhel-multiple-instances.adoc deleted file mode 100644 index 5084efd6c6..0000000000 --- a/modules/install/pages/rhel-multiple-instances.adoc +++ /dev/null @@ -1,22 +0,0 @@ -= Installing Multiple Instances on Linux Platforms -:description: Multiple instances of Couchbase Server can be installed on one physical machine for the Linux operating system. - -[abstract] -{description} - -IMPORTANT: This installation method is intended for development purposes only and not supported in production. - -The number of Couchbase Server instances running on a single machine depends on its physical capacity. - -== Requirements - -Make sure that a minimum of 4Gb RAM and 8 Core CPUs are available for each Couchbase Server instance. -When installing multiple instances on a physical machine, install as one of these two users: - -== Setting up Multiple Instances - -Use Docker to set up multiple cluster instances running on a physical machine. - -The steps to carry out the Docker installation are given here: xref:getting-started-docker.adoc#section_deploy_multiple_clusters[] - - diff --git a/modules/install/pages/ubuntu-debian-install.adoc b/modules/install/pages/ubuntu-debian-install.adoc index 9131d3c52f..686b289fc1 100644 --- a/modules/install/pages/ubuntu-debian-install.adoc +++ b/modules/install/pages/ubuntu-debian-install.adoc @@ -79,7 +79,7 @@ Available releases are listed with their full `version-build` number: + [subs=+quotes] ---- -couchbase-server/xenial *6.0.0-1693-1* amd64 +couchbase-server/xenial *8.0.0-3777* amd64 ---- + . Specify a release to install it. @@ -93,7 +93,7 @@ Using the example listing from the previous step, the resulting installation com + [subs=+quotes] ---- -sudo apt-get install couchbase-server=*6.0.0-1693-1* +sudo apt-get install couchbase-server=*8.0.0-3777* ---- -- diff --git a/modules/install/pages/upgrade-docker-cluster-online-full-capacity.adoc b/modules/install/pages/upgrade-docker-cluster-online-full-capacity.adoc index f9fab29aeb..2b50f17cfa 100644 --- a/modules/install/pages/upgrade-docker-cluster-online-full-capacity.adoc +++ b/modules/install/pages/upgrade-docker-cluster-online-full-capacity.adoc @@ -46,7 +46,7 @@ In this case, you will create a node that can act as cluster manager. For exampl [source, console] [#docker-create-sparenode] ---- -docker run -d --name sparenode -p 28091-28096:8091-8096 -p 11310-11311:11210-11211 couchbase:latest +docker run -d --name sparenode -p 28091-28096:8091-8096 -p 11310-11311:11210-11211 couchbase/server:latest ---- will create a new node (`sparenode`) using the latest Couchbase server image. @@ -97,7 +97,7 @@ The following command will create a new container for the standard node. [source, console] ---- -docker run -d --name nodename couchbase:latest +docker run -d --name nodename couchbase/server:latest ---- -- @@ -108,7 +108,7 @@ The following command will create a new container for the administration node. [source, console] ---- -docker run -d --name nodename -p 8091-8096:8091-8096 -p 11210-11211:11210-11211 couchbase:latest +docker run -d --name nodename -p 8091-8096:8091-8096 -p 11210-11211:11210-11211 couchbase/server:latest ---- Note that the external port addresses match those of the administration node that has been removed. --