Skip to content

Commit

Permalink
update docs for new install script
Browse files Browse the repository at this point in the history 
Signed-off-by: Jessica Frazelle <princess@docker.com>
  • Loading branch information
@jessfraz
jessfraz committed Jul 22, 2015
1 parent a7d8450 commit 877d740
Show file tree
Hide file tree
Showing 7 changed files with 169 additions and 148 deletions.
4 changes: 2 additions & 2 deletions docs/articles/dsc.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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\
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"
apt-get update
apt-get install lxc-docker
apt-get install docker-engine
```

Ensure that your current working directory is set to the `DockerClientDSC`
Expand Down
78 changes: 44 additions & 34 deletions docs/installation/centos.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,51 +41,28 @@ packages.

## Install

You use the same installation procedure for all versions of CentOS,
only the package you install differs. There are two packages to choose from:

<table>
<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:
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.

### Install with the script


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
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

4. Use `yum` to install the package.

$ sudo yum localinstall --nogpgcheck 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.

5. Start the Docker daemon.
4. Start the Docker daemon.

$ 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
Unable to find image 'hello-world:latest' locally
Expand All @@ -112,6 +89,39 @@ Installation procedure:

For more examples and ideas, visit:
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

Expand Down
4 changes: 2 additions & 2 deletions docs/installation/debian.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,11 +102,11 @@ which is officially supported by Docker.

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:

$ 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
configuration files on your host. If you wish to delete all images, containers,
Expand Down
140 changes: 69 additions & 71 deletions docs/installation/fedora.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,93 +38,36 @@ reported kernel bugs may have already been fixed on the latest kernel packages

## Install

You use the same installation procedure for all versions of Fedora,
only the package you install differs. Choose from these packages:

<style type="text/css">
.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.
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.

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.
### Install with the script

$ yum list installed | grep docker
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
1. Log into your machine as a user with `sudo` or `root` privileges.

4. Use `yum` to install the package.
2. Make sure your existing yum packages are up-to-date.

$ sudo yum localinstall --nogpgcheck docker-engine-1.7.1-0.1.fc21.x86_64.rpm
$ sudo yum update
3. Run the Docker installation script.

$ curl -sSL https://get.docker.com/ | sh
This script adds the `docker.repo` repository and installs Docker.

5. Start the Docker daemon.
4. Start the Docker daemon.

$ 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
Unable to find image 'hello-world:latest' locally
latest: Pulling from hello-world
a8219747be10: Pull complete
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.
Digest: sha256:aa03e5d0d5553b4c3473e89c8619cf79df368babd18681cf5daeb82aab55838d
Digest: sha256:aa03e5d0d5553b4c3473e89c8619cf79df368babd1.7.1cf5daeb82aab55838d
Status: Downloaded newer image for hello-world:latest
Hello from Docker.
This message shows that your installation appears to be working correctly.
Expand All @@ -143,6 +86,61 @@ This procedure depicts an installation on version 21. If you are installing on

For more examples and ideas, visit:
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

Expand Down
Loading

0 comments on commit 877d740

Please sign in to comment.