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.

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

[master] rpm: remove Obsoletes for obsolete (selinux) packages #1155

Merged
merged 1 commit into from
Jan 24, 2025

Conversation

thaJeztah
Copy link
Member

Remove the obsoletes for docker-ce-selinux, docker-engine-selinux, and docker-engine.

These were obsoleted in 2017 through 94943b4

Mark docker-*-selinux pkgs as obsolete

These are replaced by container-selinux on fedora-25 and centos-7.
Marking these packages as obsolete makes the installation process a bit
smoother, otherwise the user will have to manually uninstall the older
packages to install the new one.

Also makes fedora24 use container-selinux which is now supports labeling
the dockerd binary correctly.

Both CentOS 6/7 and Fedora 25 are EOL now, and these packages have not been published for a long time. Time to remove them, also to reduce some noise during builds;

RPM build warnings:
    line 51: It's not recommended to have unversioned Obsoletes: Obsoletes: docker-ce-selinux
    line 52: It's not recommended to have unversioned Obsoletes: Obsoletes: docker-engine-selinux
    line 53: It's not recommended to have unversioned Obsoletes: Obsoletes: docker-engine

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

Remove the obsoletes for `docker-ce-selinux`, `docker-engine-selinux`, and
`docker-engine`.

These were obsoleted in 2017 through 94943b4

> Mark docker-*-selinux pkgs as obsolete
>
> These are replaced by `container-selinux` on fedora-25 and centos-7.
> Marking these packages as obsolete makes the installation process a bit
> smoother, otherwise the user will have to manually uninstall the older
> packages to install the new one.
>
> Also makes fedora24 use container-selinux which is now supports labeling
> the `dockerd` binary correctly.

Both CentOS 6/7 and Fedora 25 are EOL now, and these packages have not been
published for a long time. Time to remove them, also to reduce some noise
during builds;

    RPM build warnings:
        line 51: It's not recommended to have unversioned Obsoletes: Obsoletes: docker-ce-selinux
        line 52: It's not recommended to have unversioned Obsoletes: Obsoletes: docker-engine-selinux
        line 53: It's not recommended to have unversioned Obsoletes: Obsoletes: docker-engine

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah self-assigned this Jan 23, 2025
@thaJeztah thaJeztah requested review from tianon-sso and a team January 23, 2025 21:22
Copy link

@krissetto krissetto left a comment

Choose a reason for hiding this comment

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

LGTM

@thaJeztah
Copy link
Member Author

Thanks! Jenkins went AWOL Yesterday, but looks like it's back; let me bring this one in

@thaJeztah thaJeztah merged commit 0a4c885 into docker:master Jan 24, 2025
8 checks passed
@thaJeztah thaJeztah deleted the obsolete_the_obsolete branch January 24, 2025 09:13
@thaJeztah thaJeztah changed the title rpm: remove Obsoletes for obsolete (selinux) packages [master] rpm: remove Obsoletes for obsolete (selinux) packages Jan 24, 2025
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