-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Workaround on new CA from Ubuntu. Also minor documentation improvemen… #5420
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.
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
Closed
Closed
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
afc1a83
Workaround on new CA from Ubuntu. Also minor documentation improvemen…
088da54
Workaround on new CA from Ubuntu. Also minor documentation improvemen…
31c43d6
Merge branch '5368-adding-docs' of github.com:thanos1983/cri-o into 5…
ef90200
Workaround on new CA from Ubuntu. Also minor documentation improvemen…
038547b
Merge branch '5368-adding-docs' of github.com:thanos1983/cri-o into 5…
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,14 +20,18 @@ We also save releases as subprojects. If you'd, for instance, like to use `1.18. | |
| ## Installation Instructions | ||
|
|
||
| ### openSUSE: | ||
|
|
||
| Run the following as root: | ||
| ```shell | ||
| sudo zypper install cri-o | ||
| zypper install cri-o | ||
| ``` | ||
|
|
||
| ### Fedora 31 or later | ||
|
|
||
| Run the following as root: | ||
| ```shell | ||
| sudo dnf module enable cri-o:$VERSION | ||
| sudo dnf install cri-o | ||
| dnf module enable cri-o:$VERSION | ||
| dnf install cri-o | ||
| ``` | ||
| For Fedora, we only support setting minor versions. i.e: `VERSION=1.18`, and do not support pinning patch versions: `VERSION=1.18.3` | ||
|
|
||
|
|
@@ -45,12 +49,12 @@ And then run the following as root: | |
| ```shell | ||
| curl -L -o /etc/yum.repos.d/devel:kubic:libcontainers:stable.repo https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/$OS/devel:kubic:libcontainers:stable.repo | ||
| curl -L -o /etc/yum.repos.d/devel:kubic:libcontainers:stable:cri-o:$VERSION.repo https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable:cri-o:$VERSION/$OS/devel:kubic:libcontainers:stable:cri-o:$VERSION.repo | ||
| yum install cri-o | ||
| yum install -y cri-o | ||
| ``` | ||
|
|
||
| ### Apt based operating systems | ||
|
|
||
| Note: this tutorial assumes you have curl and gnupg installed | ||
| Note: these are prerequisites for installing | ||
|
|
||
| To install on the following operating systems, set the environment variable $OS as the appropriate field in the following table: | ||
| | Operating system | $OS | | ||
|
|
@@ -64,13 +68,16 @@ To install on the following operating systems, set the environment variable $OS | |
|
|
||
| And then run the following as root: | ||
| ```shell | ||
| apt update | ||
| apt install ca-certificates curl gnupg | ||
| apt upgrade | ||
|
|
||
| echo "deb [signed-by=/usr/share/keyrings/libcontainers-archive-keyring.gpg] https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/$OS/ /" > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list | ||
| echo "deb [signed-by=/usr/share/keyrings/libcontainers-crio-archive-keyring.gpg] https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable:/cri-o:/$VERSION/$OS/ /" > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable:cri-o:$VERSION.list | ||
|
|
||
| mkdir -p /usr/share/keyrings | ||
| curl -L https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/$OS/Release.key | gpg --dearmor -o /usr/share/keyrings/libcontainers-archive-keyring.gpg | ||
| curl -L https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable:/cri-o:/$VERSION/$OS/Release.key | gpg --dearmor -o /usr/share/keyrings/libcontainers-crio-archive-keyring.gpg | ||
|
|
||
| apt-get update | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. shoot I think we still need this. can you add it back, commit the changes, and squash the commits together with |
||
| apt-get install cri-o | ||
| apt install cri-o | ||
| ``` | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
one more nit: if we drop the other
-ys, then we should drop this one as wellThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@haircommander I missed this, thanks for noticing :)