Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Addressing feedback from new installation instructions #1172

Merged
merged 2 commits into from
Jan 19, 2017
Merged

Addressing feedback from new installation instructions #1172

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f079ecd
Address feedback for new installation instructions
Jan 19, 2017
09d521b
Updating the repo files for Oracle since does not expand to only the…
Jan 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
15 changes: 13 additions & 2 deletions engine/installation/linux/oracle.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,23 @@ Docker from the repository.
$ sudo yum install -y yum-utils
```

2. Use the following command to set up the **stable** repository:
2. Use one of the following commands to set up the **stable** repository,
depending on your version of Oracle Linux:

**Oracle Linux 7**:

```bash
$ sudo yum-config-manager \
--add-repo \
https://docs.docker.com/engine/installation/linux/repo_files/oracle/docker-ol7.repo
```

**Oracle Linux 6**:

```bash
$ sudo yum-config-manager \
--add-repo \
https://docs.docker.com/engine/installation/linux/repo_files/oracle/docker.repo
https://docs.docker.com/engine/installation/linux/repo_files/oracle/docker-ol6.repo
```

3. **Optional**: Enable the **testing** repository. This repository is included
Expand Down
8 changes: 4 additions & 4 deletions ...ation/linux/repo_files/oracle/docker.repo → ...n/linux/repo_files/oracle/docker-ol6.repo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
[docker-main]
name=Docker Repository
baseurl=https://yum.dockerproject.org/repo/main/oraclelinux/$releasever/
baseurl=https://yum.dockerproject.org/repo/main/oraclelinux/6/
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you renamed your directory (or created a symlink) on your YUM server to 7Server and 6Server, you could keep the $releasever variable and simplify back to a single docker.repo file for both Oracle Linux 6 and 7.

enabled=1
gpgcheck=1
gpgkey=https://yum.dockerproject.org/gpg

[docker-testing]
name=Docker Repository
baseurl=https://yum.dockerproject.org/repo/testing/oraclelinux/$releasever/
baseurl=https://yum.dockerproject.org/repo/testing/oraclelinux/6/
enabled=1
gpgcheck=1
gpgkey=https://yum.dockerproject.org/gpg

[docker-beta]
name=Docker Repository
baseurl=https://yum.dockerproject.org/repo/beta/oraclelinux/$releasever/
baseurl=https://yum.dockerproject.org/repo/beta/oraclelinux/6/
enabled=0
gpgcheck=1
gpgkey=https://yum.dockerproject.org/gpg

[docker-nightly]
name=Docker Repository
baseurl=https://yum.dockerproject.org/repo/nightly/oraclelinux/$releasever/
baseurl=https://yum.dockerproject.org/repo/nightly/oraclelinux/6/
enabled=0
gpgcheck=1
gpgkey=https://yum.dockerproject.org/gpg
27 changes: 27 additions & 0 deletions engine/installation/linux/repo_files/oracle/docker-ol7.repo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
[docker-main]
name=Docker Repository
baseurl=https://yum.dockerproject.org/repo/main/oraclelinux/7/
enabled=1
gpgcheck=1
gpgkey=https://yum.dockerproject.org/gpg

[docker-testing]
name=Docker Repository
baseurl=https://yum.dockerproject.org/repo/testing/oraclelinux/7/
enabled=1
gpgcheck=1
gpgkey=https://yum.dockerproject.org/gpg

[docker-beta]
name=Docker Repository
baseurl=https://yum.dockerproject.org/repo/beta/oraclelinux/7/
enabled=0
gpgcheck=1
gpgkey=https://yum.dockerproject.org/gpg

[docker-nightly]
name=Docker Repository
baseurl=https://yum.dockerproject.org/repo/nightly/oraclelinux/7/
enabled=0
gpgcheck=1
gpgkey=https://yum.dockerproject.org/gpg