Skip to content

Commit f04d21f

Browse files
Matt BentleyJoao Fernandes
Matt Bentley
authored and
Joao Fernandes
committed
Update CS engine install instructions; fixes docker#374
Signed-off-by: Matt Bentley <[email protected]>
1 parent 7532b7a commit f04d21f

File tree

1 file changed

+8
-40
lines changed

1 file changed

+8
-40
lines changed

installation.md

Lines changed: 8 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ These instructions explain how to install Docker Universal Control Plane (UCP).
1313
- [Plan your installation](#plan-your-installation)
1414
- [Step 1: Verify you have the prerequisites](#step-1-verify-you-have-the-prerequisites)
1515
- [Step 2: Configure your network for UCP](#step-2-configure-your-network-for-ucp)
16-
- [Step 3: Install Docker CS Engine 1.9](#step-3-install-docker-cs-engine-19)
16+
- [Step 3: Install Docker CS Engine 1.9](#step-3-install-docker-cs-engine-1-9)
1717
- [Step 4: (optional) Create user-named volumes](#step-4-optional-create-user-named-volumes)
1818
- [Step 5: Install the UCP controller](#step-5-install-the-ucp-controller)
1919
- [Step 6: (optional) Add a controller replica to the UCP cluster](#step-6-optional-add-a-controller-replica-to-the-ucp-cluster)
@@ -36,7 +36,7 @@ Docker Engine CLI. The bootstrapper has subcommands to `install` a controller or
3636

3737
You can use the bootstrapper as an interactive script or by passing command-line
3838
options. Regardless of how you use the bootstrapper, the installer supplies some
39-
quick default options for both data volumes and the certificate authority (CA).
39+
quick default options for both data volumes and the certificate authority (CA).
4040
### Default versus the custom installation options
4141

4242
The first time you install, you should build a sandbox environment using
@@ -58,7 +58,7 @@ in your sandbox.
5858

5959
When you bootstrap a controller or node, you must supply a host address either
6060
interactively or using the `--host-address` option. The host address can be a
61-
pubic IP address and/or fully-qualified domain name.
61+
pubic IP address and/or fully-qualified domain name.
6262

6363
If you are using a cloud provider such as AWS or Digital Ocean, you may need to
6464
allocate a private network for your UCP installation. You can use this network
@@ -157,53 +157,21 @@ Using a different port is a customization. These instructions assume you are us
157157

158158
## Step 3: Install Docker CS Engine 1.9
159159

160-
The BETA program requires that you install the 1.9.0 version of Docker CS
161-
Engine. Follow the instructions for your particular operating system and ensure
160+
The BETA program requires that you install the Docker CS Engine 1.9.0 or above.
161+
Follow the instructions for your particular operating system and ensure
162162
you are pointing at the proper repo.
163163

164164
Install the Docker CS Engine on both the controller node and each member node.
165165

166-
### RHEL 7.0, 7.1
166+
### RHEL 7.0, 7.1 and CentOS 7.1
167167

168168
Use the detailed [Red Hat Linux installation
169-
instructions](http://docs.docker.com/installation/rhel/) and refer to this repo
170-
to install:
171-
172-
```
173-
[dockerrepo]
174-
name=Docker Repository
175-
baseurl=https://yum.dockerproject.org/repo/testing/centos/7
176-
enabled=1
177-
gpgcheck=1
178-
gpgkey=https://yum.dockerproject.org/gpg
179-
EOF
180-
```
169+
instructions](https://docs.docker.com/docker-trusted-registry/install/install-csengine/#centos-7-1-rhel-7-0-7-1-yum-based-systems)
181170

182171
### Ubuntu 14.04 LTS
183172

184173
Use the [detailed Ubuntu installation
185-
instructions](http://docs.docker.com/installation/ubuntulinux/) to refer to this
186-
repo to install:
187-
188-
```
189-
deb https://apt.dockerproject.org/repo ubuntu-trusty testing
190-
```
191-
192-
### CentOS 7.1
193-
194-
Use the [detailed CentOS installation
195-
instructions](http://docs.docker.com/installation/centos/) to refer to this
196-
repo to install:
197-
198-
```
199-
[dockerrepo]
200-
name=Docker Repository
201-
baseurl=https://yum.dockerproject.org/repo/testing/centos/7
202-
enabled=1
203-
gpgcheck=1
204-
gpgkey=https://yum.dockerproject.org/gpg
205-
EOF
206-
```
174+
instructions](https://docs.docker.com/docker-trusted-registry/install/install-csengine/#install-on-ubuntu-14-04-lts)
207175

208176

209177
## Step 4: (optional) Create user-named volumes

0 commit comments

Comments
 (0)