Skip to content

Updating the Oracle Linux installation documentation#1922

Merged
mdlinville merged 3 commits intodocker:masterfrom
Djelibeybi:oraclelinux-docs
Feb 22, 2017
Merged

Updating the Oracle Linux installation documentation#1922
mdlinville merged 3 commits intodocker:masterfrom
Djelibeybi:oraclelinux-docs

Conversation

@Djelibeybi
Copy link
Copy Markdown
Contributor

Proposed changes

Following from #1567, this PR includes updates incorporated after receiving feedback from the Docker team.

Related issues (optional)

#1567

Djelibeybi and others added 3 commits February 9, 2017 14:08
* Change the note about the UEK4, because it's not only required for `btrfs` support
* Added a note about the fact that Oracle also ships a supported package with the same name as upstream
* Added a note about the fact that we've already deprecated docker-engine-selinux
* Added a link to the Oracle Linux Docker User's Guide
* Fixed the GPG key section as it will not be shown during the `makecache fast` run but rather will automatically be accepted when the yum install command is run. 
* Added a note about disabling the `-y` parameter to prevent the automatic acceptance of the upstream GPG key
* Provided the specific GPG key output for better validation
* Provide context about the fact that `docker-engine` exists in the Oracle Linux addons repo as well and may appear in the results of the `yum ilst` command.
* Provide more context for the `btrfs` subvolume removal
The default RHCK (3.10) does not support overlay2.
Signed-off-by: Avi Miller <avi.miller@gmail.com>
Copy link
Copy Markdown

@mdlinville mdlinville left a comment

Choose a reason for hiding this comment

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

Thanks for the additional feedback and for your diligence!

@mdlinville mdlinville merged commit 828e621 into docker:master Feb 22, 2017
You can install Docker in different ways, depending on your needs:

- Most users
- Users who do not require Docker support from Oracle
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I think this is missing a "can"

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

I'll fix that in follow-up. Thanks @friism

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I left it in the active voice, i.e. "these users do this" as opposed to "these users could do this". But you could add "can" back into this sentence as well.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants