[master] deb, rpm: remove outdated "conflicts" #1019
Merged
Conversation
This file contains 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
This was added in [docker/docker-ce-packaging@a15b67b] (2015), at which time this package was already deprecated / replaced: > Add old docker-engine-cs name to package conflicts [docker/docker-ce-packaging@a15b67b]: moby/moby@a15b67b Signed-off-by: Sebastiaan van Stijn <[email protected]>
These conflicts were added as part of the first implementation of the deb packaging scripts in [docker/docker-ce-packaging@eee1efc] (2015) to replace the old packages. These packages where part of the old PPA at get.docker.io (see [1], [2]), which is long gone; curl -I https://get.docker.io/ubuntu HTTP/1.1 301 Moved Permanently content-length: 0 location: https://get.docker.com/ubuntu curl -fsSL https://get.docker.com/ubuntu echo "# WARNING! This script is deprecated. Please use the script" echo "# at https://get.docker.com/" exit 1 [docker/docker-ce-packaging@eee1efc]: moby/moby@eee1efc [2]: https://www.ubuntuupdates.org/package/docker/docker/main/base/lxc-docker [3]: https://www.ubuntuupdates.org/ppa/docker?dist=docker Signed-off-by: Sebastiaan van Stijn <[email protected]>
thaJeztah
commented
May 10, 2024
Comment on lines
38
to
39
| Conflicts: docker-ee | ||
| Conflicts: docker-ee-cli |
There was a problem hiding this comment.
Hm.. guessing these could also be removed now; it looks like they're already gone from the deb packages, so perhaps we forgot to remove them here 🤔
There was a problem hiding this comment.
- Opened [master] rpm: remove "Conflicts: docker-ee, docker-ee-cli" #1020 as a follow-up, in case it still needed discussion.
vvoland
approved these changes
May 10, 2024
neersighted
approved these changes
May 10, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
deb, rpm: remove "Conflicts: docker-engine-cs"
This was added in docker@a15b67b1affb2eac5365614e55703f43b6f73e9b (2015),
at which time this package was already deprecated / replaced:
deb: remove "Conflicts: lxc-docker, lxc-docker-virtual-package"
These conflicts were added as part of the first implementation of the deb
packaging scripts in docker@eee1efcfd6c46dbdc5da02ca12722e399a56bb12 (2015)
to replace the old packages. These packages where part of the old PPA at
get.docker.io (see [1], 2), which is long gone;
- What I did
- How I did it
- How to verify it
- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)