Skip to content
This repository has been archived by the owner on May 6, 2020. It is now read-only.

Install doc fixes #740

Merged
merged 5 commits into from
Oct 20, 2017
Merged

Install doc fixes #740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ee298cc
docs: install docs should all specify busybox image
jodh-intel Oct 18, 2017
6c6df5b
docs: Fix syntax error in here document
jodh-intel Oct 18, 2017
6b24bcf
docs: Run all ubuntu install commands non-interactively
jodh-intel Oct 18, 2017
aeae914
docs: Fix indent in Fedora and Ubuntu install docs
jodh-intel Oct 19, 2017
a63ce62
docs: Simplify wording in install docs
jodh-intel Oct 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions docs/fedora-installation-guide.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ $ sudo systemctl start cc-proxy.socket

5. Run Clear Containers 3.0.

You are now ready to run Clear Containers 3.0. For example:
You are now ready to run Clear Containers 3.0:

```
$ sudo docker run -ti fedora bash
```
```
$ sudo docker run -ti busybox sh
```
16 changes: 8 additions & 8 deletions docs/ubuntu-installation-guide.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ This step is only required in case Docker is not installed on the system.
1. Install the latest version of Docker with the following commands:

```
$ sudo -E apt-get install apt-transport-https ca-certificates curl software-properties-common
$ sudo -E apt-get -y install apt-transport-https ca-certificates curl software-properties-common
$ curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
$ sudo -E add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
$ sudo -E apt-get update
$ sudo -E apt-get install docker-ce
$ sudo -E apt-get -y install docker-ce
```

For more information on installing Docker please refer to the
Expand All @@ -27,14 +27,14 @@ For more information on installing Docker please refer to the
$ sudo sh -c "echo 'deb http://download.opensuse.org/repositories/home:/clearcontainers:/clear-containers-3/xUbuntu_$(lsb_release -rs)/ /' >> /etc/apt/sources.list.d/clear-containers.list"
$ curl -fsSL http://download.opensuse.org/repositories/home:/clearcontainers:/clear-containers-3/xUbuntu_$(lsb_release -rs)/Release.key | sudo apt-key add -
$ sudo -E apt-get update
$ sudo -E apt-get install -y cc-runtime cc-proxy cc-shim
$ sudo -E apt-get -y install -y cc-runtime cc-proxy cc-shim
```

3. Configure Docker to use Clear Containers as the default with the following commands:

```
$ sudo mkdir -p /etc/systemd/system/docker.service.d/
$ cat << EOF | sudo tee /etc/systemd/system/docker.service.d/clear-containers.conf
$ cat <<EOF | sudo tee /etc/systemd/system/docker.service.d/clear-containers.conf
[Service]
ExecStart=
ExecStart=/usr/bin/dockerd -D --add-runtime cc-runtime=/usr/bin/cc-runtime --default-runtime=cc-runtime
Expand All @@ -52,8 +52,8 @@ $ sudo systemctl start cc-proxy.socket

5. Run Clear Containers 3.0.

You are now ready to run Clear Containers 3.0. For example:
You are now ready to run Clear Containers 3.0:

```
$ sudo docker run -ti fedora bash
```
```
$ sudo docker run -ti busybox sh
```