Skip to content

Adjust epoch to match current packages #266

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

Merged
vvoland merged 2 commits into from
Sep 18, 2025
Merged

Adjust epoch to match current packages #266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
30c4861
Adjust deb epoch to match current packages
vvoland Sep 18, 2025
0a59b44
docker-cli/rpm: Adjust epoch to match current packaging
vvoland Sep 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions docker-bake.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,7 +503,7 @@ target "_pkg-buildx" {
PKG_REF = PKG_REF != null && PKG_REF != "" ? PKG_REF : "master"
GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.24.7" # https://github.com/docker/buildx/blob/0c747263ef1426f5fa217fcdb616eddf33da6c2d/Dockerfile#L3
GO_IMAGE_VARIANT = GO_IMAGE_VARIANT != null && GO_IMAGE_VARIANT != "" ? GO_IMAGE_VARIANT : "bookworm"
PKG_DEB_EPOCH = PKG_DEB_EPOCH != null && PKG_DEB_EPOCH != "" ? PKG_DEB_EPOCH : "5"
PKG_DEB_EPOCH = PKG_DEB_EPOCH != null && PKG_DEB_EPOCH != "" ? PKG_DEB_EPOCH : ""
}
}

Expand All @@ -514,7 +514,7 @@ target "_pkg-compose" {
PKG_REF = PKG_REF != null && PKG_REF != "" ? PKG_REF : "main"
GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.23.12" # https://github.com/docker/compose/blob/c2cb0aef6bbbe1afc8c9e81267621655ac90c5f6/Dockerfile#L18
GO_IMAGE_VARIANT = GO_IMAGE_VARIANT != null && GO_IMAGE_VARIANT != "" ? GO_IMAGE_VARIANT : "bookworm"
PKG_DEB_EPOCH = PKG_DEB_EPOCH != null && PKG_DEB_EPOCH != "" ? PKG_DEB_EPOCH : "5"
PKG_DEB_EPOCH = PKG_DEB_EPOCH != null && PKG_DEB_EPOCH != "" ? PKG_DEB_EPOCH : ""
}
}

Expand All @@ -525,7 +525,7 @@ target "_pkg-containerd" {
PKG_REF = PKG_REF != null && PKG_REF != "" ? PKG_REF : "main"
GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.24.7" # https://github.com/containerd/containerd/blame/822fb144732946f2a6f7998bfe748ed175674ade/.github/workflows/release.yml#L16
GO_IMAGE_VARIANT = GO_IMAGE_VARIANT != null && GO_IMAGE_VARIANT != "" ? GO_IMAGE_VARIANT : "bookworm"
PKG_DEB_EPOCH = PKG_DEB_EPOCH != null && PKG_DEB_EPOCH != "" ? PKG_DEB_EPOCH : "5"
PKG_DEB_EPOCH = PKG_DEB_EPOCH != null && PKG_DEB_EPOCH != "" ? PKG_DEB_EPOCH : ""
}
}

Expand All @@ -536,7 +536,7 @@ target "_pkg-credential-helpers" {
PKG_REF = PKG_REF != null && PKG_REF != "" ? PKG_REF : "master"
GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.23.12" # https://github.com/docker/docker-credential-helpers/blob/f9d3010165b642df37215b1be945552f2c6f0e3b/Dockerfile#L3
GO_IMAGE_VARIANT = GO_IMAGE_VARIANT != null && GO_IMAGE_VARIANT != "" ? GO_IMAGE_VARIANT : "bookworm"
PKG_DEB_EPOCH = PKG_DEB_EPOCH != null && PKG_DEB_EPOCH != "" ? PKG_DEB_EPOCH : "5"
PKG_DEB_EPOCH = PKG_DEB_EPOCH != null && PKG_DEB_EPOCH != "" ? PKG_DEB_EPOCH : ""
}
}

Expand Down Expand Up @@ -569,7 +569,7 @@ target "_pkg-model" {
PKG_REF = PKG_REF != null && PKG_REF != "" ? PKG_REF : "main"
GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.24.7" # https://github.com/docker/model-cli/blob/301126afc8ef4b8330de56db5d2889ddbc978022/Dockerfile#L3
GO_IMAGE_VARIANT = GO_IMAGE_VARIANT != null && GO_IMAGE_VARIANT != "" ? GO_IMAGE_VARIANT : "bookworm"
PKG_DEB_EPOCH = PKG_DEB_EPOCH != null && PKG_DEB_EPOCH != "" ? PKG_DEB_EPOCH : "5"
PKG_DEB_EPOCH = PKG_DEB_EPOCH != null && PKG_DEB_EPOCH != "" ? PKG_DEB_EPOCH : ""
}
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/docker-cli/rpm/docker-ce-cli.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Name: docker-ce-cli
Version: %{_version}
Release: %{_release}%{?dist}
Epoch: 0
Epoch: 1
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah Sep 18, 2025

Choose a reason for hiding this comment

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

The CLI currently has an epoch 5 already; should this be 5?

apt-cache madison docker-ce-cli | head -n 1
docker-ce-cli | 5:28.4.0-1~ubuntu.24.04~noble | https://download.docker.com/linux/ubuntu noble/stable arm64 Packages

I hate it that we have the epoch, but once it's there ... there's no way back unfortunately.

Copy link
Copy Markdown
Member

@thaJeztah thaJeztah Sep 18, 2025

Choose a reason for hiding this comment

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

oh! this is for rpm - if those didn't have an epoch, we should avoid adding one I guess 🙈

Copy link
Copy Markdown
Collaborator Author

@vvoland vvoland Sep 18, 2025

Choose a reason for hiding this comment

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

The CLI has epoch 5 in deb packages.
For RPM it's 1:

[root@eb3e0b6271be /]# dnf list --showduplicates docker-ce-cli
Updating and loading repositories:
Repositories loaded.
Available packages
docker-ce-cli.aarch64 1:28.1.0-1.fc42 docker-ce-stable
docker-ce-cli.aarch64 1:28.1.1-1.fc42 docker-ce-stable
docker-ce-cli.aarch64 1:28.2.0-1.fc42 docker-ce-stable
docker-ce-cli.aarch64 1:28.2.1-1.fc42 docker-ce-stable
docker-ce-cli.aarch64 1:28.2.2-1.fc42 docker-ce-stable
docker-ce-cli.aarch64 1:28.3.0-1.fc42 docker-ce-stable
docker-ce-cli.aarch64 1:28.3.1-1.fc42 docker-ce-stable
docker-ce-cli.aarch64 1:28.3.2-1.fc42 docker-ce-stable
docker-ce-cli.aarch64 1:28.3.3-1.fc42 docker-ce-stable
docker-ce-cli.aarch64 1:28.4.0-1.fc42 docker-ce-stable

Copy link
Copy Markdown
Collaborator Author

@vvoland vvoland Sep 18, 2025

Choose a reason for hiding this comment

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

https://github.com/docker/docker-ce-packaging/blob/2b43a97656a5c8875729363d279634d3977ab662/rpm/SPECS/docker-ce-cli.spec#L6

Copy link
Copy Markdown
Member

@thaJeztah thaJeztah Sep 18, 2025

Choose a reason for hiding this comment

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

Oh! You're right. Interesting; I recall that the epoch was needed because someone decided to use non-standard pre-release suffixes, like "-tp1" (and maybe CalVer versioning was involved), but not sure why that would've impacted rpm different from deb. Lots of bad things around that timeframe, which was when a docker engine subcommand was added allow upgrading a CE engine to EE, which really a "move fast, break fast, fix later" that messed up everything in our packaging.

Source0: cli.tgz
Summary: The open-source application container engine
Group: Tools/Docker
Expand Down