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

docker-cli, docker-engine: remove outdated "conflicts #194

Merged
merged 2 commits into from
May 10, 2024

Conversation

thaJeztah
Copy link
Member

docker-cli, docker-engine: remove "Conflicts: docker-engine-cs"

This was added in docker@a15b67b1affb2eac5365614e55703f43b6f73e9b (2015),
at which time this package was already deprecated / replaced:

Add old docker-engine-cs name to package conflicts

docker-cli, docker-engine: 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;

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

thaJeztah added 2 commits May 10, 2024 16:10
This was added in [docker/packaging@a15b67b] (2015),
at which time this package was already deprecated / replaced:

> Add old docker-engine-cs name to package conflicts

[docker/packaging@a15b67b]: moby/moby@a15b67b

Signed-off-by: Sebastiaan van Stijn <[email protected]>
…virtual-package"

These conflicts were added as part of the first implementation of the deb
packaging scripts in [docker/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/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 thaJeztah self-assigned this May 10, 2024
@thaJeztah thaJeztah requested a review from crazy-max May 10, 2024 14:28
@thaJeztah thaJeztah merged commit 3ac603d into docker:main May 10, 2024
28 checks passed
@thaJeztah thaJeztah deleted the simplify_conflicts branch May 10, 2024 14:41
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.

2 participants