update docs for new install script

Signed-off-by: Jessica Frazelle <princess@docker.com>
This commit is contained in:
Jessica Frazelle 2015-07-15 14:01:04 -07:00
parent a7d8450312
commit 877d740d48
7 changed files with 162 additions and 141 deletions

View File

@ -51,10 +51,10 @@ The Docker installation configuration is equivalent to running:
``` ```
apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys\ apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys\
36A1D7869245C8950F966E92D8576A8BA88D21E9 36A1D7869245C8950F966E92D8576A8BA88D21E9
sh -c "echo deb https://get.docker.com/ubuntu docker main\ sh -c "echo deb https://apt.dockerproject.org/repo ubuntu-trusty main\
> /etc/apt/sources.list.d/docker.list" > /etc/apt/sources.list.d/docker.list"
apt-get update apt-get update
apt-get install lxc-docker apt-get install docker-engine
``` ```
Ensure that your current working directory is set to the `DockerClientDSC` Ensure that your current working directory is set to the `DockerClientDSC`

View File

@ -41,51 +41,28 @@ packages.
## Install ## Install
You use the same installation procedure for all versions of CentOS, There are two ways to install Docker Engine. You can use `curl` with the `get.docker.com` site. This method runs an installation script which installs via the `yum` package manager. Or you can install with the `yum` package manager directly yourself.
only the package you install differs. There are two packages to choose from:
<table> ### Install with the script
<tr>
<th>Version</th>
<th>Package name</th>
</tr>
<tr>
<td>7.X</td>
<td>
<p>
<a href="https://get.docker.com/rpm/1.7.1/centos-7/RPMS/x86_64/docker-engine-1.7.1-1.el7.centos.x86_64.rpm">
https://get.docker.com/rpm/1.7.1/centos-7/RPMS/x86_64/docker-engine-1.7.1-1.el7.centos.x86_64.rpm</a>
</p>
<p>
<a href="https://get.docker.com/rpm/1.7.1/centos-7/SRPMS/docker-engine-1.7.1-1.el7.centos.src.rpm">
https://get.docker.com/rpm/1.7.1/centos-7/SRPMS/docker-engine-1.7.1-1.el7.centos.src.rpm</a>
</p>
</td>
</tr>
</table>
Installation procedure:
1. Log into your machine as a user with `sudo` or `root` privileges. 1. Log into your machine as a user with `sudo` or `root` privileges.
2. Make sure your existing packages are up-to-date. 2. Make sure your existing yum packages are up-to-date.
$ sudo yum update $ sudo yum update
3. Download the Docker RPM to the current directory. 3. Run the Docker installation script.
$ curl -O -sSL https://get.docker.com/rpm/1.7.1/centos-7/RPMS/x86_64/docker-engine-1.7.1-1.el7.x86_64.rpm $ curl -sSL https://get.docker.com/ | sh
This script adds the `docker.repo` repository and installs Docker.
4. Use `yum` to install the package. 4. Start the Docker daemon.
$ sudo yum localinstall --nogpgcheck docker-engine-1.7.1-1.el7.x86_64.rpm
5. Start the Docker daemon.
$ sudo service docker start $ sudo service docker start
6. Verify `docker` is installed correctly by running a test image in a container. 5. Verify `docker` is installed correctly by running a test image in a container.
$ sudo docker run hello-world $ sudo docker run hello-world
Unable to find image 'hello-world:latest' locally Unable to find image 'hello-world:latest' locally
@ -112,6 +89,39 @@ Installation procedure:
For more examples and ideas, visit: For more examples and ideas, visit:
http://docs.docker.com/userguide/ http://docs.docker.com/userguide/
### Install without the script
1. Log into your machine as a user with `sudo` or `root` privileges.
2. Make sure your existing yum packages are up-to-date.
$ sudo yum update
3. Add the yum repo yourself.
For CentOS 7 run:
$ cat >/etc/yum.repos.d/docker.repo <<-EOF
[dockerrepo]
name=Docker Repository
baseurl=https://yum.dockerproject.org/repo/main/centos/7
enabled=1
gpgcheck=1
gpgkey=https://yum.dockerproject.org/gpg
EOF
4. Install the Docker package.
$ sudo yum install docker-engine
5. Start the Docker daemon.
$ sudo service docker start
6. Verify `docker` is installed correctly by running a test image in a container.
$ sudo docker run hello-world
## Create a docker group ## Create a docker group

View File

@ -102,11 +102,11 @@ which is officially supported by Docker.
To uninstall the Docker package: To uninstall the Docker package:
$ sudo apt-get purge lxc-docker $ sudo apt-get purge docker-engine
To uninstall the Docker package and dependencies that are no longer needed: To uninstall the Docker package and dependencies that are no longer needed:
$ sudo apt-get autoremove --purge lxc-docker $ sudo apt-get autoremove --purge docker-engine
The above commands will not remove images, containers, volumes, or user created The above commands will not remove images, containers, volumes, or user created
configuration files on your host. If you wish to delete all images, containers, configuration files on your host. If you wish to delete all images, containers,

View File

@ -38,85 +38,28 @@ reported kernel bugs may have already been fixed on the latest kernel packages
## Install ## Install
You use the same installation procedure for all versions of Fedora, There are two ways to install Docker Engine. You can use `curl` with the `get.docker.com` site. This method runs an installation script which installs via the `yum` package manager. Or you can install with the `yum` package manager directly yourself.
only the package you install differs. Choose from these packages:
<style type="text/css"> ### Install with the script
.tg {border-collapse:collapse;border-spacing:0;}
td{font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;vertical-align: top;}
th{font-family:Arial, sans-serif;font-size:14px;font-weight:normal;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;vertical-align: top;}
</style>
<table class="tg">
<tr>
<th>Version</th>
<th>Package name</th>
</tr>
<tr>
<td>Fedora 20</td>
<td>
<p>
<a href="https://get.docker.com/rpm/1.7.1/fedora-20/RPMS/x86_64/docker-engine-1.7.1-1.fc20.x86_64.rpm">
docker-engine-1.7.1-1.fc20.x86_64.rpm</a>
</p>
<p>
<a href="https://get.docker.com/rpm/1.7.1/fedora-20/SRPMS/docker-engine-1.7.1-1.fc20.src.rpm">
docker-engine-1.7.1-1.fc20.src.rpm</a>
</p>
</td>
</tr>
<tr>
<td>Fedora 21</td>
<td>
<p>
<a href="https://get.docker.com/rpm/1.7.1/fedora-21/RPMS/x86_64/docker-engine-1.7.1-1.fc21.x86_64.rpm">
docker-engine-1.7.1-1.fc21.x86_64.rpm</a>
</p>
<p>
<a href="https://get.docker.com/rpm/1.7.1/fedora-21/SRPMS/docker-engine-1.7.1-1.fc21.src.rpm">
docker-engine-1.7.1-1.fc21.src.rpm</a>
</p>
</td>
</tr>
<tr>
<td>Fedora 22</td>
<td>
<p>
<a href="https://get.docker.com/rpm/1.7.1/fedora-22/RPMS/x86_64/docker-engine-1.7.1-1.fc22.x86_64.rpm">
docker-engine-1.7.1-1.fc22.x86_64.rpm</a>
</p>
<p>
<a href="https://get.docker.com/rpm/1.7.1/fedora-22/SRPMS/docker-engine-1.7.1-1.fc22.src.rpm">
docker-engine-1.7.1-1.fc22.src.rpm</a>
</p>
</td>
</tr>
</table>
This procedure depicts an installation on version 21. If you are installing on
20 or 22, substitute that package for your installation.
1. Log into your machine as a user with `sudo` or `root` privileges. 1. Log into your machine as a user with `sudo` or `root` privileges.
2. Make sure you don't have an older version of Docker installed. 2. Make sure your existing yum packages are up-to-date.
$ yum list installed | grep docker $ sudo yum update
If you have an older version, remove it using the `yum -y remove <packagename>` command.
3. Download the Docker RPM to the current directory.
$ curl -O -sSL https://url_to_package/docker-engine-1.7.1-0.1.fc21.x86_64.rpm 3. Run the Docker installation script.
$ curl -sSL https://get.docker.com/ | sh
This script adds the `docker.repo` repository and installs Docker.
4. Use `yum` to install the package. 4. Start the Docker daemon.
$ sudo yum localinstall --nogpgcheck docker-engine-1.7.1-0.1.fc21.x86_64.rpm
5. Start the Docker daemon.
$ sudo service docker start $ sudo service docker start
6. Verify `docker` is installed correctly by running a test image in a container. 5. Verify `docker` is installed correctly by running a test image in a container.
$ sudo docker run hello-world $ sudo docker run hello-world
Unable to find image 'hello-world:latest' locally Unable to find image 'hello-world:latest' locally
@ -124,7 +67,7 @@ This procedure depicts an installation on version 21. If you are installing on
a8219747be10: Pull complete a8219747be10: Pull complete
91c95931e552: Already exists 91c95931e552: Already exists
hello-world:latest: The image you are pulling has been verified. Important: image verification is a tech preview feature and should not be relied on to provide security. hello-world:latest: The image you are pulling has been verified. Important: image verification is a tech preview feature and should not be relied on to provide security.
Digest: sha256:aa03e5d0d5553b4c3473e89c8619cf79df368babd18681cf5daeb82aab55838d Digest: sha256:aa03e5d0d5553b4c3473e89c8619cf79df368babd1.7.1cf5daeb82aab55838d
Status: Downloaded newer image for hello-world:latest Status: Downloaded newer image for hello-world:latest
Hello from Docker. Hello from Docker.
This message shows that your installation appears to be working correctly. This message shows that your installation appears to be working correctly.
@ -143,6 +86,61 @@ This procedure depicts an installation on version 21. If you are installing on
For more examples and ideas, visit: For more examples and ideas, visit:
http://docs.docker.com/userguide/ http://docs.docker.com/userguide/
### Install without the script
1. Log into your machine as a user with `sudo` or `root` privileges.
2. Make sure your existing yum packages are up-to-date.
$ sudo yum update
3. Add the yum repo yourself.
For Fedora 20 run:
$ cat >/etc/yum.repos.d/docker.repo <<-EOF
[dockerrepo]
name=Docker Repository
baseurl=https://yum.dockerproject.org/repo/main/fedora/20
enabled=1
gpgcheck=1
gpgkey=https://yum.dockerproject.org/gpg
EOF
For Fedora 21 run:
$ cat >/etc/yum.repos.d/docker.repo <<-EOF
[dockerrepo]
name=Docker Repository
baseurl=https://yum.dockerproject.org/repo/main/fedora/21
enabled=1
gpgcheck=1
gpgkey=https://yum.dockerproject.org/gpg
EOF
For Fedora 22 run:
$ cat >/etc/yum.repos.d/docker.repo <<-EOF
[dockerrepo]
name=Docker Repository
baseurl=https://yum.dockerproject.org/repo/main/fedora/22
enabled=1
gpgcheck=1
gpgkey=https://yum.dockerproject.org/gpg
EOF
4. Install the Docker package.
$ sudo yum install docker-engine
5. Start the Docker daemon.
$ sudo service docker start
6. Verify `docker` is installed correctly by running a test image in a container.
$ sudo docker run hello-world
## Create a docker group ## Create a docker group

View File

@ -35,48 +35,29 @@ mind that your system should be fully patched to fix any potential kernel bugs.
Any reported kernel bugs may have already been fixed on the latest kernel Any reported kernel bugs may have already been fixed on the latest kernel
packages. packages.
## Install ## Install Docker Engine
You use the same installation procedure for all versions of Red Hat Enterprise, There are two ways to install Docker Engine. You can use `curl` with the `get.docker.com` site. This method runs an installation script which installs via the `yum` package manager. Or you can install with the `yum` package manager directly yourself.
only the package you install differs. There are two packages to choose from:
<table> ### Install with the script
<tr>
<th>Version</th>
<th>Package name</th>
</tr>
<tr>
<td>7.X</td>
<td>
<p>
<a href="https://get.docker.com/rpm/1.7.1/centos-7/RPMS/x86_64/docker-engine-1.7.1-1.el7.centos.x86_64.rpm">
https://get.docker.com/rpm/1.7.1/centos-7/RPMS/x86_64/docker-engine-1.7.1-1.el7.centos.x86_64.rpm</a>
</p>
<p>
<a href="https://get.docker.com/rpm/1.7.1/centos-7/SRPMS/docker-engine-1.7.1-1.el7.centos.src.rpm">
https://get.docker.com/rpm/1.7.1/centos-7/SRPMS/docker-engine-1.7.1-1.el7.centos.src.rpm</a>
</p>
</td>
</tr>
</table>
Installation procedure: You use the same installation procedure for all versions of CentOS.
1. Log into your machine as a user with `sudo` or `root` privileges. 1. Log into your machine as a user with `sudo` or `root` privileges.
2. Download the Docker RPM to the current directory. 2. Make sure your existing yum packages are up-to-date.
$ sudo yum update
$ curl -O -sSL https://get.docker.com/rpm/1.7.1/centos-7/RPMS/x86_64/docker-engine-1.7.1-1.el7.x86_64.rpm 3. Run the Docker installation script.
$ curl -sSL https://get.docker.com/ | sh
3. Use `yum` to install the package. 4. Start the Docker daemon.
$ sudo yum localinstall --nogpgcheck docker-engine-1.7.1-1.el7.x86_64.rpm
5. Start the Docker daemon.
$ sudo service docker start $ sudo service docker start
6. Verify `docker` is installed correctly. 5. Verify `docker` is installed correctly by running a test image in a container.
$ sudo docker run hello-world $ sudo docker run hello-world
Unable to find image 'hello-world:latest' locally Unable to find image 'hello-world:latest' locally
@ -84,7 +65,7 @@ Installation procedure:
a8219747be10: Pull complete a8219747be10: Pull complete
91c95931e552: Already exists 91c95931e552: Already exists
hello-world:latest: The image you are pulling has been verified. Important: image verification is a tech preview feature and should not be relied on to provide security. hello-world:latest: The image you are pulling has been verified. Important: image verification is a tech preview feature and should not be relied on to provide security.
Digest: sha256:aa03e5d0d5553b4c3473e89c8619cf79df368babd18681cf5daeb82aab55838d Digest: sha256:aa03e5d0d5553b4c3473e89c8619cf79df368babd1.7.1cf5daeb82aab55838d
Status: Downloaded newer image for hello-world:latest Status: Downloaded newer image for hello-world:latest
Hello from Docker. Hello from Docker.
This message shows that your installation appears to be working correctly. This message shows that your installation appears to be working correctly.
@ -103,6 +84,39 @@ Installation procedure:
For more examples and ideas, visit: For more examples and ideas, visit:
http://docs.docker.com/userguide/ http://docs.docker.com/userguide/
### Install without the script
1. Log into your machine as a user with `sudo` or `root` privileges.
2. Make sure your existing yum packages are up-to-date.
$ sudo yum update
3. Add the yum repo yourself.
For RHEL 7 run:
$ cat >/etc/yum.repos.d/docker.repo <<-EOF
[dockerrepo]
name=Docker Repository
baseurl=https://yum.dockerproject.org/repo/main/centos/7
enabled=1
gpgcheck=1
gpgkey=https://yum.dockerproject.org/gpg
EOF
4. Install the Docker package.
$ sudo yum install docker-engine
5. Start the Docker daemon.
$ sudo service docker start
6. Verify `docker` is installed correctly by running a test image in a container.
$ sudo docker run hello-world
## Create a docker group ## Create a docker group

View File

@ -347,11 +347,11 @@ To install the latest version of Docker with `wget`:
To uninstall the Docker package: To uninstall the Docker package:
$ sudo apt-get purge lxc-docker $ sudo apt-get purge docker-engine
To uninstall the Docker package and dependencies that are no longer needed: To uninstall the Docker package and dependencies that are no longer needed:
$ sudo apt-get autoremove --purge lxc-docker $ sudo apt-get autoremove --purge docker-engine
The above commands will not remove images, containers, volumes, or user created The above commands will not remove images, containers, volumes, or user created
configuration files on your host. If you wish to delete all images, containers, configuration files on your host. If you wish to delete all images, containers,

View File

@ -25,8 +25,7 @@ for, so feel free to reach out to him even just to say "Hi!"
## Package Name ## Package Name
If possible, your package should be called "docker". If that name is already If possible, your package should be called "docker". If that name is already
taken, a second choice is "lxc-docker", but with the caveat that "LXC" is now an taken, a second choice is "docker-engine". Another possible choice is "docker.io".
optional dependency (as noted below). Another possible choice is "docker.io".
## Official Build vs Distro Build ## Official Build vs Distro Build