-
Notifications
You must be signed in to change notification settings - Fork 31
rename cagent package to docker-agent-plugin #388
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
Open
crazy-max
wants to merge
3
commits into
docker:main
Choose a base branch
from
crazy-max:fix-docker-agent
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 file contains hidden or 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 file contains hidden or 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 file contains hidden or 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 file contains hidden or 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 file contains hidden or 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 file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| Source: docker-agent-plugin | ||
| Section: admin | ||
| Priority: optional | ||
| Maintainer: Docker <support@docker.com> | ||
| Homepage: https://www.docker.com | ||
| Vcs-Browser: https://github.com/docker/docker-agent | ||
| Vcs-Git: git://github.com/docker/docker-agent.git | ||
| Standards-Version: 3.9.6 | ||
| Build-Depends: bash, | ||
| gcc, | ||
| debhelper-compat (= 12) | ||
|
|
||
| Package: docker-agent-plugin | ||
| Priority: optional | ||
| Architecture: linux-any | ||
| Replaces: cagent | ||
| Breaks: cagent | ||
| Enhances: docker-ce-cli | ||
| Description: Docker Agent plugin for the Docker CLI. | ||
| . | ||
| This plugin provides the 'docker agent' subcommand. | ||
| . | ||
| The binary can also be run standalone as 'docker-agent'. | ||
| Homepage: https://github.com/docker/docker-agent |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| agent/README.md |
This file contains hidden or 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
File renamed without changes.
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| %global debug_package %{nil} | ||
|
|
||
| Name: docker-agent-plugin | ||
| Version: %{_version} | ||
| Release: %{_release}%{?dist} | ||
| Epoch: 0 | ||
| Source0: agent.tgz | ||
| Summary: Docker Agent plugin for the Docker CLI | ||
| Group: Tools/Docker | ||
| License: Apache-2.0 | ||
| URL: https://github.com/docker/docker-agent | ||
| Vendor: Docker | ||
| Packager: Docker <support@docker.com> | ||
|
|
||
| Enhances: docker-ce-cli | ||
| Provides: cagent = %{epoch}:%{version}-%{release} | ||
| Obsoletes: cagent < %{epoch}:%{version}-%{release} | ||
|
|
||
| BuildRequires: bash | ||
| BuildRequires: gcc | ||
|
|
||
| %description | ||
| Docker Agent plugin for the Docker CLI. | ||
|
|
||
| This plugin provides the 'docker agent' subcommand. | ||
|
|
||
| The binary can also be run standalone as 'docker-agent'. | ||
|
|
||
| %prep | ||
| %setup -q -c -n src -a 0 | ||
|
|
||
| %build | ||
| pushd ${RPM_BUILD_DIR}/src/agent | ||
| mkdir -p bin && \ | ||
| go build -trimpath -ldflags="-w -X github.com/docker/docker-agent/pkg/version.Version=%{_origversion} -X github.com/docker/docker-agent/pkg/version.Commit=%{_commit}" -o bin/docker-agent . | ||
| popd | ||
|
|
||
| %check | ||
| ver="$(${RPM_BUILD_ROOT}%{_libexecdir}/docker/cli-plugins/docker-agent docker-cli-plugin-metadata | awk '{ gsub(/[",:]/,"")}; $1 == "Version" { print $2 }')"; \ | ||
| test "$ver" = "%{_origversion}" && echo "PASS: docker-agent version OK" || (echo "FAIL: docker-agent version ($ver) did not match" && exit 1) | ||
|
|
||
| %install | ||
| pushd ${RPM_BUILD_DIR}/src/agent | ||
| install -D -p -m 0755 bin/docker-agent ${RPM_BUILD_ROOT}%{_libexecdir}/docker/cli-plugins/docker-agent | ||
| popd | ||
| for f in LICENSE README.md; do | ||
| install -D -p -m 0644 "${RPM_BUILD_DIR}/src/agent/$f" "docker-agent-plugin-docs/$f" | ||
| done | ||
|
|
||
| %files | ||
| %doc docker-agent-plugin-docs/* | ||
| %license docker-agent-plugin-docs/LICENSE | ||
| %{_libexecdir}/docker/cli-plugins/docker-agent | ||
|
|
||
| %post | ||
|
|
||
| %preun | ||
|
|
||
| %postun | ||
|
|
||
| %changelog | ||
| * Wed Mar 17 2026 Docker <support@docker.com> - %{version}-%{release} | ||
| - Rename the package to docker-agent-plugin and obsolete cagent | ||
This file contains hidden or 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
File renamed without changes.
This file contains hidden or 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 file contains hidden or 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 file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If
docker-agent-pluginis built as0:1.2.3-1, this expands toProvides: cagent = 0:1.2.3-1andObsoletes: cagent < 0:1.2.3-1, which tells RPM that this package replaces oldercagentinstalls up to that version.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do you know if (with a rename) we'd be able to drop the epoch (we never should've had those in any of our packages 🫠)