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

require container-selinux >= 2.74 #345

Merged
merged 1 commit into from
Jun 25, 2019
Merged

require container-selinux >= 2.74 #345

merged 1 commit into from
Jun 25, 2019

Conversation

thaJeztah
Copy link
Member

version 2.9 is really old; this sets the same minimal version as is used for the containerd.io package

@thaJeztah
Copy link
Member Author

ping @andrewhsu @kolyshkin @justincormack PTAL

This is the same version as we set in the containerd.io package, but the discussion in containers/container-selinux#63 goes about version 2.99; should we set the minimal version higher than this (to get the fix from containers/container-selinux#64 in?)

Looks like 2.99 is available on CentOS now;

==================================================================================================================================================================================================================================================================================================================================================
 Package                                                                                     Arch                                                                       Version                                                                                 Repository                                                                   Size
==================================================================================================================================================================================================================================================================================================================================================
Installing:
 container-selinux                                                                           noarch                                                                     2:2.99-1.el7_6                                                                          extras                                                                       39 k
Installing for dependencies:

@thaJeztah
Copy link
Member Author

oh actually looks like we changed runc back to /usr/bin, so I guess we don't require v2.99

@thaJeztah
require container-selinux >= 2.74
a246b19 
version 2.9 is really old; this sets the same minimal version
as is used for the containerd.io package

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah force-pushed the bump_container_selinux branch from dc97e03 to a246b19 Compare June 25, 2019 09:41
@kolyshkin
Copy link
Contributor

At this point I do not remember which version is good and which one is not, but I think that 2.95 is OK and 2.74 might be problematic. @seemethere might remember more

kolyshkin
kolyshkin reviewed Jun 25, 2019
View reviewed changes
rpm/SPECS/docker-ce.spec
@@ -16,7 +16,7 @@ Vendor: Docker
Packager: Docker <support@docker.com>

Requires: docker-ce-cli
Requires: container-selinux >= 2.9
Requires: container-selinux >= 2:2.74
Copy link
Contributor

Choose a reason for hiding this comment

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

If we're to build this for openSUSE/SLES, we need this:
docker/containerd-packaging@072a3aa

Copy link
Member Author

Choose a reason for hiding this comment

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

these specs are only used for Docker CE, there's a spec in the EE packaging repository that does that

@kolyshkin
Copy link
Contributor

OK based on what I see in
docker/containerd-packaging#95 I think >=2.74 is good

andrewhsu
andrewhsu approved these changes Jun 25, 2019
View reviewed changes
Copy link
Contributor

@andrewhsu andrewhsu left a comment

Choose a reason for hiding this comment

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

LGTM

@docker-unir docker-unir bot merged commit 869ccdc into docker:master Jun 25, 2019
@thaJeztah thaJeztah deleted the bump_container_selinux branch June 25, 2019 22:46
This was referenced Jun 25, 2019
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kolyshkin kolyshkin kolyshkin left review comments

@seemethere seemethere seemethere approved these changes

@andrewhsu andrewhsu andrewhsu approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@thaJeztah @kolyshkin @andrewhsu @seemethere