docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes install docs with bad indentation

This commit is contained in:
Joao Fernandes 2016-03-07 16:26:59 -08:00
parent 0b40091629
commit 316aa9080e
2 changed files with 86 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure/config-auth.md
View File

@ -27,7 +27,7 @@ There are three authentication methods:
![Auth settings page</admin/settings#auth>](../images/admin-settings-auth.png) ![Auth settings page</admin/settings#auth>](../images/admin-settings-auth.png)
> **Note**: If you have issues logging into the Docker Trusted Registry admin web interface after changing the authentication settings, you may need to use the [emergency access to the Docker Trusted Registry admin web interface](../adminguide.md/#emergency-access-to-the-trusted-registry). > **Note**: If you have issues logging into the Docker Trusted Registry admin web interface after changing the authentication settings, you may need to use the [emergency access to the Docker Trusted Registry admin web interface](../adminguide.md#emergency-access-to-the-trusted-registry).
## No authentication (None) ## No authentication (None)

131
install/install-csengine.md
View File

@ -18,12 +18,15 @@ cloud infrastructures.
You first install the CS Engine before you install Docker Trusted Registry. You first install the CS Engine before you install Docker Trusted Registry.
However, if you are upgrading, you reverse that order and upgrade the Trusted However, if you are upgrading, you reverse that order and upgrade the Trusted
Registry first. To upgrade, see the [upgrade documentation](upgrade.md). You will need to install the latest version of the CS Engine to run with the latest Registry first. To upgrade, see the [upgrade documentation](upgrade.md).
version of the Trusted Registry. You will also want to install the CS Engine on You will need to install the latest version of the CS Engine to run with the
latest version of the Trusted Registry. You will also want to install the
CS Engine on
any clients, especially in your production environment. any clients, especially in your production environment.
If your cloud provider is AWS, you have the option of installing the CS Engine If your cloud provider is AWS, you have the option of installing the CS Engine
using an Amazon Machine Image (AMI). For more information, read the [installation overview](index.md) to understand your options. using an Amazon Machine Image (AMI). For more information, read
the [installation overview](index.md) to understand your options.
The CS Engine is supported on the following operating systems: The CS Engine is supported on the following operating systems:
@ -44,30 +47,34 @@ to update its RHEL kernel.
2. Add Docker's public key for CS packages: 2. Add Docker's public key for CS packages:
``` ```bash
$ sudo rpm --import "https://sks-keyservers.net/pks/lookup?op=get&search=0xee6d536cf7dc86e2d7d56f59a178ac6c6238f52e" $ sudo rpm --import "https://sks-keyservers.net/pks/lookup?op=get&search=0xee6d536cf7dc86e2d7d56f59a178ac6c6238f52e"
``` ```
3. Install yum-utils if necessary: 3. Install yum-utils if necessary:
`$ sudo yum install -y yum-utils` ```bash
$ sudo yum install -y yum-utils
```
4. Add the repository. Notice in the following code that it gets the latest 4. Add the repository. Notice in the following code that it gets the latest
version of the CS Engine. Each time you either install or upgrade, ensure that version of the CS Engine. Each time you either install or upgrade, ensure that
you are requesting the version and the OS that you want. you are requesting the version and the OS that you want.
``` ```bash
$ sudo yum-config-manager --add-repo https://packages.docker.com/1.10/yum/repo/main/centos/7 $ sudo yum-config-manager --add-repo https://packages.docker.com/1.10/yum/repo/main/centos/7
``` ```
5. Install the CS Engine with the following command: 5. Install the CS Engine with the following command:
`$ sudo yum install docker-engine` ```bash
$ sudo yum install docker-engine
```
6. Enable the Docker daemon as a service and then start it. 6. Enable the Docker daemon as a service and then start it.
``` ```bash
$ sudo systemctl enable docker.service $ sudo systemctl enable docker.service
$ sudo systemctl start docker.service $ sudo systemctl start docker.service
``` ```
@ -97,9 +104,13 @@ you are requesting the version and the OS that you want.
To try something more ambitious, you can run an Ubuntu container with: To try something more ambitious, you can run an Ubuntu container with:
$ docker run -it ubuntu bash $ docker run -it ubuntu bash
8. (Optional) Add non-sudo access to the Docker socket by adding your user to the `docker` group.
`$ sudo usermod -a -G docker $USER` 8. (Optional) Add non-sudo access to the Docker socket by adding your user
to the `docker` group.
```bash
$ sudo usermod -a -G docker $USER
```
9. Log out and log back in to have your new permissions take effect. 9. Log out and log back in to have your new permissions take effect.
@ -110,44 +121,61 @@ you are requesting the version and the OS that you want.
2. Add Docker's public key for CS packages: 2. Add Docker's public key for CS packages:
`$ curl -s 'https://sks-keyservers.net/pks/lookup?op=get&search=0xee6d536cf7dc86e2d7d56f59a178ac6c6238f52e' | sudo apt-key add --import` ```bash
$ curl -s 'https://sks-keyservers.net/pks/lookup?op=get&search=0xee6d536cf7dc86e2d7d56f59a178ac6c6238f52e' | sudo apt-key add --import
```
3. Install the HTTPS helper for apt (your system may already have it): 3. Install the HTTPS helper for apt (your system may already have it):
`$ sudo apt-get update && sudo apt-get install apt-transport-https` ```bash
$ sudo apt-get update && sudo apt-get install apt-transport-https
```
4. Install additional virtual drivers not in the base image. 4. Install additional virtual drivers not in the base image.
$ sudo apt-get install -y linux-image-extra-virtual ```bash
$ sudo apt-get install -y linux-image-extra-virtual
```
You may need to reboot your server after updating the LTS kernel. You may need to reboot your server after updating the LTS kernel.
5. Add the repository for the new version: 5. Add the repository for the new version:
`$ echo "deb https://packages.docker.com/1.10/apt/repo ubuntu-trusty main" | sudo tee /etc/apt/sources.list.d/docker.list` ```bash
$ echo "deb https://packages.docker.com/1.10/apt/repo ubuntu-trusty main" | sudo tee /etc/apt/sources.list.d/docker.list
```
You must modify the "ubuntu-trusty" string for your flavor of ubuntu or debian as seen in the following options. You must modify the "ubuntu-trusty" string for your flavor of ubuntu or
debian as seen in the following options:
* debian-jessie (Debian 8) * debian-jessie (Debian 8)
* debian-stretch (future release) * debian-stretch (future release)
* debian-wheezy (Debian 7) * debian-wheezy (Debian 7)
* ubuntu-precise (Ubuntu 12.04) * ubuntu-precise (Ubuntu 12.04)
* ubuntu-trusty (Ubuntu 14.04) * ubuntu-trusty (Ubuntu 14.04)
* ubuntu-utopic (Ubuntu 14.10) * ubuntu-utopic (Ubuntu 14.10)
* ubuntu-vivid (Ubuntu 15.04) * ubuntu-vivid (Ubuntu 15.04)
* ubuntu-wily (Ubuntu 15.10) * ubuntu-wily (Ubuntu 15.10)
6. Run the following to install commercially supported Docker Engine and its dependencies: 6. Run the following to install commercially supported Docker Engine and its
dependencies:
`$ sudo apt-get update && sudo apt-get install docker-engine` ```bash
$ sudo apt-get update && sudo apt-get install docker-engine
```
7. Confirm the Docker daemon is running: 7. Confirm the Docker daemon is running:
`$ sudo docker info` ```bash
$ sudo docker info
```
8. Optionally, add non-sudo access to the Docker socket by adding your user to the `docker` group. 8. Optionally, add non-sudo access to the Docker socket by adding your
user to the `docker` group.
`$ sudo usermod -a -G docker $USER` ```bash
$ sudo usermod -a -G docker $USER
```
Log out and log back in to have your new permissions take effect. Log out and log back in to have your new permissions take effect.
@ -156,37 +184,48 @@ you are requesting the version and the OS that you want.
1. Log into the system as a user with root or sudo permissions. 1. Log into the system as a user with root or sudo permissions.
2. Refresh your repository so that curl commands and CA certificates are available: `$ sudo zypper ref`. 2. Refresh your repository so that curl commands and CA certificates
are available.
3. Add the repository and the signing key. Notice in the following code that it gets the latest version of the CS Engine. Each time you either install or upgrade, ensure that the you are requesting the version and the OS that you want. ```bash
$ sudo zypper ref
```
``` 3. Add the repository and the signing key. Notice in the following code
$ sudo zypper ar -t YUM https://packages.docker.com/1.10/yum/repo/main/opensuse/12.3 docker-1.10 that it gets the latest version of the CS Engine. Each time you either
install or upgrade, ensure that the you are requesting the version and the
OS that you want.
$ sudo rpm --import 'https://sks-keyservers.net/pks/lookup?op=get&search=0xee6d536cf7dc86e2d7d56f59a178ac6c6238f52e' ```bash
``` $ sudo zypper ar -t YUM https://packages.docker.com/1.10/yum/repo/main/opensuse/12.3 docker-1.10
$ sudo rpm --import 'https://sks-keyservers.net/pks/lookup?op=get&search=0xee6d536cf7dc86e2d7d56f59a178ac6c6238f52e'
```
4. Install the Docker daemon package: 4. Install the Docker daemon package:
``` ```bash
$ sudo zypper install docker-engine $ sudo zypper install docker-engine
``` ```
5. Enable the Docker daemon as a service and then start it: 5. Enable the Docker daemon as a service and then start it:
``` ```bash
$ sudo systemctl enable docker.service $ sudo systemctl enable docker.service
$ sudo systemctl start docker.service $ sudo systemctl start docker.service
``` ```
6. Confirm the Docker daemon is running: 6. Confirm the Docker daemon is running:
`$ sudo docker info` ```bash
$ sudo docker info
```
7. Optionally, add non-sudo access to the Docker socket by adding your user
to the `docker` group.
7. Optionally, add non-sudo access to the Docker socket by adding your user to the `docker` group. ```bash
$ sudo usermod -a -G docker $USER
`$ sudo usermod -a -G docker $USER` ```
8. Log out and log back in to have your new permissions take effect. 8. Log out and log back in to have your new permissions take effect.