Skip to content

Commit afae1b2

Browse files
committed
agent: verify version from plugin metadata
Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
1 parent 5faf04b commit afae1b2

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

pkg/agent/deb/rules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ override_dh_auto_build:
1212
go build -trimpath -ldflags="-w -X 'github.com/docker/docker-agent/pkg/version.Version=$(VERSION)' -X 'github.com/docker/docker-agent/pkg/version.Commit=$(REVISION)'" -o /usr/libexec/docker/cli-plugins/docker-agent .
1313

1414
override_dh_auto_test:
15-
ver="$$(/usr/libexec/docker/cli-plugins/docker-agent version | grep 'docker-agent version' | awk '{print $$3}')"; \
15+
ver="$$(/usr/libexec/docker/cli-plugins/docker-agent docker-cli-plugin-metadata | awk '{ gsub(/[",:]/,"")}; $$1 == "Version" { print $$2 }')"; \
1616
test "$$ver" = "$(VERSION)" && echo "PASS: docker-agent version OK" || (echo "FAIL: docker-agent version ($$ver) did not match" && exit 1)
1717

1818
override_dh_strip:

pkg/agent/rpm/docker-agent-plugin.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ pushd ${RPM_BUILD_DIR}/src/agent
3636
popd
3737

3838
%check
39-
ver="$(${RPM_BUILD_ROOT}%{_libexecdir}/docker/cli-plugins/docker-agent docker-cli-plugin-metadata | awk '{ gsub(/[\",:]/,\"\")}; $1 == \"Version\" { print $2 }')"; \
39+
ver="$(${RPM_BUILD_ROOT}%{_libexecdir}/docker/cli-plugins/docker-agent docker-cli-plugin-metadata | awk '{ gsub(/[",:]/,"")}; $1 == "Version" { print $2 }')"; \
4040
test "$ver" = "%{_origversion}" && echo "PASS: docker-agent version OK" || (echo "FAIL: docker-agent version ($ver) did not match" && exit 1)
4141

4242
%install

0 commit comments

Comments
 (0)